From 75e1e2175d81b7047145768e72a0541b3266abed Mon Sep 17 00:00:00 2001
From: Aditya Sanghi <asanghi@me.com>
Date: Fri, 6 May 2011 18:04:20 +0530
Subject: When skipping skip active record, mark config.generators.orm to
 false; LH 5796 remainder

---
 railties/test/generators/app_generator_test.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index e271095636..64ccaa762f 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -161,7 +161,10 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
   def test_active_record_is_removed_from_frameworks_if_skip_active_record_is_given
     run_generator [destination_root, "--skip-active-record"]
-    assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
+    assert_file "config/application.rb" do |file|
+      assert_match /#\s+require\s+["']active_record\/railtie["']/, file
+      assert_match /config.generators.orm = false/, file
+    end
   end
 
   def test_creation_of_a_test_directory
-- 
cgit v1.2.3