Fix image_tag behavior on windows. [#1085 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>

2 files changed, 14 insertions, 1 deletions

diff --git a/actionpack/lib/action_view/helpers/asset_tag_helper.rb b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
index 63ccde393a..93d38eb929 100644
--- a/actionpack/lib/action_view/helpers/asset_tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/asset_tag_helper.rb
@@ -596,7 +596,7 @@ module ActionView
             end
 
             def missing_extension?(source)
-              extension && File.extname(source).blank? || File.exist?(File.join(ASSETS_DIR, directory, "#{source}.#{extension}"))
+              extension && (File.extname(source).blank? || File.exist?(File.join(ASSETS_DIR, directory, "#{source}.#{extension}")))
             end
 
             def prepend_relative_url_root(source)
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb
index aaf9fe2ebf..6dc1225035 100644
--- a/actionpack/test/template/asset_tag_helper_test.rb
+++ b/actionpack/test/template/asset_tag_helper_test.rb
@@ -230,6 +230,19 @@ class AssetTagHelperTest < ActionView::TestCase
     ImageLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
   end
 
+  uses_mocha 'test image tag with windows behaviour' do
+    def test_image_tag_windows_behaviour
+      old_asset_id, ENV["RAILS_ASSET_ID"] = ENV["RAILS_ASSET_ID"], "1"
+      # This simulates the behaviour of File#exist? on windows when testing a file ending in "."
+      # If the file "rails.png" exists, windows will return true when asked if "rails.png." exists (notice trailing ".")
+      # OS X, linux etc will return false in this case.
+      File.stubs(:exist?).with('template/../fixtures/public/images/rails.png.').returns(true)
+      assert_equal '<img alt="Rails" src="/images/rails.png?1" />', image_tag('rails.png')
+    ensure
+      ENV["RAILS_ASSET_ID"] = old_asset_id
+    end
+  end
+
   def test_timebased_asset_id
     expected_time = File.stat(File.expand_path(File.dirname(__FILE__) + "/../fixtures/public/images/rails.png")).mtime.to_i.to_s
     assert_equal %(<img alt="Rails" src="/images/rails.png?#{expected_time}" />), image_tag("rails.png")