aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/fixtures/project.rb2
-rw-r--r--actionpack/test/fixtures/reply.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/fixtures/project.rb b/actionpack/test/fixtures/project.rb
index 2b53d39ed5..c124a9e605 100644
--- a/actionpack/test/fixtures/project.rb
+++ b/actionpack/test/fixtures/project.rb
@@ -1,3 +1,3 @@
class Project < ActiveRecord::Base
- has_and_belongs_to_many :developers, :uniq => true
+ has_and_belongs_to_many :developers, -> { uniq }
end
diff --git a/actionpack/test/fixtures/reply.rb b/actionpack/test/fixtures/reply.rb
index 0d3b0a7c98..16b53be18a 100644
--- a/actionpack/test/fixtures/reply.rb
+++ b/actionpack/test/fixtures/reply.rb
@@ -1,6 +1,6 @@
class Reply < ActiveRecord::Base
scope :base, -> { scoped }
- belongs_to :topic, :include => [:replies]
+ belongs_to :topic, -> { includes(:replies) }
belongs_to :developer
validates_presence_of :content