Skip to content
Browse files

Fix the test defining the models in the right place

Conflicts:
	activerecord/test/cases/associations/belongs_to_associations_test.rb
	activerecord/test/schema/schema.rb
  • Loading branch information...
1 parent 1755958 commit a0804f7aa2210cb14caf5fe4aeaf4ce2a89a6edf @rafaelfranca rafaelfranca committed Apr 4, 2014
View
20 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,
@@ -867,21 +869,9 @@ def test_reflect_the_most_recent_change
assert_equal post.author_id, author2.id
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
View
3 activerecord/test/models/column.rb
@@ -0,0 +1,3 @@
+class Column < ActiveRecord::Base
+ belongs_to :record
+end
View
2 activerecord/test/models/record.rb
@@ -0,0 +1,2 @@
+class Record < ActiveRecord::Base
+end
View
6 activerecord/test/schema/schema.rb
@@ -158,6 +158,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
@@ -811,6 +815,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

0 comments on commit a0804f7

Please sign in to comment.
Something went wrong with that request. Please try again.