diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-28 06:02:01 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-06-28 06:02:01 -0700 |
| commit | 6b745ec9ee691b803cb701b1efa4e463d90ee01f (patch) | |
| tree | bb19e895c29222874cdba06a9cad30dae4553e2e /railties/test | |
| parent | 8f63515f6efbc5c342dc9af9aa936e72261a18fe (diff) | |
| parent | e68183cccbfbefab66c2e74855f5b30525f8e902 (diff) | |
| download | rails-6b745ec9ee691b803cb701b1efa4e463d90ee01f.tar.gz rails-6b745ec9ee691b803cb701b1efa4e463d90ee01f.tar.bz2 rails-6b745ec9ee691b803cb701b1efa4e463d90ee01f.zip | |
Merge pull request #11163 from nfedyashev/omit_turbolinks_on_javascript_skip_option
Omit turbolinks configuration completely on skip_javascript generator option
Diffstat (limited to 'railties/test')
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index e992534938..42b6275932 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -53,9 +53,10 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_assets run_generator - assert_file "app/views/layouts/application.html.erb", /stylesheet_link_tag\s+"application"/ - assert_file "app/views/layouts/application.html.erb", /javascript_include_tag\s+"application"/ - assert_file "app/assets/stylesheets/application.css" + + assert_file("app/views/layouts/application.html.erb", /stylesheet_link_tag\s+"application", media: "all", "data-turbolinks-track" => true/) + assert_file("app/views/layouts/application.html.erb", /javascript_include_tag\s+"application", "data-turbolinks-track" => true/) + assert_file("app/assets/stylesheets/application.css") end def test_invalid_application_name_raises_an_error @@ -295,6 +296,10 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "app/assets/javascripts/application.js" do |contents| assert_no_match %r{^//=\s+require\s}, contents end + assert_file "app/views/layouts/application.html.erb" do |contents| + assert_match(/stylesheet_link_tag\s+"application", media: "all" %>/, contents) + assert_match(/javascript_include_tag\s+"application" \%>/, contents) + end assert_file "Gemfile" do |content| assert_match(/coffee-rails/, content) end |