Merge branch 'master' of git://github.com/lifo/docrails

4 files changed, 17 insertions, 4 deletions

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 3653b067c8..51277b805b 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -165,9 +165,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "Gemfile", /^gem\s+["']mysql2["']$/
   end
 
-  def test_config_database_is_not_added_if_skip_active_record_is_given
+  def test_generator_if_skip_active_record_is_given
     run_generator [destination_root, "--skip-active-record"]
     assert_no_file "config/database.yml"
+    assert_file "test/test_helper.rb" do |helper_content|
+      assert_no_match /fixtures :all/, helper_content
+    end
+    assert_file "test/performance/browsing_test.rb"
   end
 
   def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given
diff --git a/railties/test/generators/generated_attribute_test.rb b/railties/test/generators/generated_attribute_test.rb
index 272e179fe3..064546a3f3 100644
--- a/railties/test/generators/generated_attribute_test.rb
+++ b/railties/test/generators/generated_attribute_test.rb
@@ -117,7 +117,7 @@ class GeneratedAttributeTest < Rails::Generators::TestCase
 
   def test_missing_type_raises_exception
     assert_raise Thor::Error do
-      create_generated_attribute(:'', 'title')
+      create_generated_attribute('', 'title')
     end
   end
 end
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index 450dec7716..f4fdc46328 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -59,6 +59,15 @@ class MailerGeneratorTest < Rails::Generators::TestCase
     assert_match /haml \[not found\]/, content
   end
 
+  def test_mailer_with_namedspaced_mailer
+    run_generator ["Farm::Animal", "moos"]
+    assert_file "app/mailers/farm/animal.rb" do |mailer|
+      assert_match /class Farm::Animal < ActionMailer::Base/, mailer
+      assert_match /en\.farm\.animal\.moos\.subject/, mailer
+    end
+    assert_file "app/views/farm/animal/moos.text.erb"
+  end
+
   def test_actions_are_turned_into_methods
     run_generator
 
diff --git a/railties/test/generators/namespaced_generators_test.rb b/railties/test/generators/namespaced_generators_test.rb
index 38b95a49ac..d1190fd17d 100644
--- a/railties/test/generators/namespaced_generators_test.rb
+++ b/railties/test/generators/namespaced_generators_test.rb
@@ -6,14 +6,14 @@ require 'rails/generators/mailer/mailer_generator'
 
 class NamespacedGeneratorTestCase < Rails::Generators::TestCase
   def setup
-    TestApp::Application.namespace(TestApp)
+    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.namespaced = false
+      TestApp::Application.isolated = false
     end
   end
 end