aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-08-12 20:34:34 -0300
committerGitHub <noreply@github.com>2016-08-12 20:34:34 -0300
commitb2ab8b77de7500c6da763f4707f5b77ecade81fb (patch)
tree95adadede3e073a31898a377cffef98101cfda64
parentb7afe9a078342885050a7d078439256359d0eef7 (diff)
parentb8d6e15f943af4c10da0ee3dcd047da0302b832a (diff)
downloadrails-b2ab8b77de7500c6da763f4707f5b77ecade81fb.tar.gz
rails-b2ab8b77de7500c6da763f4707f5b77ecade81fb.tar.bz2
rails-b2ab8b77de7500c6da763f4707f5b77ecade81fb.zip
Merge pull request #26113 from kamipo/use_ar_test_case_instead_of_as_test_case
Use `ActiveRecord::TestCase` rather than `ActiveSupport::TestCase` in AR test cases
-rw-r--r--activerecord/test/cases/fixtures_test.rb2
-rw-r--r--activerecord/test/cases/relation/mutation_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index f799f1e1fa..24a9894f19 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -280,7 +280,7 @@ class FixturesTest < ActiveRecord::TestCase
end
end
-class HasManyThroughFixture < ActiveSupport::TestCase
+class HasManyThroughFixture < ActiveRecord::TestCase
def make_model(name)
Class.new(ActiveRecord::Base) { define_singleton_method(:name) { name } }
end
diff --git a/activerecord/test/cases/relation/mutation_test.rb b/activerecord/test/cases/relation/mutation_test.rb
index 018a676a4a..ca5d187819 100644
--- a/activerecord/test/cases/relation/mutation_test.rb
+++ b/activerecord/test/cases/relation/mutation_test.rb
@@ -2,7 +2,7 @@ require "cases/helper"
require "models/post"
module ActiveRecord
- class RelationMutationTest < ActiveSupport::TestCase
+ class RelationMutationTest < ActiveRecord::TestCase
class FakeKlass < Struct.new(:table_name, :name)
extend ActiveRecord::Delegation::DelegateCache
inherited self