Permalink
Browse files

Test against master

  • Loading branch information...
1 parent a2d0ae6 commit 52b24bab699adf382f9a2b1faff35613aedd3e4a Rafael Mendonça França committed Dec 12, 2013
Showing with 13 additions and 2 deletions.
  1. +1 −1 .gitignore
  2. +4 −0 .travis.yml
  3. +0 −1 Gemfile
  4. +8 −0 test/gemfiles/Gemfile-master
View
@@ -1,5 +1,5 @@
*.gem
.bundle
-Gemfile.lock
+*.lock
pkg/*
.sass-cache
View
@@ -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:
View
@@ -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"
@@ -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"

0 comments on commit 52b24ba

Please sign in to comment.