Merge pull request #400 from y-yagi/allow-rails-51

Allow Rails 5.1 and test with it

Author: pixeltrix

.travis.yml

@@ -25,15 +25,25 @@ matrix:
   fast_finish: true
   include:
     - gemfile: gemfiles/Gemfile-rails-5-0
+      rvm: 2.2.7
+    - gemfile: gemfiles/Gemfile-rails-5-1
+      rvm: 2.2.7
+    - gemfile: gemfiles/Gemfile-rails-5-0
+      rvm: 2.3.4
+    - gemfile: gemfiles/Gemfile-rails-5-1
       rvm: 2.3.4
     - gemfile: Gemfile
       rvm: 2.3.4
     - gemfile: gemfiles/Gemfile-rails-5-0
       rvm: 2.4.1
+    - gemfile: gemfiles/Gemfile-rails-5-1
+      rvm: 2.4.1
     - gemfile: Gemfile
       rvm: 2.4.1
     - gemfile: gemfiles/Gemfile-rails-5-0
       rvm: ruby-head
+    - gemfile: gemfiles/Gemfile-rails-5-1
+      rvm: ruby-head
     - gemfile: Gemfile
       rvm: ruby-head
 

gemfiles/Gemfile-rails-4-2

@@ -6,3 +6,6 @@ gemspec path: ".."
 gem "rails", "~> 4.2.0"
 gem "sprockets", "~> 4.0.0.beta2"
 gem "sprockets-rails", "~> 3.0.4"
+if RUBY_VERSION < '2.1.0'
+  gem 'nokogiri', '~> 1.6.8'
+end

gemfiles/Gemfile-rails-5-1

@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+# Specify your gem"s dependencies in sass-rails.gemspec
+gemspec path: ".."
+
+gem "rails", "~> 5.1.0"
+gem "sprockets", "~> 4.0.0.beta2"
+gem "sprockets-rails", "~> 3.0.4"

sass-rails.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{Sass adapter for the Rails asset pipeline.}
   s.license     = %q{MIT}
 
-  s.add_dependency 'railties',        '>= 4.0.0', '< 5.1'
+  s.add_dependency 'railties',        '>= 4.0.0', '< 6'
   s.add_dependency 'sass',            '~> 3.4'
   s.add_dependency 'sprockets-rails', '< 4.0'
   s.add_dependency 'sprockets',       '~> 4.x'

test/fixtures/alternate_config_project/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

test/fixtures/engine_project/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

test/fixtures/engine_project/engine_project.gemspec

@@ -7,16 +7,15 @@ require "engine_project/version"
 Gem::Specification.new do |s|
   s.name        = "engine_project"
   s.version     = EngineProject::VERSION
-  s.authors     = ["TODO: Your name"]
-  s.email       = ["TODO: Your email"]
-  s.homepage    = "TODO"
-  s.summary     = "TODO: Summary of EngineProject."
-  s.description = "TODO: Description of EngineProject."
+  s.authors     = ["Your name"]
+  s.email       = ["Your email"]
+  s.summary     = "Summary of EngineProject."
+  s.description = "Description of EngineProject."
 
   s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["test/**/*"]
 
-  s.add_dependency "rails", ">= 4.0.0.beta", "< 5.0"
+  s.add_dependency "rails", ">= 4.0.0.beta", "< 6"
   # s.add_dependency "jquery-rails"
 
   s.add_development_dependency "sqlite3"

test/fixtures/engine_project/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

test/fixtures/engine_project/test/dummy/config/initializers/session_store.rb

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css