aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test/generators')
-rw-r--r--railties/test/generators/app_generator_test.rb2
-rw-r--r--railties/test/generators/plugin_new_generator_test.rb8
2 files changed, 2 insertions, 8 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 1f0ef922cd..42a49eb03c 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -145,7 +145,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
def test_test_unit_is_skipped_if_required
run_generator [destination_root, "--skip-test-unit"]
- assert_no_file "test"
+ assert_no_file "test"
end
def test_javascript_is_skipped_if_required
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index e8a9c8ff51..2049d31b18 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -13,8 +13,6 @@ DEFAULT_PLUGIN_FILES = %w(
lib/bukkits.rb
script/rails
test/bukkits_test.rb
- test/integration/navigation_test.rb
- test/support/integration_case.rb
test/test_helper.rb
test/dummy
)
@@ -43,12 +41,8 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
def test_generating_test_files
run_generator
assert_file "test/test_helper.rb"
- assert_directory "test/support/"
- assert_directory "test/integration/"
assert_file "test/bukkits_test.rb", /assert_kind_of Module, Bukkits/
- assert_file "test/integration/navigation_test.rb", /assert_kind_of Dummy::Application, Rails.application/
- assert_file "test/support/integration_case.rb", /class ActiveSupport::IntegrationCase/
end
def test_ensure_that_plugin_options_are_not_passed_app_generator
@@ -66,7 +60,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
run_generator
FileUtils.cd destination_root
`bundle install`
- assert_match /2 tests, 2 assertions, 0 failures, 0 errors/, `bundle exec rake test`
+ assert_match /1 tests, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`
end
protected