From ace7d0c12d906094b83fba1c74abf899c3db03e5 Mon Sep 17 00:00:00 2001 From: evazion Date: Fri, 3 Feb 2017 01:28:10 -0600 Subject: [PATCH] Fix moving saved searches tests. 4) Failure: TagAliasTest#test_: A tag alias should move saved searches. [/home/danbooru/src/danbooru/test/unit/tag_alias_test.rb:80]: Expected: "123 bbb 456" Actual: "123 ... 456" 36) Failure: Moderator::TagBatchChangeTest#test_: a tag batch change should move saved searches. [/home/danbooru/src/danbooru/test/unit/moderator/tag_batch_change_test.rb:40]: Expected: "123 456 bbb" Actual: "123 ... 456" --- test/helpers/saved_search_test_helper.rb | 3 +++ test/unit/moderator/tag_batch_change_test.rb | 2 -- test/unit/tag_alias_test.rb | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/helpers/saved_search_test_helper.rb b/test/helpers/saved_search_test_helper.rb index 569d0e7d3..2b2a9071b 100644 --- a/test/helpers/saved_search_test_helper.rb +++ b/test/helpers/saved_search_test_helper.rb @@ -16,5 +16,8 @@ module SavedSearchTestHelper service = mock_sqs_service.new SavedSearch.stubs(:sqs_service).returns(service) + Danbooru.config.stubs(:aws_sqs_saved_search_url).returns("http://localhost:3002") + Danbooru.config.stubs(:listbooru_auth_key).returns("blahblahblah") + Danbooru.config.stubs(:listbooru_server).returns("http://localhost:3001") end end diff --git a/test/unit/moderator/tag_batch_change_test.rb b/test/unit/moderator/tag_batch_change_test.rb index 80641501f..436c5602e 100644 --- a/test/unit/moderator/tag_batch_change_test.rb +++ b/test/unit/moderator/tag_batch_change_test.rb @@ -8,8 +8,6 @@ module Moderator def setup super mock_saved_search_service! - Danbooru.config.stubs(:listbooru_auth_key).returns("blahblahblah") - Danbooru.config.stubs(:listbooru_server).returns("http://localhost:3001") end context "a tag batch change" do diff --git a/test/unit/tag_alias_test.rb b/test/unit/tag_alias_test.rb index a8ff2abf4..8b5322718 100644 --- a/test/unit/tag_alias_test.rb +++ b/test/unit/tag_alias_test.rb @@ -1,6 +1,9 @@ require 'test_helper' +require 'helpers/saved_search_test_helper' class TagAliasTest < ActiveSupport::TestCase + include SavedSearchTestHelper + context "A tag alias" do setup do Timecop.travel(1.month.ago) do @@ -10,6 +13,7 @@ class TagAliasTest < ActiveSupport::TestCase CurrentUser.ip_addr = "127.0.0.1" MEMCACHE.flush_all Delayed::Worker.delay_jobs = false + mock_saved_search_service! end teardown do