Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3ecb225

Browse files
author
Robert Mosolgo
authored
Merge pull request #783 from BookOfGreg/cleanup-tests
Cleanup tests, fix a broken test seed
2 parents 901f58d + 2700620 commit 3ecb225

16 files changed

+127
-119
lines changed

‎.travis.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ cache:
77
rvm:
88
- 2.3.0
99
- 2.1
10-
- jruby-9.0.1.0
10+
- jruby-9.1.9.0
1111

1212
gemfile:
1313
# These have webpacker:
@@ -53,27 +53,27 @@ matrix:
5353
gemfile: gemfiles/rails_5_no_sprockets.gemfile
5454
- rvm: 2.1
5555
gemfile: gemfiles/rails_5.1_sprockets_4.gemfile
56-
- rvm: jruby-9.0.1.0
56+
- rvm: jruby-9.1.9.0
5757
gemfile: gemfiles/rails_4.0.gemfile
58-
- rvm: jruby-9.0.1.0
58+
- rvm: jruby-9.1.9.0
5959
gemfile: rails_4.0_with_therubyracer.gemfile
60-
- rvm: jruby-9.0.1.0
60+
- rvm: jruby-9.1.9.0
6161
gemfile: gemfiles/rails_4.1.gemfile
62-
- rvm: jruby-9.0.1.0
62+
- rvm: jruby-9.1.9.0
6363
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
64-
- rvm: jruby-9.0.1.0
64+
- rvm: jruby-9.1.9.0
6565
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
66-
- rvm: jruby-9.0.1.0
66+
- rvm: jruby-9.1.9.0
6767
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
68-
- rvm: jruby-9.0.1.0
68+
- rvm: jruby-9.1.9.0
6969
gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
70-
- rvm: jruby-9.0.1.0
70+
- rvm: jruby-9.1.9.0
7171
gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
72-
- rvm: jruby-9.0.1.0
72+
- rvm: jruby-9.1.9.0
7373
gemfile: gemfiles/rails_5_no_sprockets.gemfile
7474

7575
allow_failures:
76-
- rvm: jruby-9.0.1.0
76+
- rvm: jruby-9.1.9.0
7777

7878
before_install:
7979
- nvm install 7.8.0 && nvm use 7.8.0

‎Appraisals

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ end
1717

1818
appraise 'rails-4.0-with-therubyracer' do
1919
gem 'rails', '~> 4.0.13'
20-
gem 'therubyracer', '0.12.0', :platform => :mri
20+
gem 'therubyracer', '0.12.0', :platforms => :mri
2121
gem 'turbolinks'
2222
end
2323

@@ -45,7 +45,7 @@ appraise 'rails-4.2-sprockets_4' do
4545
gem 'turbolinks', '~> 2.5.0'
4646
# This ExecJS backend provides stateful context
4747
# which the default nodejs backend does not
48-
gem 'mini_racer'
48+
gem 'mini_racer',:platforms=>:mri
4949
end
5050

5151
# no_sprockets is a magical name from sprockets_helper.rb in test to
@@ -55,31 +55,35 @@ appraise 'rails-5_no_sprockets_webpacker_1_1' do
5555
gem 'webpacker', '~> 1.1.0'
5656
# This ExecJS backend provides stateful context
5757
# which the default nodejs backend does not
58-
gem 'therubyracer'
58+
gem 'therubyracer', :platforms => :mri
59+
gem 'therubyrhino', :platforms => :jruby
5960
end
6061

6162
appraise 'rails-5_no_sprockets_webpacker_1_x' do
6263
gem 'rails', '~> 5.0.0'
6364
gem 'webpacker', '~> 1.2'
6465
# This ExecJS backend provides stateful context
6566
# which the default nodejs backend does not
66-
gem 'therubyracer'
67+
gem 'therubyracer', :platforms => :mri
68+
gem 'therubyrhino', :platforms => :jruby
6769
end
6870

6971
appraise 'rails-5_no_sprockets_webpacker_2' do
7072
gem 'rails', '~> 5.0.0'
7173
gem 'webpacker', '~> 2.0'
7274
# This ExecJS backend provides stateful context
7375
# which the default nodejs backend does not
74-
gem 'therubyracer'
76+
gem 'therubyracer', :platforms => :mri
77+
gem 'therubyrhino', :platforms => :jruby
7578
end
7679

7780
appraise 'rails-5_no_sprockets_webpacker_3' do
7881
gem 'rails', '~> 5.0.0'
7982
gem 'webpacker', '>= 3.0'
8083
# This ExecJS backend provides stateful context
8184
# which the default nodejs backend does not
82-
gem 'therubyracer'
85+
gem 'therubyracer', :platforms => :mri
86+
gem 'therubyrhino', :platforms => :jruby
8387
end
8488

8589
appraise 'rails-5-no_sprockets' do

‎gemfiles/rails_3.2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ gem "rails", "~> 3.2.21"
66
gem "rack-cache", "~> 1.6.1"
77
gem "turbolinks", "~> 2.0"
88

9-
gemspec :path => "../"
9+
gemspec path: "../"

‎gemfiles/rails_4.0.5.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ source "http://rubygems.org"
55
gem "rails", "4.0.5"
66
gem "turbolinks"
77

8-
gemspec :path => "../"
8+
gemspec path: "../"

‎gemfiles/rails_4.0_with_therubyracer.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "http://rubygems.org"
44

55
gem "rails", "~> 4.0.13"
6-
gem "therubyracer", "0.12.0", :platform => :mri
6+
gem "therubyracer", "0.12.0", platforms: :mri
77
gem "turbolinks"
88

9-
gemspec :path => "../"
9+
gemspec path: "../"

‎gemfiles/rails_4.1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ source "http://rubygems.org"
55
gem "rails", "~> 4.1.10"
66
gem "turbolinks", "~> 2.3.0"
77

8-
gemspec :path => "../"
8+
gemspec path: "../"

‎gemfiles/rails_4.2_sprockets_2.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ gem "rails", "~> 4.2.1"
66
gem "sprockets", "~> 2.12"
77
gem "turbolinks"
88

9-
gemspec :path => "../"
9+
gemspec path: "../"

‎gemfiles/rails_4.2_sprockets_3.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ gem "rails", "~> 4.2.1"
66
gem "sprockets", "~> 3.5"
77
gem "turbolinks", "~> 2.5.0"
88

9-
gemspec :path => "../"
9+
gemspec path: "../"

‎gemfiles/rails_4.2_sprockets_4.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ source "http://rubygems.org"
55
gem "rails", "~> 4.2.1"
66
gem "sprockets", "~> 4.0.x"
77
gem "turbolinks", "~> 2.5.0"
8-
gem "mini_racer"
8+
gem "mini_racer", platforms: :mri
99

10-
gemspec :path => "../"
10+
gemspec path: "../"

‎gemfiles/rails_5.1_sprockets_4.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ gem "rails", "~> 5.1"
66
gem "sprockets", "~> 4.0.x"
77
gem "turbolinks", "~> 5.0.0"
88

9-
gemspec :path => "../"
9+
gemspec path: "../"

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /