Test against master

Rafael Mendonça França · Rafael Mendonça França · commit 52b24bab699a · 2013-12-12T19:44:39.000-02:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 *.gem
 .bundle
-Gemfile.lock
+*.lock
 pkg/*
 .sass-cache
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,10 @@ language: ruby
 rvm:
  - 1.9.3
  - 2.0.0
+ - 2.1.0-preview2
+gemfile:
+  - test/gemfiles/Gemfile-master
+  - Gemfile
 before_install: gem install bundler
 script: bundle exec rake test
 notifications:
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,6 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in sass-rails.gemspec
 gemspec
 
-# Track Rails master
 gem "rails"
 
 gem "sqlite3"
diff --git a/test/gemfiles/Gemfile-master b/test/gemfiles/Gemfile-master
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in sass-rails.gemspec
+gemspec path: '../..'
+
+gem "rails", github: 'rails/rails', branch: 'master'
+
+gem "sqlite3"

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 *.gem
 .bundle
 -Gemfile.lock
 +*.lock
 pkg/*
 .sass-cache