diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-07-24 21:02:51 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-07-24 21:02:51 +0200 |
| commit | 4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364 (patch) | |
| tree | d2bd733be55a75d5aab8fbcfc4adbb83034980bc /actionpack/test/template | |
| parent | 97716e6273018c5531c7c927d226af823a0a3820 (diff) | |
| parent | 0626668374d092a3cf72b16fe24944beffddf804 (diff) | |
| download | rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.gz rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.tar.bz2 rails-4bb0a8bcbdf771dfdfeb5e0f77a07bc60c14d364.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/test/template')
| -rw-r--r-- | actionpack/test/template/asset_tag_helper_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/template/asset_tag_helper_test.rb b/actionpack/test/template/asset_tag_helper_test.rb index d5bd7256f7..e88a3591d8 100644 --- a/actionpack/test/template/asset_tag_helper_test.rb +++ b/actionpack/test/template/asset_tag_helper_test.rb @@ -443,7 +443,7 @@ class AssetTagHelperTest < ActionView::TestCase 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 "." + # This simulates the behavior 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) |