Merge pull request #434 from lostapathy/patch-1

rafaelfranca · web-flow · commit e9ca63edb6e6 · 2018-09-25T17:52:05.000-04:00
Fix most travis failures, test against ruby 2.5.1
diff --git a/.travis.yml b/.travis.yml
@@ -11,6 +11,7 @@ rvm:
   - 2.2.7
   - 2.3.4
   - 2.4.1
+  - 2.5.1
 
 gemfile:
   - Gemfile
@@ -21,19 +22,29 @@ gemfile:
   - gemfiles/Gemfile.rails-5.0.x.sprockets-4.x
   - gemfiles/Gemfile.rails-5.1.x
   - gemfiles/Gemfile.rails-5.1.x.sprockets-4.x
+  - gemfiles/Gemfile.rails-5.2.x
+  - gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
 
 matrix:
   exclude:
     - gemfile: gemfiles/Gemfile.rails-4.0.x
       rvm: 2.4.1
     - gemfile: gemfiles/Gemfile.rails-4.1.x
       rvm: 2.4.1
+    - gemfile: gemfiles/Gemfile.rails-4.0.x
+      rvm: 2.5.1
+    - gemfile: gemfiles/Gemfile.rails-4.1.x
+      rvm: 2.5.1
     - gemfile: Gemfile
       rvm: 1.9.3
     - gemfile: Gemfile
       rvm: 2.0.0
     - gemfile: Gemfile
       rvm: 2.1
+    - gemfile: Gemfile
+      rvm: 2.2.7
+    - gemfile: Gemfile
+      rvm: 2.3.4
     - gemfile: gemfiles/Gemfile.rails-5.0.x
       rvm: 1.9.3
     - gemfile: gemfiles/Gemfile.rails-5.0.x
@@ -58,6 +69,18 @@ matrix:
       rvm: 2.0.0
     - gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x
       rvm: 2.1
+    - gemfile: gemfiles/Gemfile.rails-5.2.x
+      rvm: 1.9.3
+    - gemfile: gemfiles/Gemfile.rails-5.2.x
+      rvm: 2.0.0
+    - gemfile: gemfiles/Gemfile.rails-5.2.x
+      rvm: 2.1
+    - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
+      rvm: 1.9.3
+    - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
+      rvm: 2.0.0
+    - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
+      rvm: 2.1
 
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec
 
 gem 'actionpack', github: 'rails/rails', branch: 'master'
diff --git a/gemfiles/Gemfile.rails-4.1.x b/gemfiles/Gemfile.rails-4.1.x
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 gemspec :path => ".."
 
 gem "actionpack", "~> 4.1.0"
+gem "minitest", "< 5.11.0"
 gem "railties", "~> 4.1.0"
 gem "nokogiri", "< 1.7.0" if RUBY_VERSION < "2.1"
 gem "sass", "< 3.5.0" if RUBY_VERSION < "2.0"
diff --git a/gemfiles/Gemfile.rails-4.2.x b/gemfiles/Gemfile.rails-4.2.x
@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 gemspec :path => ".."
 
 gem 'actionpack', '~> 4.2.0'
+gem 'minitest', '< 5.11.0'
 gem 'railties', '~> 4.2.0'
 gem "nokogiri", "< 1.7.0" if RUBY_VERSION < "2.1"
 gem "sass", "< 3.5.0" if RUBY_VERSION < "2.0"
diff --git a/gemfiles/Gemfile.rails-5.0.x b/gemfiles/Gemfile.rails-5.0.x
@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec path: '..'
 
 gem 'actionpack', '~> 5.0.0'
+gem 'minitest', '< 5.11.0'
 gem 'railties', '~> 5.0.0'
 gem 'sprockets', github: 'rails/sprockets', branch: '3.x'
diff --git a/gemfiles/Gemfile.rails-5.0.x.sprockets-4.x b/gemfiles/Gemfile.rails-5.0.x.sprockets-4.x
@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec path: '..'
 
 gem 'actionpack', '~> 5.0.0'
+gem 'minitest', '< 5.11.0'
 gem 'railties', '~> 5.0.0'
 gem 'sprockets', github: 'rails/sprockets', branch: 'master'
diff --git a/gemfiles/Gemfile.rails-5.1.x b/gemfiles/Gemfile.rails-5.1.x
@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec path: '..'
 
-gem 'actionpack', github: 'rails/rails', branch: 'master'
-gem 'railties', github: 'rails/rails', branch: 'master'
-gem 'rack', github: 'rack/rack', branch: 'master'
+gem 'actionpack', '~> 5.1.0'
+gem 'minitest', '< 5.11.0'
+gem 'railties', '~> 5.1.0'
 gem 'sprockets', github: 'rails/sprockets', branch: '3.x'
diff --git a/gemfiles/Gemfile.rails-5.1.x.sprockets-4.x b/gemfiles/Gemfile.rails-5.1.x.sprockets-4.x
@@ -1,6 +1,8 @@
 source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 gemspec path: '..'
 
 gem 'actionpack', '~> 5.1.0'
+gem 'minitest', '< 5.11.0'
 gem 'railties', '~> 5.1.0'
 gem 'sprockets', github: 'rails/sprockets', branch: 'master'
diff --git a/gemfiles/Gemfile.rails-5.2.x b/gemfiles/Gemfile.rails-5.2.x
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+gemspec path: '..'
+
+gem 'actionpack', '~> 5.2.0'
+gem 'railties', '~> 5.2.0'
+gem 'sprockets', github: 'rails/sprockets', branch: '3.x'
diff --git a/gemfiles/Gemfile.rails-5.2.x.sprockets-4.x b/gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+gemspec path: '..'
+
+gem 'actionpack', '~> 5.2.0'
+gem 'railties', '~> 5.2.0'
+gem 'sprockets', github: 'rails/sprockets', branch: 'master'
diff --git a/test/test_railtie.rb b/test/test_railtie.rb
@@ -57,6 +57,12 @@ class TestRailtie < TestBoot
   def setup
     require 'sprockets/railtie'
     super
+
+    # sprockets-4.0.0.beta8 does not like 'rake assets:clobber' when this directory does not exist
+    Dir.chdir(app.root) do
+      dir = "tmp/cache/assets/sprockets"
+      FileUtils.mkdir_p(dir)
+    end
   end
 
   def test_defaults_to_compile_assets_with_env_and_manifest_available

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`source 'https://rubygems.org'`
	`2`	`+git_source(:github) { \|repo\| "https://github.com/#{repo}.git" }`
`2`	`3`	`gemspec`
`3`	`4`
`4`	`5`	`gem 'actionpack', github: 'rails/rails', branch: 'master'`