Merge pull request #465 from rails/fix-tests-and-add-ruby-2-7

Update ruby version testing matrix
rails · Sep 12, 2020 · 45a1b7a · 45a1b7a
2 parents c269f5e + 66fd4ab
commit 45a1b7a
Show file tree

Hide file tree

Showing 4 changed files with 183 additions and 140 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,9 +9,10 @@ rvm:
   - 2.1.10
   - 2.2.10
   - 2.3.8
-  - 2.4.5
-  - 2.5.3
-  - 2.6.0
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 
 gemfile:
   - Gemfile
@@ -30,17 +31,23 @@ gemfile:
 matrix:
   exclude:
     - gemfile: gemfiles/Gemfile.rails-4.0.x
-      rvm: 2.4.5
+      rvm: 2.4.10
     - gemfile: gemfiles/Gemfile.rails-4.1.x
-      rvm: 2.4.5
+      rvm: 2.4.10
     - gemfile: gemfiles/Gemfile.rails-4.0.x
-      rvm: 2.5.3
+      rvm: 2.5.8
     - gemfile: gemfiles/Gemfile.rails-4.1.x
-      rvm: 2.5.3
+      rvm: 2.5.8
     - gemfile: gemfiles/Gemfile.rails-4.0.x
-      rvm: 2.6.0
+      rvm: 2.6.6
     - gemfile: gemfiles/Gemfile.rails-4.1.x
-      rvm: 2.6.0
+      rvm: 2.6.6
+    - gemfile: gemfiles/Gemfile.rails-4.0.x
+      rvm: 2.7.1
+    - gemfile: gemfiles/Gemfile.rails-4.1.x
+      rvm: 2.7.1
+    - gemfile: gemfiles/Gemfile.rails-4.2.x
+      rvm: 2.7.1
     - gemfile: Gemfile
       rvm: 1.9.3
     - gemfile: Gemfile
@@ -52,7 +59,7 @@ matrix:
     - gemfile: Gemfile
       rvm: 2.3.8
     - gemfile: Gemfile
-      rvm: 2.4.5
+      rvm: 2.4.10
     - gemfile: gemfiles/Gemfile.rails-5.0.x
       rvm: 1.9.3
     - gemfile: gemfiles/Gemfile.rails-5.0.x
@@ -70,7 +77,7 @@ matrix:
     - gemfile: gemfiles/Gemfile.rails-5.0.x.sprockets-4.x
       rvm: 2.3.8
     - gemfile: gemfiles/Gemfile.rails-5.0.x.sprockets-4.x
-      rvm: 2.4.5
+      rvm: 2.4.10
     - gemfile: gemfiles/Gemfile.rails-5.1.x
       rvm: 1.9.3
     - gemfile: gemfiles/Gemfile.rails-5.1.x
@@ -88,13 +95,15 @@ matrix:
     - gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x
       rvm: 2.3.8
     - gemfile: gemfiles/Gemfile.rails-5.1.x.sprockets-4.x
-      rvm: 2.4.5
+      rvm: 2.4.10
     - 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.10
+    - gemfile: gemfiles/Gemfile.rails-5.2.x
+      rvm: 2.2.10
     - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
       rvm: 1.9.3
     - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
@@ -106,7 +115,7 @@ matrix:
     - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
       rvm: 2.3.8
     - gemfile: gemfiles/Gemfile.rails-5.2.x.sprockets-4.x
-      rvm: 2.4.5
+      rvm: 2.4.10
     - gemfile: gemfiles/Gemfile.rails-6.0.x
       rvm: 1.9.3
     - gemfile: gemfiles/Gemfile.rails-6.0.x
@@ -118,7 +127,7 @@ matrix:
     - gemfile: gemfiles/Gemfile.rails-6.0.x
       rvm: 2.3.8
     - gemfile: gemfiles/Gemfile.rails-6.0.x
-      rvm: 2.4.5
+      rvm: 2.4.10
     - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
       rvm: 1.9.3
     - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
@@ -130,7 +139,7 @@ matrix:
     - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
       rvm: 2.3.8
     - gemfile: gemfiles/Gemfile.rails-6.0.x.sprockets-4.x
-      rvm: 2.4.5
+      rvm: 2.4.10
 
 notifications:
   email: false

diff --git a/lib/sprockets/rails/helper.rb b/lib/sprockets/rails/helper.rb
@@ -58,7 +58,7 @@ def assets_environment
       end
 
       def self.extended(obj)
-        obj.class_eval do
+        obj.singleton_class.class_eval do
           attr_accessor(*VIEW_ACCESSORS)
 
           remove_method :assets_environment
@@ -352,8 +352,16 @@ def find_debug_asset(path)
         end
 
         private
-          def find_asset(path, options = {})
-            @env[path, **options]
+          if RUBY_VERSION >= "2.7"
+            class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def find_asset(path, options = {})
+                @env[path, **options]
+              end
+            RUBY
+          else
+            def find_asset(path, options = {})
+              @env[path, options]
+            end
           end
 
           def precompiled?(path)