Skip to content

Commit 4665a5f

Browse files
authored
Changes necessary for easy local testing (#1291)
* rename appraisal gemfiles * remove action_mailer references
1 parent 5c93087 commit 4665a5f

File tree

10 files changed

+56
-60
lines changed

10 files changed

+56
-60
lines changed

.github/workflows/ruby.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ jobs:
5353
ruby: [2.7]
5454
gemfile:
5555
# These have shakapacker:
56-
- no_sprockets
57-
- no_sprockets_shakapacker
56+
- base
57+
- shakapacker
5858
# These don't have shakapacker:
5959
- sprockets_3
6060
- sprockets_4

Appraisals

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ appraise 'sprockets_3' do
1414
gem 'mini_racer', :platforms => :mri
1515
end
1616

17-
appraise 'no_sprockets_shakapacker' do
17+
appraise 'shakapacker' do
1818
gem 'rails', '~> 7.0.x'
1919
gem 'shakapacker', '6.6.0'
2020
end
2121

22-
appraise 'no_sprockets' do
22+
appraise 'base' do
2323
# Appraisal adds `turbolinks` to this gemfile because it is
2424
# present in `./Gemfile`.
2525
# But it causes this gemfile to break, so it must be removed
File renamed without changes.

gemfiles/no_sprockets.gemfile.lock renamed to gemfiles/base.gemfile.lock

Lines changed: 51 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ GEM
7676
i18n (>= 1.6, < 2)
7777
minitest (>= 5.1)
7878
tzinfo (~> 2.0)
79-
addressable (2.7.0)
80-
public_suffix (>= 2.0.2, < 5.0)
81-
appraisal (2.2.0)
79+
addressable (2.8.1)
80+
public_suffix (>= 2.0.2, < 6.0)
81+
appraisal (2.4.1)
8282
bundler
8383
rake
8484
thor (>= 0.14.0)
@@ -87,75 +87,77 @@ GEM
8787
babel-source (>= 4.0, < 6)
8888
execjs (~> 2.0)
8989
builder (3.2.4)
90-
byebug (11.0.1)
91-
capybara (3.30.0)
90+
byebug (11.1.3)
91+
capybara (3.38.0)
9292
addressable
93+
matrix
9394
mini_mime (>= 0.1.3)
9495
nokogiri (~> 1.8)
9596
rack (>= 1.6.0)
9697
rack-test (>= 0.6.3)
97-
regexp_parser (~> 1.5)
98+
regexp_parser (>= 1.5, < 3.0)
9899
xpath (~> 3.2)
99-
childprocess (3.0.0)
100100
codeclimate-test-reporter (1.0.9)
101101
simplecov (<= 0.13)
102-
coderay (1.1.2)
102+
coderay (1.1.3)
103103
coffee-rails (5.0.0)
104104
coffee-script (>= 2.2.0)
105105
railties (>= 5.2.0)
106106
coffee-script (2.4.1)
107107
coffee-script-source
108108
execjs
109109
coffee-script-source (1.12.2)
110-
concurrent-ruby (1.1.10)
111-
connection_pool (2.2.2)
110+
concurrent-ruby (1.2.2)
111+
connection_pool (2.4.0)
112112
crass (1.0.6)
113113
date (3.3.3)
114114
docile (1.1.5)
115-
erubi (1.11.0)
115+
erubi (1.12.0)
116116
es5-shim-rails (4.0.1)
117117
actionpack (>= 3.1)
118118
railties (>= 3.1)
119-
execjs (2.7.0)
120-
ffi (1.11.3)
121-
formatador (0.2.5)
119+
execjs (2.8.1)
120+
ffi (1.15.5)
121+
formatador (1.1.0)
122122
gem-release (2.2.2)
123123
globalid (1.1.0)
124124
activesupport (>= 5.0)
125-
guard (2.16.1)
125+
guard (2.18.0)
126126
formatador (>= 0.2.4)
127127
listen (>= 2.7, < 4.0)
128128
lumberjack (>= 1.0.12, < 2.0)
129129
nenv (~> 0.1)
130130
notiffany (~> 0.0)
131-
pry (>= 0.9.12)
131+
pry (>= 0.13.0)
132132
shellany (~> 0.0)
133133
thor (>= 0.18.1)
134134
guard-compat (1.2.1)
135135
guard-minitest (2.4.6)
136136
guard-compat (~> 1.2)
137137
minitest (>= 3.0)
138-
i18n (1.12.0)
138+
i18n (1.13.0)
139139
concurrent-ruby (~> 1.0)
140-
jbuilder (2.9.1)
141-
activesupport (>= 4.2.0)
142-
json (2.3.0)
140+
jbuilder (2.11.5)
141+
actionview (>= 5.0.0)
142+
activesupport (>= 5.0.0)
143+
json (2.6.3)
143144
listen (3.0.8)
144145
rb-fsevent (~> 0.9, >= 0.9.4)
145146
rb-inotify (~> 0.9, >= 0.9.7)
146-
loofah (2.18.0)
147+
loofah (2.21.1)
147148
crass (~> 1.0.2)
148149
nokogiri (>= 1.5.9)
149-
lumberjack (1.0.13)
150+
lumberjack (1.2.8)
150151
mail (2.8.1)
151152
mini_mime (>= 0.1.1)
152153
net-imap
153154
net-pop
154155
net-smtp
155156
marcel (1.0.2)
156-
method_source (0.9.2)
157+
matrix (0.4.2)
158+
method_source (1.0.0)
157159
mini_mime (1.1.2)
158-
minitest (5.16.3)
160+
minitest (5.18.0)
159161
nenv (0.3.0)
160162
net-imap (0.3.4)
161163
date
@@ -167,24 +169,24 @@ GEM
167169
net-smtp (0.3.3)
168170
net-protocol
169171
nio4r (2.5.9)
170-
nokogiri (1.13.8-x86_64-darwin)
172+
nokogiri (1.14.3-x86_64-darwin)
171173
racc (~> 1.4)
172174
nokogiri (1.13.8-x86_64-linux)
173175
racc (~> 1.4)
174176
notiffany (0.1.3)
175177
nenv (~> 0.1)
176178
shellany (~> 0.0)
177-
pry (0.12.2)
178-
coderay (~> 1.1.0)
179-
method_source (~> 0.9.0)
180-
pry-byebug (3.7.0)
179+
pry (0.14.2)
180+
coderay (~> 1.1)
181+
method_source (~> 1.0)
182+
pry-byebug (3.10.1)
181183
byebug (~> 11.0)
182-
pry (~> 0.10)
183-
public_suffix (4.0.2)
184-
racc (1.6.0)
185-
rack (2.2.4)
186-
rack-test (1.1.0)
187-
rack (>= 1.0, < 3)
184+
pry (>= 0.13, < 0.15)
185+
public_suffix (5.0.1)
186+
racc (1.6.2)
187+
rack (2.2.7)
188+
rack-test (2.1.0)
189+
rack (>= 1.3)
188190
rails (7.0.4.3)
189191
actioncable (= 7.0.4.3)
190192
actionmailbox (= 7.0.4.3)
@@ -202,8 +204,8 @@ GEM
202204
rails-dom-testing (2.0.3)
203205
activesupport (>= 4.2.0)
204206
nokogiri (>= 1.6)
205-
rails-html-sanitizer (1.4.3)
206-
loofah (~> 2.3)
207+
rails-html-sanitizer (1.5.0)
208+
loofah (~> 2.19, >= 2.19.1)
207209
railties (7.0.4.3)
208210
actionpack (= 7.0.4.3)
209211
activesupport (= 7.0.4.3)
@@ -212,14 +214,16 @@ GEM
212214
thor (~> 1.0)
213215
zeitwerk (~> 2.5)
214216
rake (13.0.6)
215-
rb-fsevent (0.10.3)
217+
rb-fsevent (0.11.2)
216218
rb-inotify (0.10.1)
217219
ffi (~> 1.0)
218-
regexp_parser (1.6.0)
219-
rubyzip (2.0.0)
220-
selenium-webdriver (3.142.7)
221-
childprocess (>= 0.5, < 4.0)
222-
rubyzip (>= 1.2.2)
220+
regexp_parser (2.7.0)
221+
rexml (3.2.5)
222+
rubyzip (2.3.2)
223+
selenium-webdriver (4.8.3)
224+
rexml (~> 3.2, >= 3.2.5)
225+
rubyzip (>= 1.2.2, < 3.0)
226+
websocket (~> 1.0)
223227
shellany (0.0.1)
224228
simplecov (0.13.0)
225229
docile (~> 1.1.0)
@@ -228,14 +232,15 @@ GEM
228232
simplecov-html (0.10.2)
229233
test-unit (2.5.5)
230234
thor (1.2.1)
231-
tilt (2.0.10)
235+
tilt (2.1.0)
232236
timeout (0.3.2)
233237
tzinfo (2.0.6)
234238
concurrent-ruby (~> 1.0)
235-
webdrivers (4.2.0)
239+
webdrivers (5.2.0)
236240
nokogiri (~> 1.6)
237241
rubyzip (>= 1.3.0)
238-
selenium-webdriver (>= 3.0, < 4.0)
242+
selenium-webdriver (~> 4.0)
243+
websocket (1.2.9)
239244
websocket-driver (0.7.5)
240245
websocket-extensions (>= 0.1.0)
241246
websocket-extensions (0.1.5)

test/dummy/config/application.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
# Pick the frameworks you want:
66
# require "active_record/railtie"
77
require "action_controller/railtie"
8-
require "action_mailer/railtie"
98

109
# Test no-sprockets environment by testing the gemfile name
1110
require "sprockets/railtie" if SprocketsHelpers.available?

test/dummy/config/environments/development.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
config.consider_all_requests_local = true
1616
config.action_controller.perform_caching = false
1717

18-
# Don't care if the mailer can't send.
19-
config.action_mailer.raise_delivery_errors = false
20-
2118
# Print deprecation notices to the Rails logger.
2219
config.active_support.deprecation = :log
2320
end

test/dummy/config/environments/test.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
# Disable request forgery protection in test environment.
3434
config.action_controller.allow_forgery_protection = false
3535

36-
# Tell Action Mailer not to deliver emails to the real world.
37-
# The :test delivery method accumulates sent emails in the
38-
# ActionMailer::Base.deliveries array.
39-
config.action_mailer.delivery_method = :test
40-
4136
# Print deprecation notices to the stderr.
4237
config.active_support.deprecation = :stderr
4338

test/support/sprockets_helpers.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def available?
99
# We also can't scan for defined?(Sprockets) because this is used to
1010
# require Sprockets in the config/application.rb
1111
# !!Bundler.locked_gems.specs.find {|gem_spec| gem_spec.name == 'sprockets'}
12-
!ENV.fetch("BUNDLE_GEMFILE", nil).include?("no_sprockets")
12+
ENV.fetch("BUNDLE_GEMFILE", nil).include?("sprockets")
1313
end
1414

1515
# The block depends on sprockets, don't run it if sprockets is missing

0 commit comments

Comments
 (0)