From c09ef94a494eb8d0f690a84bc82b2bddcfe13e1b Mon Sep 17 00:00:00 2001 From: Lauro Caetano Date: Thu, 21 Nov 2013 22:11:26 -0200 Subject: Remove turbolinks when generating a new application based on a template that skips it. It can be skipped adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }` to the template. --- railties/test/generators/app_generator_test.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'railties/test') diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index e6cda07ae5..8b0dc39d92 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -182,7 +182,7 @@ class AppGeneratorTest < Rails::Generators::TestCase template.unlink end - def test_application_html_checks_gems + def test_skip_turbolinks_when_it_is_not_on_gemfile template = Tempfile.open 'my_template' template.puts 'add_gem_entry_filter { |gem| gem.name != "turbolinks" }' template.flush @@ -191,11 +191,18 @@ class AppGeneratorTest < Rails::Generators::TestCase assert_file "Gemfile" do |contents| assert_no_match 'turbolinks', contents end - assert_file "Gemfile" do |contents| + + assert_file "app/views/layouts/application.html.erb" do |contents| assert_no_match 'turbolinks', contents end + assert_file "app/views/layouts/application.html.erb" do |contents| - assert_no_match 'turbolinks', contents + assert_no_match(/stylesheet_link_tag\s+"application", media: "all", "data-turbolinks-track" => true/, contents) + assert_no_match(/javascript_include_tag\s+"application", "data-turbolinks-track" => true/, contents) + end + + assert_file "app/assets/javascripts/application.js" do |contents| + assert_no_match %r{^//=\s+turbolinks\s}, contents end ensure template.close -- cgit v1.2.3