aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/generators/app_generator_test.rb2
-rw-r--r--railties/test/railties/shared_tests.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 3ef06c7f25..58febfd9c7 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -23,7 +23,7 @@ DEFAULT_APP_FILES = %w(
lib
lib/tasks
log
- public/images
+ app/assets/images
script/rails
test/fixtures
test/functional
diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb
index b2b18938ae..e975950b85 100644
--- a/railties/test/railties/shared_tests.rb
+++ b/railties/test/railties/shared_tests.rb
@@ -11,7 +11,7 @@ module RailtiesTest
end
def test_serving_sprockets_assets
- @plugin.write "app/assets/javascripts/engine.js.coffee", "square = (x) -> x * x"
+ @plugin.write "app/assets/javascripts/engine.js.erb", "<%= :alert %>();"
boot_rails
require 'rack/test'
@@ -19,7 +19,7 @@ module RailtiesTest
extend Rack::Test::Methods
get "/assets/engine.js"
- assert_match "square = function(x) {", last_response.body
+ assert_match "alert();", last_response.body
end
def test_copying_migrations