From 6ee461237a04122559bf9871df602eec4079cd08 Mon Sep 17 00:00:00 2001 From: Stefan Sprenger Date: Thu, 26 May 2011 17:54:31 +0200 Subject: We're now using generators directly --- railties/test/generators/plugin_new_generator_test.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'railties/test/generators') diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index 528c73ffaf..32d7c58267 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -232,7 +232,6 @@ class CustomPluginGeneratorTest < Rails::Generators::TestCase assert_file 'spec/dummy' assert_file 'Rakefile', /task :default => :spec/ assert_file 'Rakefile', /# spec tasks in rakefile/ - assert_file 'script/rails', %r{spec/dummy} end protected -- cgit v1.2.3 From 9935c308f14df1eab1e1334dc007bae999dab92f Mon Sep 17 00:00:00 2001 From: Stefan Sprenger Date: Fri, 27 May 2011 08:25:56 +0200 Subject: Fix and test ENGINE_PATH and ENGINE_ROOT --- railties/test/generators/plugin_new_generator_test.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'railties/test/generators') diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index 32d7c58267..25663ef109 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -177,6 +177,14 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_file "bukkits.gemspec", /s.version = "0.0.1"/ end + def test_usage_of_engine_commands + run_generator + assert_file "script/rails", /ENGINE_PATH = File.expand_path\('..\/..\/lib\/bukkits\/engine', __FILE__\)/ + assert_file "script/rails", /ENGINE_ROOT = File.expand_path\('..\/..', __FILE__\)/ + assert_file "script/rails", /require 'rails\/all'/ + assert_file "script/rails", /require 'rails\/engine\/commands/ + end + def test_shebang run_generator assert_file "script/rails", /#!\/usr\/bin\/env ruby/ -- cgit v1.2.3 From a0ee2270d3e0bdcc0433e4af56c616f71553378c Mon Sep 17 00:00:00 2001 From: Stefan Sprenger Date: Fri, 27 May 2011 12:12:59 +0200 Subject: Fix appending ' --- railties/test/generators/plugin_new_generator_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/test/generators') diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index 25663ef109..1cb7af150e 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -182,7 +182,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_file "script/rails", /ENGINE_PATH = File.expand_path\('..\/..\/lib\/bukkits\/engine', __FILE__\)/ assert_file "script/rails", /ENGINE_ROOT = File.expand_path\('..\/..', __FILE__\)/ assert_file "script/rails", /require 'rails\/all'/ - assert_file "script/rails", /require 'rails\/engine\/commands/ + assert_file "script/rails", /require 'rails\/engine\/commands'/ end def test_shebang -- cgit v1.2.3 From e38d3752c377b400aea1d0b854bebf3734664cd7 Mon Sep 17 00:00:00 2001 From: Stefan Sprenger Date: Fri, 27 May 2011 13:44:10 +0200 Subject: Generate script/rails only if --full is given --- railties/test/generators/plugin_new_generator_test.rb | 6 +++--- railties/test/generators/shared_generator_tests.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'railties/test/generators') diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb index 1cb7af150e..e87fd265ce 100644 --- a/railties/test/generators/plugin_new_generator_test.rb +++ b/railties/test/generators/plugin_new_generator_test.rb @@ -12,7 +12,6 @@ DEFAULT_PLUGIN_FILES = %w( lib lib/bukkits.rb lib/tasks/bukkits_tasks.rake - script/rails test/bukkits_test.rb test/test_helper.rb test/dummy @@ -150,6 +149,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase assert_file "config/routes.rb", /Rails.application.routes.draw do/ assert_file "lib/bukkits/engine.rb", /module Bukkits\n class Engine < ::Rails::Engine\n end\nend/ assert_file "lib/bukkits.rb", /require "bukkits\/engine"/ + assert_file "script/rails" end def test_being_quiet_while_creating_dummy_application @@ -178,7 +178,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase end def test_usage_of_engine_commands - run_generator + run_generator [destination_root, "--full"] assert_file "script/rails", /ENGINE_PATH = File.expand_path\('..\/..\/lib\/bukkits\/engine', __FILE__\)/ assert_file "script/rails", /ENGINE_ROOT = File.expand_path\('..\/..', __FILE__\)/ assert_file "script/rails", /require 'rails\/all'/ @@ -186,7 +186,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase end def test_shebang - run_generator + run_generator [destination_root, "--full"] assert_file "script/rails", /#!\/usr\/bin\/env ruby/ end diff --git a/railties/test/generators/shared_generator_tests.rb b/railties/test/generators/shared_generator_tests.rb index be9aef8a41..d3074afd91 100644 --- a/railties/test/generators/shared_generator_tests.rb +++ b/railties/test/generators/shared_generator_tests.rb @@ -67,12 +67,12 @@ module SharedGeneratorTests end def test_shebang_is_added_to_rails_file - run_generator [destination_root, "--ruby", "foo/bar/baz"] + run_generator [destination_root, "--ruby", "foo/bar/baz", "--full"] assert_file "script/rails", /#!foo\/bar\/baz/ end def test_shebang_when_is_the_same_as_default_use_env - run_generator [destination_root, "--ruby", Thor::Util.ruby_command] + run_generator [destination_root, "--ruby", Thor::Util.ruby_command, "--full"] assert_file "script/rails", /#!\/usr\/bin\/env/ end -- cgit v1.2.3 From 246c36757065aa74a88b67db4c70e9e5cf3bd8b3 Mon Sep 17 00:00:00 2001 From: Stefan Sprenger Date: Tue, 7 Jun 2011 12:16:05 +0200 Subject: Use RAILS_ISOLATED_ENGINE and fix namespaced generators tests --- railties/test/generators/namespaced_generators_test.rb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'railties/test/generators') diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb index 17cbac0912..dd1e4bdac1 100644 --- a/railties/test/generators/namespaced_generators_test.rb +++ b/railties/test/generators/namespaced_generators_test.rb @@ -7,15 +7,7 @@ require 'rails/generators/rails/scaffold/scaffold_generator' class NamespacedGeneratorTestCase < Rails::Generators::TestCase def setup - TestApp::Application.isolate_namespace(TestApp) - end - - def teardown - if TestApp.respond_to?(:_railtie) - TestApp.singleton_class.send(:undef_method, :_railtie) - TestApp.singleton_class.send(:undef_method, :table_name_prefix) - TestApp::Application.isolated = false - end + Rails::Generators.namespace = TestApp end end -- cgit v1.2.3