aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-08-02 14:16:30 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-08-02 14:16:30 -0300
commitffd5ec8741c39c05e8ee5b4cc708d52fd11b7486 (patch)
tree751463e713a0c1f5e7e9147679a86136325f67ad /activerecord
parent8dda066fbc408de699051fec1defc9fafb39365c (diff)
parente67a2f26db1e0f2e507e9e32fa980b7c05cc5793 (diff)
downloadrails-ffd5ec8741c39c05e8ee5b4cc708d52fd11b7486.tar.gz
rails-ffd5ec8741c39c05e8ee5b4cc708d52fd11b7486.tar.bz2
rails-ffd5ec8741c39c05e8ee5b4cc708d52fd11b7486.zip
Merge pull request #16374 from rajcybage/consistency_minitest
rename MiniTest to Minitest
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/test/cases/attribute_test.rb2
-rw-r--r--activerecord/test/cases/migration/pending_migrations_test.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/attribute_test.rb b/activerecord/test/cases/attribute_test.rb
index 24452fdec2..91f6aee931 100644
--- a/activerecord/test/cases/attribute_test.rb
+++ b/activerecord/test/cases/attribute_test.rb
@@ -4,7 +4,7 @@ require 'minitest/mock'
module ActiveRecord
class AttributeTest < ActiveRecord::TestCase
setup do
- @type = MiniTest::Mock.new
+ @type = Minitest::Mock.new
end
teardown do
diff --git a/activerecord/test/cases/migration/pending_migrations_test.rb b/activerecord/test/cases/migration/pending_migrations_test.rb
index 517ee695ce..7afac83bd2 100644
--- a/activerecord/test/cases/migration/pending_migrations_test.rb
+++ b/activerecord/test/cases/migration/pending_migrations_test.rb
@@ -6,8 +6,8 @@ module ActiveRecord
class PendingMigrationsTest < ActiveRecord::TestCase
def setup
super
- @connection = MiniTest::Mock.new
- @app = MiniTest::Mock.new
+ @connection = Minitest::Mock.new
+ @app = Minitest::Mock.new
conn = @connection
@pending = Class.new(CheckPending) {
define_method(:connection) { conn }