diff options
author | bogdanvlviv <bogdanvlviv@gmail.com> | 2018-07-15 23:53:03 +0300 |
---|---|---|
committer | bogdanvlviv <bogdanvlviv@gmail.com> | 2018-07-15 23:53:03 +0300 |
commit | d967523339275ca461ee98d2fbb936ba0b38c316 (patch) | |
tree | 872dbf626e9e8852614e781eeeb04383f7781b6a /activerecord/test/cases/tasks/mysql_rake_test.rb | |
parent | 837d6031783c2fcf7920320d386f2ea7211f8cb1 (diff) | |
download | rails-d967523339275ca461ee98d2fbb936ba0b38c316.tar.gz rails-d967523339275ca461ee98d2fbb936ba0b38c316.tar.bz2 rails-d967523339275ca461ee98d2fbb936ba0b38c316.zip |
Clarify test cases
Remove extra stub of `ActiveRecord::Base::connection` in
`activerecord/test/cases/tasks/mysql_rake_test.rb`.
Remove extra stub of `File::exist?` in
`activerecord/test/cases/tasks/sqlite_rake_test.rb`.
`ActiveRecord::Base::establish_connection` shouldn't return `true`
in test cases.
Related to https://github.com/rails/rails/pull/33337.
Diffstat (limited to 'activerecord/test/cases/tasks/mysql_rake_test.rb')
-rw-r--r-- | activerecord/test/cases/tasks/mysql_rake_test.rb | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/activerecord/test/cases/tasks/mysql_rake_test.rb b/activerecord/test/cases/tasks/mysql_rake_test.rb index 6ed9fdb7fa..28dcaf2f89 100644 --- a/activerecord/test/cases/tasks/mysql_rake_test.rb +++ b/activerecord/test/cases/tasks/mysql_rake_test.rb @@ -90,7 +90,7 @@ if current_adapter?(:Mysql2Adapter) private def with_stubbed_connection_establish_connection - ActiveRecord::Base.stub(:establish_connection, true) do + ActiveRecord::Base.stub(:establish_connection, nil) do ActiveRecord::Base.stub(:connection, @connection) do yield end @@ -116,11 +116,9 @@ if current_adapter?(:Mysql2Adapter) end def test_raises_error - ActiveRecord::Base.stub(:connection, @connection) do - ActiveRecord::Base.stub(:establish_connection, -> * { raise @error }) do - assert_raises(Mysql2::Error, "Invalid permissions") do - ActiveRecord::Tasks::DatabaseTasks.create @configuration - end + ActiveRecord::Base.stub(:establish_connection, -> * { raise @error }) do + assert_raises(Mysql2::Error, "Invalid permissions") do + ActiveRecord::Tasks::DatabaseTasks.create @configuration end end end @@ -168,7 +166,7 @@ if current_adapter?(:Mysql2Adapter) private def with_stubbed_connection_establish_connection - ActiveRecord::Base.stub(:establish_connection, true) do + ActiveRecord::Base.stub(:establish_connection, nil) do ActiveRecord::Base.stub(:connection, @connection) do yield end @@ -215,7 +213,7 @@ if current_adapter?(:Mysql2Adapter) private def with_stubbed_connection_establish_connection - ActiveRecord::Base.stub(:establish_connection, true) do + ActiveRecord::Base.stub(:establish_connection, nil) do ActiveRecord::Base.stub(:connection, @connection) do yield end |