Skip to content

Commit 8c88a3b

Browse files
committed
Turns out _no_sprockets_ name is actually executable code...
1 parent 72285ce commit 8c88a3b

17 files changed

+67
-26
lines changed

.travis.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ rvm:
1212
gemfile:
1313
# These have webpacker:
1414
- gemfiles/rails_4.2_sprockets_4.gemfile
15-
- gemfiles/rails_5_webpacker_1_1.gemfile
16-
- gemfiles/rails_5_webpacker_1_x.gemfile
17-
- gemfiles/rails_5_webpacker_2.gemfile
18-
- gemfiles/rails_5_webpacker_3.gemfile
15+
- gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
16+
- gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
17+
- gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
18+
- gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
1919
# These don't have webpacker:
2020
- gemfiles/rails_3.2.gemfile
2121
- gemfiles/rails_4.0.5.gemfile
@@ -42,13 +42,13 @@ matrix:
4242
- rvm: 2.1
4343
gemfile: gemfiles/rails_4.2_sprockets_4.gemfile
4444
- rvm: 2.1
45-
gemfile: gemfiles/rails_5_webpacker_1_1.gemfile
45+
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
4646
- rvm: 2.1
47-
gemfile: gemfiles/rails_5_webpacker_1_x.gemfile
47+
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
4848
- rvm: 2.1
49-
gemfile: gemfiles/rails_5_webpacker_2.gemfile
49+
gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
5050
- rvm: 2.1
51-
gemfile: gemfiles/rails_5_webpacker_3.gemfile
51+
gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
5252
- rvm: 2.1
5353
gemfile: gemfiles/rails_5.1_sprockets_4.gemfile
5454
- rvm: jruby-9.0.1.0
@@ -60,13 +60,13 @@ matrix:
6060
- rvm: jruby-9.0.1.0
6161
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
6262
- rvm: jruby-9.0.1.0
63-
gemfile: gemfiles/rails_5_webpacker_1_1.gemfile
63+
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
6464
- rvm: jruby-9.0.1.0
65-
gemfile: gemfiles/rails_5_webpacker_1_x.gemfile
65+
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
6666
- rvm: jruby-9.0.1.0
67-
gemfile: gemfiles/rails_5_webpacker_2.gemfile
67+
gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
6868
- rvm: jruby-9.0.1.0
69-
gemfile: gemfiles/rails_5_webpacker_3.gemfile
69+
gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
7070
- rvm: jruby-9.0.1.0
7171
gemfile: gemfiles/rails_5_no_sprockets.gemfile
7272

Appraisals

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,33 @@ appraise "rails-4.2-sprockets_4" do
4848
gem "mini_racer"
4949
end
5050

51-
appraise "rails-5_webpacker_1_1" do
51+
# no_sprockets is a magical name from sprockets_helper.rb in test to
52+
# load in certain tests or not.
53+
appraise "rails-5_no_sprockets_webpacker_1_1" do
5254
gem 'rails', '~> 5.0.0'
5355
gem "webpacker", '~> 1.1.0'
5456
# This ExecJS backend provides stateful context
5557
# which the default nodejs backend does not
5658
gem "therubyracer"
5759
end
5860

59-
appraise "rails-5_webpacker_1_x" do
61+
appraise "rails-5_no_sprockets_webpacker_1_x" do
6062
gem 'rails', '~> 5.0.0'
6163
gem "webpacker", '~> 1.2'
6264
# This ExecJS backend provides stateful context
6365
# which the default nodejs backend does not
6466
gem "therubyracer"
6567
end
6668

67-
appraise "rails-5_webpacker_2" do
69+
appraise "rails-5_no_sprockets_webpacker_2" do
6870
gem 'rails', '~> 5.0.0'
6971
gem "webpacker", '~> 2.0'
7072
# This ExecJS backend provides stateful context
7173
# which the default nodejs backend does not
7274
gem "therubyracer"
7375
end
7476

75-
appraise "rails-5_webpacker_3" do
77+
appraise "rails-5_no_sprockets_webpacker_3" do
7678
gem 'rails', '~> 5.0.0'
7779
gem 'webpacker', '>= 3.0'
7880
# This ExecJS backend provides stateful context

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@ source 'http://rubygems.org'
22

33
gemspec
44
# This is an optional dev-dependency, required whenever sprockets is required
5-
gem "turbolinks"

gemfiles/rails_3.2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks", "~> 2.0"
65
gem "rails", "~> 3.2.21"
76
gem "rack-cache", "~> 1.6.1"
7+
gem "turbolinks", "~> 2.0"
88

99
gemspec :path => "../"

gemfiles/rails_4.0.5.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks"
65
gem "rails", "4.0.5"
6+
gem "turbolinks"
77

88
gemspec :path => "../"

gemfiles/rails_4.0_with_therubyracer.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks"
65
gem "rails", "~> 4.0.13"
76
gem "therubyracer", "0.12.0", :platform => :mri
7+
gem "turbolinks"
88

99
gemspec :path => "../"

gemfiles/rails_4.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks", "~> 2.3.0"
65
gem "rails", "~> 4.1.10"
6+
gem "turbolinks", "~> 2.3.0"
77

88
gemspec :path => "../"

gemfiles/rails_4.2_sprockets_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks"
65
gem "rails", "~> 4.2.1"
76
gem "sprockets", "~> 2.12"
7+
gem "turbolinks"
88

99
gemspec :path => "../"

gemfiles/rails_4.2_sprockets_3.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks", "~> 2.5.0"
65
gem "rails", "~> 4.2.1"
76
gem "sprockets", "~> 3.5"
7+
gem "turbolinks", "~> 2.5.0"
88

99
gemspec :path => "../"

gemfiles/rails_4.2_sprockets_4.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
source "http://rubygems.org"
44

5-
gem "turbolinks", "~> 2.5.0"
65
gem "rails", "~> 4.2.1"
76
gem "sprockets", "~> 4.0.x"
7+
gem "turbolinks", "~> 2.5.0"
88
gem "mini_racer"
99

1010
gemspec :path => "../"

0 commit comments

Comments
 (0)