Merge pull request #272 from rails/test-more-versions

josh · josh · commit 6a39f6a20e81 · 2014-11-23T15:27:56.000-08:00
Add tests for additional dependency permutations
diff --git a/.travis.yml b/.travis.yml
@@ -4,8 +4,10 @@ rvm:
  - 2.0.0
  - 2.1.0
 gemfile:
-  - test/gemfiles/Gemfile-4-0-stable
-  - test/gemfiles/Gemfile-4-1-stable
+  - test/gemfiles/Gemfile-rails-4-0
+  - test/gemfiles/Gemfile-rails-4-1
+  - test/gemfiles/Gemfile-sprockets-2-11
+  - test/gemfiles/Gemfile-sprockets-2-8
   - Gemfile
 before_install: gem install bundler
 script: bundle exec rake test
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in sass-rails.gemspec
 gemspec
-
-gem "rails"
-
-gem "sqlite3"
diff --git a/sass-rails.gemspec b/sass-rails.gemspec
diff --git a/sass-rails.gemspec.erb b/sass-rails.gemspec.erb
@@ -15,11 +15,14 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "sass-rails"
 
-  s.add_dependency 'sass',            '~> 3.2.2'
   s.add_dependency 'railties',        '>= 4.0.0', '< 5.0'
+  s.add_dependency 'sass',            '~> 3.2.2'
   s.add_dependency 'sprockets-rails', '~> 2.0'
   s.add_dependency 'sprockets',       '~> 2.8', '< 2.12'
 
+  s.add_development_dependency 'rails'
+  s.add_development_dependency 'sqlite3'
+
   s.files         = [<%= files.map(&:inspect).join ',' %>]
   s.executables   = [<%= executables.map(&:inspect).join ',' %>]
   s.require_paths = ["lib"]
diff --git a/test/gemfiles/Gemfile-4-0-stable b/test/gemfiles/Gemfile-4-0-stable
diff --git a/test/gemfiles/Gemfile-4-1-stable b/test/gemfiles/Gemfile-4-1-stable
diff --git a/test/gemfiles/Gemfile-rails-4-0 b/test/gemfiles/Gemfile-rails-4-0
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: "../.."
+
+gem "rails", "~> 4.0.0"
diff --git a/test/gemfiles/Gemfile-rails-4-1 b/test/gemfiles/Gemfile-rails-4-1
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: "../.."
+
+gem "rails", "~> 4.1.0"
diff --git a/test/gemfiles/Gemfile-sprockets-2-11 b/test/gemfiles/Gemfile-sprockets-2-11
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: "../.."
+
+gem "sprockets", "~> 2.11.0"
diff --git a/test/gemfiles/Gemfile-sprockets-2-8 b/test/gemfiles/Gemfile-sprockets-2-8
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: "../.."
+
+gem "sprockets", "~> 2.8.0"
