Skip to content

Fix broken tests #404

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.

Sign up for GitHub

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 4 commits into from
Jun 11, 2017
Merged

Fix broken tests #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1ebff3
Use nokogiri 1.6.x on Ruby 2.0
y-yagi Jun 10, 2017
fe62a75
Use Rails 4.2 below Ruby 2.1
y-yagi Jun 10, 2017
12624d2
Add manifest files
y-yagi Jun 10, 2017
516609d
Remove unused session_store initializer
y-yagi Jun 10, 2017
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
1 change: 1 addition & 0 deletions gemfiles/Gemfile-rails-4-2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ gem "rails", "~> 4.2.0"
gem "sass", "~> 3.3.0"
gem "mime-types", "< 2"
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-sass-3-1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: ".."

gem "rails"
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "rails", "~> 4.2.0"
else
gem "rails"
end
gem "sass", "~> 3.1.0"
gem "mime-types", "< 2"
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-sass-3-2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: ".."

gem "rails"
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "rails", "~> 4.2.0"
else
gem "rails"
end
gem "sass", "~> 3.2.0"
gem "mime-types", "< 2"
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-sass-3-3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: ".."

gem "rails"
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "rails", "~> 4.2.0"
else
gem "rails"
end
gem "sass", "~> 3.3.0"
gem "mime-types", "< 2"
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-sass-3-4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: ".."

gem "rails"
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "rails", "~> 4.2.0"
else
gem "rails"
end
gem "sass", "~> 3.4.0"
gem "mime-types", "< 2"
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-sprockets-2-11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: ".."

gem "rails"
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "rails", "~> 4.2.0"
else
gem "rails"
end
gem "sprockets", "~> 2.11.0"
gem "sass", "~> 3.3.0"
gem "mime-types", "< 2"
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-sprockets-2-12
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: ".."

gem "rails"
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "rails", "~> 4.2.0"
else
gem "rails"
end
gem "sprockets", "~> 2.12.0"
gem "sass", "~> 3.3.0"
gem "mime-types", "< 2"
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-sprockets-2-8
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: ".."

gem "rails"
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "rails", "~> 4.2.0"
else
gem "rails"
end
gem "sprockets", "~> 2.8.0"
gem "sass", "~> 3.3.0"
gem "mime-types", "< 2"
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-sprockets-3-0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: ".."

gem "rails"
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "rails", "~> 4.2.0"
else
gem "rails"
end
gem "sprockets", "~> 3.0.0"
gem "sass", "~> 3.3.0"
gem "mime-types", "< 2"
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-sprockets-4-0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: ".."

gem "rails"
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "rails", "~> 4.2.0"
else
gem "rails"
end
gem "sprockets", "~> 4.x"
gem 'mime-types', '< 3', require: false if RUBY_VERSION.start_with?('1.9')
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-sprockets-rails-2-2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: ".."

gem "rails"
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "rails", "~> 4.2.0"
else
gem "rails"
end
gem "sprockets-rails", "~> 2.2.0"
gem "sass", "~> 3.3.0"
gem "mime-types", "< 2"
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
7 changes: 6 additions & 1 deletion gemfiles/Gemfile-sprockets-rails-master
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,13 @@ source "https://rubygems.org"
# Specify your gem"s dependencies in sass-rails.gemspec
gemspec path: ".."

gem "rails"
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "rails", "~> 4.2.0"
else
gem "rails"
end
gem "sprockets-rails", github: "rails/sprockets-rails"
gem "sass", "~> 3.3.0"
gem "mime-types", "< 2"
gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
gem "nokogiri", "~> 1.6.8" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.1")
3 changes: 3 additions & 0 deletions test/fixtures/engine_project/app/assets/config/manifest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
3 changes: 3 additions & 0 deletions test/fixtures/engine_project/test/dummy/app/assets/config/manifest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
3 changes: 0 additions & 3 deletions test/fixtures/engine_project/test/dummy/config/initializers/session_store.rb
View file
Open in desktop

This file was deleted.