From 57c7d5cb80086e66eee3303b11a5e558aa9e5bf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Fri, 4 Apr 2014 19:44:17 -0300
Subject: [PATCH] Fix the test defining the models in the right place

---
 .../belongs_to_associations_test.rb           | 20 +++++--------------
 activerecord/test/models/column.rb            |  3 +++
 activerecord/test/models/record.rb            |  2 ++
 activerecord/test/schema/schema.rb            |  6 ++++++
 4 files changed, 16 insertions(+), 15 deletions(-)
 create mode 100644 activerecord/test/models/column.rb
 create mode 100644 activerecord/test/models/record.rb

diff --git a/activerecord/test/cases/associations/belongs_to_associations_test.rb b/activerecord/test/cases/associations/belongs_to_associations_test.rb
index 091c94676e..27f6fa575d 100644
--- a/activerecord/test/cases/associations/belongs_to_associations_test.rb
+++ b/activerecord/test/cases/associations/belongs_to_associations_test.rb
@@ -16,6 +16,8 @@
 require 'models/toy'
 require 'models/invoice'
 require 'models/line_item'
+require 'models/column'
+require 'models/record'
 
 class BelongsToAssociationsTest < ActiveRecord::TestCase
   fixtures :accounts, :companies, :developers, :projects, :topics,
@@ -886,21 +888,9 @@ def test_reflect_the_most_recent_change
     end
   end
 
-  test 'belongs_to works with model name Record' do
-    Record = Class.new(ActiveRecord::Base) do
-      connection.create_table :records
-    end
-
-    Foo = Class.new(ActiveRecord::Base) do
-      connection.create_table :foos do |t|
-        t.belongs_to :record
-      end
-
-      belongs_to :record
-    end
-
+  test 'belongs_to works with model called Record' do
     record = Record.create!
-    Foo.create! record: record
-    assert_equal 1, Foo.count
+    Column.create! record: record
+    assert_equal 1, Column.count
   end
 end
diff --git a/activerecord/test/models/column.rb b/activerecord/test/models/column.rb
new file mode 100644
index 0000000000..499358b4cf
--- /dev/null
+++ b/activerecord/test/models/column.rb
@@ -0,0 +1,3 @@
+class Column < ActiveRecord::Base
+  belongs_to :record
+end
diff --git a/activerecord/test/models/record.rb b/activerecord/test/models/record.rb
new file mode 100644
index 0000000000..f77ac9fc03
--- /dev/null
+++ b/activerecord/test/models/record.rb
@@ -0,0 +1,2 @@
+class Record < ActiveRecord::Base
+end
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index a9c4980283..5bd3a51a84 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -161,6 +161,10 @@ def create_table(*args, &block)
     t.integer :references, null: false
   end
 
+  create_table :columns, force: true do |t|
+    t.references :record
+  end
+
   create_table :comments, force: true do |t|
     t.integer :post_id, null: false
     # use VARCHAR2(4000) instead of CLOB datatype as CLOB data type has many limitations in
@@ -819,6 +823,8 @@ def create_table(*args, &block)
     t.integer :department_id
   end
 
+  create_table :records, force: true do |t|
+  end
 
   except 'SQLite' do
     # fk_test_has_fk should be before fk_test_has_pk
-- 
GitLab