aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorLauro Caetano <laurocaetano1@gmail.com>2013-11-22 10:32:52 -0200
committerLauro Caetano <laurocaetano1@gmail.com>2013-11-22 10:49:41 -0200
commit5ba606e1c6aa719fc25e7d10a4d460aae3c8e22c (patch)
treeae13dd02086cd9cacac003ecb277f47bb5616df9 /railties
parent18964368f3725e166719b6dc1f4b6546f6ef9e0c (diff)
downloadrails-5ba606e1c6aa719fc25e7d10a4d460aae3c8e22c.tar.gz
rails-5ba606e1c6aa719fc25e7d10a4d460aae3c8e22c.tar.bz2
rails-5ba606e1c6aa719fc25e7d10a4d460aae3c8e22c.zip
Fix the assertion for not inclusion of turbolinks on application.js.
We were asserting if `//= turbolinks` was not present while the correct is asserting that `//= require turbolinks` is not present.
Diffstat (limited to 'railties')
-rw-r--r--railties/test/generators/app_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 8b0dc39d92..6fccd1b399 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -202,7 +202,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
end
assert_file "app/assets/javascripts/application.js" do |contents|
- assert_no_match %r{^//=\s+turbolinks\s}, contents
+ assert_no_match %r{^//= require turbolinks}, contents
end
ensure
template.close