From 5f7cfffc5377824e03432d7773ed8864a872b18c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 10 Aug 2009 18:29:20 +0200
Subject: Use less strict rules in generators lookup, so people can lay their
 generators wherever they want.

---
 railties/test/generators/generators_test_helper.rb          |  7 +++++--
 .../test/generators/session_migration_generator_test.rb     | 13 +++----------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'railties/test/generators')

diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index 9444a9ed4b..a258574dce 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -8,9 +8,12 @@ else
   RAILS_ROOT = fixtures
 end
 
-$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../activerecord/lib"
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../lib"
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../activerecord/lib"
+$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../../../actionpack/lib"
 require 'generators'
+require 'activerecord'
+require 'action_dispatch'
 
 CURRENT_PATH = File.expand_path(Dir.pwd)
 Rails::Generators.no_color!
@@ -19,7 +22,7 @@ class GeneratorsTestCase < Test::Unit::TestCase
   include FileUtils
 
   def destination_root
-    @destination_root ||= File.expand_path(File.join(File.dirname(__FILE__), 
+    @destination_root ||= File.expand_path(File.join(File.dirname(__FILE__),
                                             '..', 'fixtures', 'tmp'))
   end
 
diff --git a/railties/test/generators/session_migration_generator_test.rb b/railties/test/generators/session_migration_generator_test.rb
index 57bd755a9a..293b903b87 100644
--- a/railties/test/generators/session_migration_generator_test.rb
+++ b/railties/test/generators/session_migration_generator_test.rb
@@ -2,16 +2,6 @@ require 'abstract_unit'
 require 'generators/generators_test_helper'
 require 'generators/rails/session_migration/session_migration_generator'
 
-module ActiveRecord 
-  module SessionStore
-    class Session
-      class << self
-        attr_accessor :table_name
-      end
-    end
-  end
-end
-
 class SessionMigrationGeneratorTest < GeneratorsTestCase
 
   def test_session_migration_with_default_name
@@ -31,7 +21,10 @@ class SessionMigrationGeneratorTest < GeneratorsTestCase
       assert_match /class AddSessionsTable < ActiveRecord::Migration/, migration
       assert_match /create_table :custom_table_name/, migration
     end
+  ensure
+    ActiveRecord::SessionStore::Session.table_name = "sessions"
   end
+
   protected
 
     def run_generator(args=[])
-- 
cgit v1.2.3