diff options
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 2 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/app/templates/test/application_system_test_case.rb (renamed from railties/lib/rails/generators/rails/app/templates/test/system_test_helper.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/rails/plugin/templates/test/application_system_test_case.rb (renamed from railties/lib/rails/generators/rails/plugin/templates/test/system_test_helper.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/system/system_generator.rb | 4 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/system/templates/application_system_test_case.rb (renamed from railties/lib/rails/generators/test_unit/system/templates/system_test_helper.rb) | 0 | ||||
-rw-r--r-- | railties/lib/rails/generators/test_unit/system/templates/system_test.rb | 2 |
6 files changed, 4 insertions, 4 deletions
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/system_test_helper.rb b/railties/lib/rails/generators/rails/app/templates/test/application_system_test_case.rb index d19212abd5..d19212abd5 100644 --- a/railties/lib/rails/generators/rails/app/templates/test/system_test_helper.rb +++ b/railties/lib/rails/generators/rails/app/templates/test/application_system_test_case.rb diff --git a/railties/lib/rails/generators/rails/plugin/templates/test/system_test_helper.rb b/railties/lib/rails/generators/rails/plugin/templates/test/application_system_test_case.rb index d19212abd5..d19212abd5 100644 --- a/railties/lib/rails/generators/rails/plugin/templates/test/system_test_helper.rb +++ b/railties/lib/rails/generators/rails/plugin/templates/test/application_system_test_case.rb 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/system_test_helper.rb b/railties/lib/rails/generators/test_unit/system/templates/application_system_test_case.rb index d19212abd5..d19212abd5 100644 --- a/railties/lib/rails/generators/test_unit/system/templates/system_test_helper.rb +++ b/railties/lib/rails/generators/test_unit/system/templates/application_system_test_case.rb 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 |