Merge pull request #8756 from causes/js_include_tag_fix

Fix javascript_include_tag when no js runtime is available

1 files changed, 16 insertions, 9 deletions

diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb
index bc573d8640..51f0cbb2da 100644
--- a/actionpack/lib/sprockets/helpers/rails_helper.rb
+++ b/actionpack/lib/sprockets/helpers/rails_helper.rb
@@ -157,18 +157,25 @@ module Sprockets
         end
 
         def rewrite_extension(source, dir, ext)
-          source_ext = File.extname(source)
-          if ext && source_ext != ".#{ext}"
-            if !source_ext.empty? && (asset = asset_environment[source]) &&
-                  asset.pathname.to_s =~ /#{source}\Z/
-              source
-            else
-              "#{source}.#{ext}"
-            end
-          else
+          source_ext = File.extname(source)[1..-1]
+
+          if !ext || ext == source_ext
+            source
+          elsif source_ext.blank?
+            "#{source}.#{ext}"
+          elsif exact_match_present?(source)
             source
+          else
+            "#{source}.#{ext}"
           end
         end
+
+        def exact_match_present?(source)
+          pathname = asset_environment.resolve(source)
+          pathname.to_s =~ /#{Regexp.escape(source)}\Z/
+        rescue Sprockets::FileNotFound
+          false
+        end
       end
     end
   end