aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2017-06-16 20:55:56 -0500
committerGitHub <noreply@github.com>2017-06-16 20:55:56 -0500
commit03fa6b2907ae68e0c2cfeb8c3e56c080d7ff99c0 (patch)
tree3980620b25aacb6928013fcdb9a527312411bc64
parenta3f758ab0ad7d65bf498980f875c8b3c71e347c0 (diff)
parentc073240f70de81639a340ab68b001a77ffb6237e (diff)
downloadrails-03fa6b2907ae68e0c2cfeb8c3e56c080d7ff99c0.tar.gz
rails-03fa6b2907ae68e0c2cfeb8c3e56c080d7ff99c0.tar.bz2
rails-03fa6b2907ae68e0c2cfeb8c3e56c080d7ff99c0.zip
Merge pull request #29415 from kamipo/remove_unused_defined_association
Remove unused defined association
-rw-r--r--activerecord/test/cases/relation/merging_test.rb2
-rw-r--r--activerecord/test/models/comment.rb1
2 files changed, 1 insertions, 2 deletions
diff --git a/activerecord/test/cases/relation/merging_test.rb b/activerecord/test/cases/relation/merging_test.rb
index c3b39a9295..3901824aac 100644
--- a/activerecord/test/cases/relation/merging_test.rb
+++ b/activerecord/test/cases/relation/merging_test.rb
@@ -143,7 +143,7 @@ class MergingDifferentRelationsTest < ActiveRecord::TestCase
assert_equal ["Mary", "Mary", "Mary", "David"], posts_by_author_name
end
- test "relation merging (using a proc argument)" do
+ test "relation merging (using a proc argument)" do
dev = Developer.where(name: "Jamis").first
comment_1 = dev.comments.create!(body: "I'm Jamis", post: Post.first)
diff --git a/activerecord/test/models/comment.rb b/activerecord/test/models/comment.rb
index d227f6fe86..eecf923046 100644
--- a/activerecord/test/models/comment.rb
+++ b/activerecord/test/models/comment.rb
@@ -9,7 +9,6 @@ class Comment < ActiveRecord::Base
belongs_to :post, counter_cache: true
belongs_to :author, polymorphic: true
belongs_to :resource, polymorphic: true
- belongs_to :developer
has_many :ratings