diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-07 12:30:14 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-07 12:30:14 -0700 |
| commit | c35853f0440e00b153153a139ea5f66a1138035a (patch) | |
| tree | 29b6feeb706de3bd698a2df103435ef91e86ad8a | |
| parent | d498b5e6baeda404b6d00909c5ae4302cd39783a (diff) | |
| parent | 635817ec8eace0e301940c9be518beb23f522c23 (diff) | |
| download | rails-c35853f0440e00b153153a139ea5f66a1138035a.tar.gz rails-c35853f0440e00b153153a139ea5f66a1138035a.tar.bz2 rails-c35853f0440e00b153153a139ea5f66a1138035a.zip | |
Merge pull request #7284 from josh/fix-asset-tests
Fix asset integration test (3-2-stable)
| -rw-r--r-- | railties/test/application/assets_test.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb index 33a6800e14..6e638ed85f 100644 --- a/railties/test/application/assets_test.rb +++ b/railties/test/application/assets_test.rb @@ -83,9 +83,8 @@ module ApplicationTests images_should_compile = ["a.png", "happyface.png", "happy_face.png", "happy.face.png", "happy-face.png", "happy.happy_face.png", "happy_happy.face.png", - "happy.happy.face.png", "happy", "happy.face", "-happyface", - "-happy.png", "-happy.face.png", "_happyface", "_happy.face.png", - "_happy.png"] + "happy.happy.face.png", "-happy.png", "-happy.face.png", + "_happy.face.png", "_happy.png"] images_should_compile.each do |filename| app_file "app/assets/images/#{filename}", "happy" |