mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
use teardown
for cleanup, not setup
.
This solves order dependent issues where the last test leaked the query cache state. This resulted in the following error: ``` QueryCacheExpiryTest#test_cache_is_expired_by_habtm_delete [test/cases/query_cache_test.rb:275]: not all expectations were satisfied unsatisfied expectations: - expected exactly twice, invoked once: #<ActiveRecord::ConnectionAdapters::SQLite3Adapter:0x7f93e0c65838>.clear_query_cache(any_parameters) ```
This commit is contained in:
parent
8e1735e26c
commit
f00524375d
1 changed files with 2 additions and 5 deletions
|
@ -8,7 +8,7 @@ require 'rack'
|
|||
class QueryCacheTest < ActiveRecord::TestCase
|
||||
fixtures :tasks, :topics, :categories, :posts, :categories_posts
|
||||
|
||||
def setup
|
||||
teardown do
|
||||
Task.connection.clear_query_cache
|
||||
ActiveRecord::Base.connection.disable_query_cache!
|
||||
end
|
||||
|
@ -214,7 +214,7 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase
|
|||
Post.find(1)
|
||||
|
||||
# change the column definition
|
||||
Post.connection.change_column :posts, :title, :string, :limit => 80
|
||||
Post.connection.change_column :posts, :title, :string, limit: 80
|
||||
assert_nothing_raised { Post.find(1) }
|
||||
|
||||
# restore the old definition
|
||||
|
@ -241,7 +241,6 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase
|
|||
|
||||
def test_update
|
||||
Task.connection.expects(:clear_query_cache).times(2)
|
||||
|
||||
Task.cache do
|
||||
task = Task.find(1)
|
||||
task.starting = Time.now.utc
|
||||
|
@ -251,7 +250,6 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase
|
|||
|
||||
def test_destroy
|
||||
Task.connection.expects(:clear_query_cache).times(2)
|
||||
|
||||
Task.cache do
|
||||
Task.find(1).destroy
|
||||
end
|
||||
|
@ -259,7 +257,6 @@ class QueryCacheExpiryTest < ActiveRecord::TestCase
|
|||
|
||||
def test_insert
|
||||
ActiveRecord::Base.connection.expects(:clear_query_cache).times(2)
|
||||
|
||||
Task.cache do
|
||||
Task.create!
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue