diff --git a/test/dependencies_test.rb b/test/dependencies_test.rb index 03ae175..ffc1f68 100644 --- a/test/dependencies_test.rb +++ b/test/dependencies_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class DependenciesTest < ActiveSupport::TestCase +class DependenciesTest < ActiveJob::TestCase self.use_transactional_tests = true teardown :clear_cache @@ -18,7 +18,7 @@ class DependenciesTest < ActiveSupport::TestCase mock.verify mock.expect(:call, 2, [category.id]) - category_item.update!(name: "foo") + perform_enqueued_jobs { category_item.update!(name: "foo") } mock.verify mock.expect(:call, 3, [category.id]) @@ -40,7 +40,7 @@ class DependenciesTest < ActiveSupport::TestCase mock.verify mock.expect(:call, 2, [category.id]) - category_item.update!(name: "foo") + perform_enqueued_jobs { category_item.update!(name: "foo") } assert_raises(MockExpectationError) { mock.verify } mock.expect(:call, 3, [category.id]) @@ -57,7 +57,7 @@ class DependenciesTest < ActiveSupport::TestCase end mock.expect(:call, 1, [category.id]) - CategoryItem.create!(category: category) + perform_enqueued_jobs { CategoryItem.create!(category: category) } mock.verify mock.expect(:call, 2, [category.id]) @@ -78,13 +78,13 @@ class DependenciesTest < ActiveSupport::TestCase ) { |id| mock.call(id) } mock.expect(:call, 1, [category.id]) - CategoryItem.create!(category: category) + perform_enqueued_jobs { CategoryItem.create!(category: category) } mock.verify - category.update!(name: "hockey") + perform_enqueued_jobs { category.update!(name: "hockey") } mock.expect(:call, 1, [category.id]) - CategoryItem.create!(category: category) + perform_enqueued_jobs { CategoryItem.create!(category: category) } assert_raises(MockExpectationError) { mock.verify } end @@ -102,7 +102,7 @@ class DependenciesTest < ActiveSupport::TestCase mock.verify mock.expect(:call, 2, [category.id]) - store.update!(name: "foo") + perform_enqueued_jobs { store.update!(name: "foo") } mock.verify mock.expect(:call, 3, [category.id]) @@ -142,7 +142,7 @@ class DependenciesTest < ActiveSupport::TestCase mock.expect(:call, 1, [category.id]) mock.expect(:call, 1, [category.id]) - Store.create!(name: "foo", categories: [category]) + perform_enqueued_jobs { Store.create!(name: "foo", categories: [category]) } mock.verify mock.expect(:call, 2, [category.id]) @@ -164,13 +164,13 @@ class DependenciesTest < ActiveSupport::TestCase mock.expect(:call, 1, [category.id]) mock.expect(:call, 1, [category.id]) - Store.create!(name: "foo", categories: [category]) + perform_enqueued_jobs { Store.create!(name: "foo", categories: [category]) } mock.verify category.update!(name: "hockey") mock.expect(:call, 2, [category.id]) - Store.create!(name: "bar", categories: [category]) + perform_enqueued_jobs { Store.create!(name: "bar", categories: [category]) } assert_raises(MockExpectationError) { mock.verify } end @@ -188,7 +188,7 @@ class DependenciesTest < ActiveSupport::TestCase mock.verify mock.expect(:call, 2, [category.id]) - product.update!(name: "foo") + perform_enqueued_jobs { product.update!(name: "foo") } mock.verify mock.expect(:call, 3, [category.id]) @@ -210,7 +210,7 @@ class DependenciesTest < ActiveSupport::TestCase mock.verify mock.expect(:call, 2, [category.id]) - product.update!(name: "foo") + perform_enqueued_jobs { product.update!(name: "foo") } assert_raises(MockExpectationError) { mock.verify } mock.expect(:call, 3, [category.id]) @@ -227,7 +227,7 @@ class DependenciesTest < ActiveSupport::TestCase end mock.expect(:call, 1, [category.id]) - Product.create!(categories: [category]) + perform_enqueued_jobs { Product.create!(categories: [category]) } mock.verify mock.expect(:call, 2, [category.id]) @@ -248,13 +248,13 @@ class DependenciesTest < ActiveSupport::TestCase ) { |id| mock.call(id) } mock.expect(:call, 1, [category.id]) - Product.create!(categories: [category]) + perform_enqueued_jobs { Product.create!(categories: [category]) } mock.verify category.update!(name: "hockey") mock.expect(:call, 2, [category.id]) - Product.create!(categories: [category]) + perform_enqueued_jobs { Product.create!(categories: [category]) } assert_raises(MockExpectationError) { mock.verify } end @@ -270,13 +270,13 @@ class DependenciesTest < ActiveSupport::TestCase ) { |id| mock.call(id) } mock.expect(:call, 1, [store.id]) - category.update!(name: "foo") + perform_enqueued_jobs { category.update!(name: "foo") } mock.verify mock.expect(:call, 2, [store.id]) assert_equal 1, Thermos.drink(key: "key", id: store.id) assert_raises(MockExpectationError) { mock.verify } - Product.create!(categories: [category]) + perform_enqueued_jobs { Product.create!(categories: [category]) } mock.verify mock.expect(:call, 3, [store.id]) @@ -300,7 +300,7 @@ class DependenciesTest < ActiveSupport::TestCase category_mock.expect(:call, 2, [category.id]) product_mock.expect(:call, 2, [product.id]) - product.update!(name: "foo") + perform_enqueued_jobs { product.update!(name: "foo") } assert_raises(MockExpectationError) { category_mock.verify } product_mock.verify end diff --git a/test/dummy/db/schema.rb b/test/dummy/db/schema.rb index 6a3d0b3..916c508 100644 --- a/test/dummy/db/schema.rb +++ b/test/dummy/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.1].define(version: 2016_03_26_174530) do +ActiveRecord::Schema[7.2].define(version: 2016_03_26_174530) do create_table "categories", force: :cascade do |t| t.string "name" t.integer "store_id" diff --git a/test/filter_test.rb b/test/filter_test.rb index ddf1265..8520cb0 100644 --- a/test/filter_test.rb +++ b/test/filter_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class FilterTest < ActiveSupport::TestCase +class FilterTest < ActiveJob::TestCase self.use_transactional_tests = true teardown :clear_cache @@ -16,11 +16,11 @@ class FilterTest < ActiveSupport::TestCase ) { |name| mock.call(name) } mock.expect(:call, 1, ["basketball"]) - category.update!(name: "basketball") + perform_enqueued_jobs { category.update!(name: "basketball") } mock.verify mock.expect(:call, 1, ["hockey"]) - category.update!(name: "hockey") + perform_enqueued_jobs { category.update!(name: "hockey") } assert_raises(MockExpectationError) { mock.verify } end diff --git a/test/test_helper.rb b/test/test_helper.rb index 0e5ffe0..96b5873 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -29,7 +29,7 @@ end ActiveSupport::TestCase.fixtures :all -ActiveJob::Base.queue_adapter = :inline +ActiveJob::Base.queue_adapter = :test ActiveSupport.test_order = :random def clear_cache diff --git a/test/thermos_test.rb b/test/thermos_test.rb index 0d713a9..8ea1e6a 100644 --- a/test/thermos_test.rb +++ b/test/thermos_test.rb @@ -1,6 +1,6 @@ require "test_helper" -class ThermosTest < ActiveSupport::TestCase +class ThermosTest < ActiveJob::TestCase self.use_transactional_tests = true teardown :clear_cache @@ -50,7 +50,7 @@ class ThermosTest < ActiveSupport::TestCase mock.verify mock.expect(:call, 2, [category.id]) - category.update!(name: "foo") + perform_enqueued_jobs { category.update!(name: "foo") } mock.verify mock.expect(:call, 3, [category.id]) @@ -92,7 +92,7 @@ class ThermosTest < ActiveSupport::TestCase mock.verify mock.expect(:call, 1, [category.id]) - category.update!(name: "foo") + perform_enqueued_jobs { category.update!(name: "foo") } mock.verify mock.expect(:call, 3, [other_category.id]) @@ -123,7 +123,7 @@ class ThermosTest < ActiveSupport::TestCase end mock.expect(:call, 1, ["foo"]) - Category.create!(name: "foo") + perform_enqueued_jobs { Category.create!(name: "foo") } mock.verify mock.expect(:call, 2, ["foo"]) @@ -144,7 +144,7 @@ class ThermosTest < ActiveSupport::TestCase mock.verify mock.expect(:call, 2, ["foo"]) - category.update!(name: "foo") + perform_enqueued_jobs { category.update!(name: "foo") } mock.verify mock.expect(:call, 3, [category.name])