Merge pull request #383 from rails/schneems/fix-5-0-stable

schneems · web-flow · commit 6569899f0902 · 2016-07-22T14:45:19.000-05:00
Fix tests with Rack and mime-types for Ruby 1.9
diff --git a/gemfiles/Gemfile-rails-4-0 b/gemfiles/Gemfile-rails-4-0
@@ -6,3 +6,4 @@ gemspec path: ".."
 gem "rails", "~> 4.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")
diff --git a/gemfiles/Gemfile-rails-4-1 b/gemfiles/Gemfile-rails-4-1
@@ -6,3 +6,4 @@ gemspec path: ".."
 gem "rails", "~> 4.1.0"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
+gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
diff --git a/gemfiles/Gemfile-rails-4-2 b/gemfiles/Gemfile-rails-4-2
@@ -6,3 +6,4 @@ gemspec path: ".."
 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")
diff --git a/gemfiles/Gemfile-rails-5-0 b/gemfiles/Gemfile-rails-5-0
@@ -4,3 +4,4 @@ source "https://rubygems.org"
 gemspec path: ".."
 
 gem "rails", github: 'rails/rails', branch: '5-0-stable'
+gem 'mime-types', '< 3', require: false if RUBY_VERSION.start_with?('1.9')
diff --git a/gemfiles/Gemfile-sass-3-1 b/gemfiles/Gemfile-sass-3-1
@@ -6,3 +6,4 @@ gemspec path: ".."
 gem "rails"
 gem "sass", "~> 3.1.0"
 gem "mime-types", "< 2"
+gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
diff --git a/gemfiles/Gemfile-sass-3-2 b/gemfiles/Gemfile-sass-3-2
@@ -6,3 +6,4 @@ gemspec path: ".."
 gem "rails"
 gem "sass", "~> 3.2.0"
 gem "mime-types", "< 2"
+gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
diff --git a/gemfiles/Gemfile-sass-3-3 b/gemfiles/Gemfile-sass-3-3
@@ -6,3 +6,4 @@ gemspec path: ".."
 gem "rails"
 gem "sass", "~> 3.3.0"
 gem "mime-types", "< 2"
+gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
diff --git a/gemfiles/Gemfile-sass-3-4 b/gemfiles/Gemfile-sass-3-4
@@ -6,3 +6,4 @@ gemspec path: ".."
 gem "rails"
 gem "sass", "~> 3.4.0"
 gem "mime-types", "< 2"
+gem "rack", "< 2" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.2")
diff --git a/gemfiles/Gemfile-sprockets-2-11 b/gemfiles/Gemfile-sprockets-2-11
@@ -7,3 +7,4 @@ gem "rails"
 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")
diff --git a/gemfiles/Gemfile-sprockets-2-12 b/gemfiles/Gemfile-sprockets-2-12
@@ -7,3 +7,4 @@ gem "rails"
 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")
diff --git a/gemfiles/Gemfile-sprockets-2-8 b/gemfiles/Gemfile-sprockets-2-8
@@ -7,3 +7,4 @@ gem "rails"
 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")
diff --git a/gemfiles/Gemfile-sprockets-3-0 b/gemfiles/Gemfile-sprockets-3-0
@@ -7,3 +7,4 @@ gem "rails"
 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")
diff --git a/gemfiles/Gemfile-sprockets-4-0 b/gemfiles/Gemfile-sprockets-4-0
@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: ".."
+
+gem "rails"
+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")
diff --git a/gemfiles/Gemfile-sprockets-rails-2-2 b/gemfiles/Gemfile-sprockets-rails-2-2
@@ -7,3 +7,4 @@ gem "rails"
 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")
diff --git a/gemfiles/Gemfile-sprockets-rails-master b/gemfiles/Gemfile-sprockets-rails-master
@@ -7,3 +7,4 @@ gem "rails"
 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")

Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,4 @@ source "https://rubygems.org"`
`4`	`4`	`gemspec path: ".."`
`5`	`5`
`6`	`6`	`gem "rails", github: 'rails/rails', branch: '5-0-stable'`
	`7`	`+gem 'mime-types', '< 3', require: false if RUBY_VERSION.start_with?('1.9')`