From 2d61c5d846f8dd3a02080fedce7ab63b8d314db6 Mon Sep 17 00:00:00 2001 From: eileencodes Date: Mon, 20 Feb 2017 14:38:46 -0500 Subject: Rename system_test_helper -> application_system_test_case This renames the system test helper file to be application system test case to match what the rest of Rails does. In the future we should consider changing the test_helper to match. --- railties/lib/rails/generators/rails/app/app_generator.rb | 2 +- .../rails/app/templates/test/application_system_test_case.rb | 5 +++++ .../rails/generators/rails/app/templates/test/system_test_helper.rb | 5 ----- .../rails/plugin/templates/test/application_system_test_case.rb | 5 +++++ .../generators/rails/plugin/templates/test/system_test_helper.rb | 5 ----- railties/lib/rails/generators/test_unit/system/system_generator.rb | 4 ++-- .../test_unit/system/templates/application_system_test_case.rb | 5 +++++ .../lib/rails/generators/test_unit/system/templates/system_test.rb | 2 +- .../generators/test_unit/system/templates/system_test_helper.rb | 5 ----- 9 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 railties/lib/rails/generators/rails/app/templates/test/application_system_test_case.rb delete mode 100644 railties/lib/rails/generators/rails/app/templates/test/system_test_helper.rb create mode 100644 railties/lib/rails/generators/rails/plugin/templates/test/application_system_test_case.rb delete mode 100644 railties/lib/rails/generators/rails/plugin/templates/test/system_test_helper.rb create mode 100644 railties/lib/rails/generators/test_unit/system/templates/application_system_test_case.rb delete mode 100644 railties/lib/rails/generators/test_unit/system/templates/system_test_helper.rb (limited to 'railties') diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index acdb66ca85..18e48c8016 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -153,7 +153,7 @@ module Rails def system_test empty_directory_with_keep_file "test/system" - template "test/system_test_helper.rb" + template "test/application_system_test_case.rb" end def tmp diff --git a/railties/lib/rails/generators/rails/app/templates/test/application_system_test_case.rb b/railties/lib/rails/generators/rails/app/templates/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/railties/lib/rails/generators/rails/app/templates/test/system_test_helper.rb b/railties/lib/rails/generators/rails/app/templates/test/system_test_helper.rb deleted file mode 100644 index d19212abd5..0000000000 --- a/railties/lib/rails/generators/rails/app/templates/test/system_test_helper.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "test_helper" - -class ApplicationSystemTestCase < ActionDispatch::SystemTestCase - driven_by :selenium, using: :chrome, screen_size: [1400, 1400] -end diff --git a/railties/lib/rails/generators/rails/plugin/templates/test/application_system_test_case.rb b/railties/lib/rails/generators/rails/plugin/templates/test/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/railties/lib/rails/generators/rails/plugin/templates/test/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/railties/lib/rails/generators/rails/plugin/templates/test/system_test_helper.rb b/railties/lib/rails/generators/rails/plugin/templates/test/system_test_helper.rb deleted file mode 100644 index d19212abd5..0000000000 --- a/railties/lib/rails/generators/rails/plugin/templates/test/system_test_helper.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "test_helper" - -class ApplicationSystemTestCase < ActionDispatch::SystemTestCase - driven_by :selenium, using: :chrome, screen_size: [1400, 1400] -end diff --git a/railties/lib/rails/generators/test_unit/system/system_generator.rb b/railties/lib/rails/generators/test_unit/system/system_generator.rb index e77ccef009..aec415a4e5 100644 --- a/railties/lib/rails/generators/test_unit/system/system_generator.rb +++ b/railties/lib/rails/generators/test_unit/system/system_generator.rb @@ -6,8 +6,8 @@ module TestUnit # :nodoc: check_class_collision suffix: "Test" def create_test_files - if !File.exist?(File.join("test/system_test_helper.rb")) - template "system_test_helper.rb", File.join("test", "system_test_helper.rb") + if !File.exist?(File.join("test/application_system_test_case.rb")) + template "application_system_test_case.rb", File.join("test", "application_system_test_case.rb") end template "system_test.rb", File.join("test/system", "#{file_name.pluralize}_test.rb") diff --git a/railties/lib/rails/generators/test_unit/system/templates/application_system_test_case.rb b/railties/lib/rails/generators/test_unit/system/templates/application_system_test_case.rb new file mode 100644 index 0000000000..d19212abd5 --- /dev/null +++ b/railties/lib/rails/generators/test_unit/system/templates/application_system_test_case.rb @@ -0,0 +1,5 @@ +require "test_helper" + +class ApplicationSystemTestCase < ActionDispatch::SystemTestCase + driven_by :selenium, using: :chrome, screen_size: [1400, 1400] +end diff --git a/railties/lib/rails/generators/test_unit/system/templates/system_test.rb b/railties/lib/rails/generators/test_unit/system/templates/system_test.rb index 2afc7a4aac..b5ce2ba5c8 100644 --- a/railties/lib/rails/generators/test_unit/system/templates/system_test.rb +++ b/railties/lib/rails/generators/test_unit/system/templates/system_test.rb @@ -1,4 +1,4 @@ -require "system_test_helper" +require "application_system_test_case" class <%= class_name.pluralize %>Test < ApplicationSystemTestCase # test "visiting the index" do diff --git a/railties/lib/rails/generators/test_unit/system/templates/system_test_helper.rb b/railties/lib/rails/generators/test_unit/system/templates/system_test_helper.rb deleted file mode 100644 index d19212abd5..0000000000 --- a/railties/lib/rails/generators/test_unit/system/templates/system_test_helper.rb +++ /dev/null @@ -1,5 +0,0 @@ -require "test_helper" - -class ApplicationSystemTestCase < ActionDispatch::SystemTestCase - driven_by :selenium, using: :chrome, screen_size: [1400, 1400] -end -- cgit v1.2.3