From daba9e15e27ac5eb2bfdd020b1e15cc6b5e69ac0 Mon Sep 17 00:00:00 2001
From: Peter M <kmpm@birchroad.net>
Date: Tue, 28 Jul 2009 16:33:43 +0200
Subject: [PATCH] Adding test for foxy fixtures and models in modules

---
 activerecord/test/cases/fixtures_test.rb   |   13 +++++++++++++
 activerecord/test/fixtures/albums.yml      |    5 +++++
 activerecord/test/fixtures/tracks.yml      |    5 +++++
 activerecord/test/models/foxy_in_module.rb |   10 ++++++++++
 activerecord/test/schema/schema.rb         |   10 ++++++++++
 5 files changed, 43 insertions(+), 0 deletions(-)
 create mode 100644 activerecord/test/fixtures/albums.yml
 create mode 100644 activerecord/test/fixtures/tracks.yml
 create mode 100644 activerecord/test/models/foxy_in_module.rb

diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index b07d4f3..9eb9b4b 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -16,6 +16,7 @@ require 'models/treasure'
 require 'models/matey'
 require 'models/ship'
 require 'models/book'
+require 'models/foxy_in_module'
 
 class FixturesTest < ActiveRecord::TestCase
   self.use_instantiated_fixtures = true
@@ -631,6 +632,18 @@ class FoxyFixturesTest < ActiveRecord::TestCase
   end
 end
 
+class FoxyFixturesInModulesTest < ActiveRecord::TestCase
+  fixtures :albums, :tracks
+  def test_class_mapping
+    assert_kind_of Foxy::Album,  albums(:album1)
+  end
+
+  def test_relations
+    track = tracks(:track1)
+    assert_equal albums(:album1), track.album
+  end
+end
+
 class ActiveSupportSubclassWithFixturesTest < ActiveRecord::TestCase
   fixtures :parrots
 
diff --git a/activerecord/test/fixtures/albums.yml b/activerecord/test/fixtures/albums.yml
new file mode 100644
index 0000000..ca47ed3
--- /dev/null
+++ b/activerecord/test/fixtures/albums.yml
@@ -0,0 +1,5 @@
+
+
+album1:
+    name: Are You Experienced?
+    artist: Hendrix
diff --git a/activerecord/test/fixtures/tracks.yml b/activerecord/test/fixtures/tracks.yml
new file mode 100644
index 0000000..fdf4164
--- /dev/null
+++ b/activerecord/test/fixtures/tracks.yml
@@ -0,0 +1,5 @@
+
+
+track1:
+    album: album1
+    title: Foxy Lady
diff --git a/activerecord/test/models/foxy_in_module.rb b/activerecord/test/models/foxy_in_module.rb
new file mode 100644
index 0000000..71d38e5
--- /dev/null
+++ b/activerecord/test/models/foxy_in_module.rb
@@ -0,0 +1,10 @@
+require 'active_support/core_ext/object/misc'
+
+module Foxy
+    class Track < ActiveRecord::Base
+        belongs_to :album
+    end
+    class Album < ActiveRecord::Base
+        has_many :tracks 
+    end
+end
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 2b7d385..6cfb092 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -496,6 +496,16 @@ ActiveRecord::Schema.define do
   create_table :zines, :force => true do |t|
     t.string :title
   end
+  
+  create_table :albums, :force=>true do |t|
+    t.string :name
+    t.string :artist
+  end
+  
+  create_table :tracks, :force=>true do |t|
+    t.integer :album_id
+    t.string :title
+  end
 
   except 'SQLite' do
     # fk_test_has_fk should be before fk_test_has_pk
-- 
1.6.0.4