Skip to content

Cleanup tests, fix a broken test seed #783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ cache:
rvm:
- 2.3.0
- 2.1
- jruby-9.0.1.0
- jruby-9.1.9.0

gemfile:
# These have webpacker:
Expand Down Expand Up @@ -53,27 +53,27 @@ matrix:
gemfile: gemfiles/rails_5_no_sprockets.gemfile
- rvm: 2.1
gemfile: gemfiles/rails_5.1_sprockets_4.gemfile
- rvm: jruby-9.0.1.0
- rvm: jruby-9.1.9.0
gemfile: gemfiles/rails_4.0.gemfile
- rvm: jruby-9.0.1.0
- rvm: jruby-9.1.9.0
gemfile: rails_4.0_with_therubyracer.gemfile
- rvm: jruby-9.0.1.0
- rvm: jruby-9.1.9.0
gemfile: gemfiles/rails_4.1.gemfile
- rvm: jruby-9.0.1.0
- rvm: jruby-9.1.9.0
gemfile: gemfiles/rails_4.2_sprockets_2.gemfile
- rvm: jruby-9.0.1.0
- rvm: jruby-9.1.9.0
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
- rvm: jruby-9.0.1.0
- rvm: jruby-9.1.9.0
gemfile: gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
- rvm: jruby-9.0.1.0
- rvm: jruby-9.1.9.0
gemfile: gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
- rvm: jruby-9.0.1.0
- rvm: jruby-9.1.9.0
gemfile: gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
- rvm: jruby-9.0.1.0
- rvm: jruby-9.1.9.0
gemfile: gemfiles/rails_5_no_sprockets.gemfile

allow_failures:
- rvm: jruby-9.0.1.0
- rvm: jruby-9.1.9.0

before_install:
- nvm install 7.8.0 && nvm use 7.8.0
Expand Down
16 changes: 10 additions & 6 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ end

appraise 'rails-4.0-with-therubyracer' do
gem 'rails', '~> 4.0.13'
gem 'therubyracer', '0.12.0', :platform => :mri
gem 'therubyracer', '0.12.0', :platforms => :mri
gem 'turbolinks'
end

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

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

appraise 'rails-5_no_sprockets_webpacker_1_x' do
gem 'rails', '~> 5.0.0'
gem 'webpacker', '~> 1.2'
# This ExecJS backend provides stateful context
# which the default nodejs backend does not
gem 'therubyracer'
gem 'therubyracer', :platforms => :mri
gem 'therubyrhino', :platforms => :jruby
end

appraise 'rails-5_no_sprockets_webpacker_2' do
gem 'rails', '~> 5.0.0'
gem 'webpacker', '~> 2.0'
# This ExecJS backend provides stateful context
# which the default nodejs backend does not
gem 'therubyracer'
gem 'therubyracer', :platforms => :mri
gem 'therubyrhino', :platforms => :jruby
end

appraise 'rails-5_no_sprockets_webpacker_3' do
gem 'rails', '~> 5.0.0'
gem 'webpacker', '>= 3.0'
# This ExecJS backend provides stateful context
# which the default nodejs backend does not
gem 'therubyracer'
gem 'therubyracer', :platforms => :mri
gem 'therubyrhino', :platforms => :jruby
end

appraise 'rails-5-no_sprockets' do
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_3.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ gem "rails", "~> 3.2.21"
gem "rack-cache", "~> 1.6.1"
gem "turbolinks", "~> 2.0"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.0.5.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ source "http://rubygems.org"
gem "rails", "4.0.5"
gem "turbolinks"

gemspec :path => "../"
gemspec path: "../"
4 changes: 2 additions & 2 deletions gemfiles/rails_4.0_with_therubyracer.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
source "http://rubygems.org"

gem "rails", "~> 4.0.13"
gem "therubyracer", "0.12.0", :platform => :mri
gem "therubyracer", "0.12.0", platforms: :mri
gem "turbolinks"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ source "http://rubygems.org"
gem "rails", "~> 4.1.10"
gem "turbolinks", "~> 2.3.0"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.2_sprockets_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ gem "rails", "~> 4.2.1"
gem "sprockets", "~> 2.12"
gem "turbolinks"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.2_sprockets_3.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ gem "rails", "~> 4.2.1"
gem "sprockets", "~> 3.5"
gem "turbolinks", "~> 2.5.0"

gemspec :path => "../"
gemspec path: "../"
4 changes: 2 additions & 2 deletions gemfiles/rails_4.2_sprockets_4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ source "http://rubygems.org"
gem "rails", "~> 4.2.1"
gem "sprockets", "~> 4.0.x"
gem "turbolinks", "~> 2.5.0"
gem "mini_racer"
gem "mini_racer", platforms: :mri

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_5.1_sprockets_4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ gem "rails", "~> 5.1"
gem "sprockets", "~> 4.0.x"
gem "turbolinks", "~> 5.0.0"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_5_no_sprockets.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ source "http://rubygems.org"

gem "rails", "~> 5.0.0"

gemspec :path => "../"
gemspec path: "../"
5 changes: 3 additions & 2 deletions gemfiles/rails_5_no_sprockets_webpacker_1_1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ source "http://rubygems.org"

gem "rails", "~> 5.0.0"
gem "webpacker", "~> 1.1.0"
gem "therubyracer"
gem "therubyracer", platforms: :mri
gem "therubyrhino", platforms: :jruby

gemspec :path => "../"
gemspec path: "../"
5 changes: 3 additions & 2 deletions gemfiles/rails_5_no_sprockets_webpacker_1_x.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ source "http://rubygems.org"

gem "rails", "~> 5.0.0"
gem "webpacker", "~> 1.2"
gem "therubyracer"
gem "therubyracer", platforms: :mri
gem "therubyrhino", platforms: :jruby

gemspec :path => "../"
gemspec path: "../"
5 changes: 3 additions & 2 deletions gemfiles/rails_5_no_sprockets_webpacker_2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ source "http://rubygems.org"

gem "rails", "~> 5.0.0"
gem "webpacker", "~> 2.0"
gem "therubyracer"
gem "therubyracer", platforms: :mri
gem "therubyrhino", platforms: :jruby

gemspec :path => "../"
gemspec path: "../"
5 changes: 3 additions & 2 deletions gemfiles/rails_5_no_sprockets_webpacker_3.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ source "http://rubygems.org"

gem "rails", "~> 5.0.0"
gem "webpacker", ">= 3.0"
gem "therubyracer"
gem "therubyracer", platforms: :mri
gem "therubyrhino", platforms: :jruby

gemspec :path => "../"
gemspec path: "../"
Loading