jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

continue refactoring savedsearch

Browse Source
This commit is contained in:
Albert Yi
2018-11-13 18:05:05 -08:00
parent df02eb7951
commit 0508b127fd
17 changed files with 171 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/functional/saved_searches_controller_test.rb
View File

@@ -3,6 +3,7 @@ require 'test_helper'
class SavedSearchesControllerTest < ActionDispatch::IntegrationTest
context "The saved searches controller" do
setup do
SavedSearch.stubs(:enabled?).returns(true)
@user = create(:user)
as_user do
@saved_search = create(:saved_search, user: @user)

2
test/test_helpers/saved_search_test_helper.rb
View File

@@ -17,7 +17,5 @@ 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

42
test/unit/post_test.rb
View File

@@ -2265,25 +2265,35 @@ class PostTest < ActiveSupport::TestCase
assert_tag_match([post], "pixiv_id:none")
end
# should "return posts for a pixiv novel id search" do
# url = "http://www.pixiv.net/novel/show.php?id=2156088"
# post = FactoryBot.create(:post, :source => url)
# assert_equal(1, Post.tag_match("pixiv_novel_id:2156088").count)
# end
context "saved searches" do
setup do
SavedSearch.stubs(:enabled?).returns(true)
@post1 = FactoryBot.create(:post, tag_string: "aaa")
@post2 = FactoryBot.create(:post, tag_string: "bbb")
FactoryBot.create(:saved_search, query: "aaa", labels: ["zzz"], user: CurrentUser.user)
FactoryBot.create(:saved_search, query: "bbb", user: CurrentUser.user)
end
should "return posts for a search:<category> metatag" do
post1 = FactoryBot.create(:post, tag_string: "aaa")
post2 = FactoryBot.create(:post, tag_string: "bbb")
FactoryBot.create(:saved_search, query: "aaa", labels: ["zzz"], user: CurrentUser.user)
FactoryBot.create(:saved_search, query: "bbb", user: CurrentUser.user)
context "labeled" do
should "work" do
SavedSearch.expects(:post_ids_for).with(CurrentUser.id, label: "zzz").returns([@post1.id])
assert_tag_match([@post1], "search:zzz")
end
end
SavedSearch.expects(:post_ids).with(CurrentUser.id, "zzz").returns([post1.id])
SavedSearch.expects(:post_ids).with(CurrentUser.id, "uncategorized").returns([post2.id])
SavedSearch.expects(:post_ids).with(CurrentUser.id).returns([post1.id, post2.id])
context "missing" do
should "work" do
SavedSearch.expects(:post_ids_for).with(CurrentUser.id, label: "uncategorized").returns([@post2.id])
assert_tag_match([@post2], "search:uncategorized")
end
end
assert_tag_match([post1], "search:zzz")
assert_tag_match([post2], "search:uncategorized")
assert_tag_match([post2, post1], "search:all")
context "all" do
should "work" do
SavedSearch.expects(:post_ids_for).with(CurrentUser.id).returns([@post1.id, @post2.id])
assert_tag_match([@post2, @post1], "search:all")
end
end
end
should "return posts for a rating:<s|q|e> metatag" do

88
test/unit/saved_search_test.rb
View File

@@ -6,7 +6,8 @@ class SavedSearchTest < ActiveSupport::TestCase
@user = FactoryBot.create(:user)
CurrentUser.user = @user
CurrentUser.ip_addr = "127.0.0.1"
mock_saved_search_service!
@mock_redis = MockRedis.new
SavedSearch.stubs(:redis).returns(@mock_redis)
end
def teardown
@@ -24,11 +25,6 @@ class SavedSearchTest < ActiveSupport::TestCase
should "fetch the labels used by a user" do
assert_equal(%w(blah zah), SavedSearch.labels_for(@user.id))
end
should "expire when a search is updated" do
Cache.expects(:delete).once
FactoryBot.create(:saved_search, user: @user, query: "blah")
end
end
context ".queries_for" do
@@ -40,47 +36,81 @@ class SavedSearchTest < ActiveSupport::TestCase
end
should "fetch the queries used by a user for a label" do
assert_equal(%w(aaa), SavedSearch.queries_for(@user.id, "blah"))
assert_equal(%w(aaa), SavedSearch.queries_for(@user.id, label: "blah"))
end
should "return fully normalized queries" do
should "fetch the queries used by a user without a label" do
assert_equal(["aaa", "aaa ccc"], SavedSearch.queries_for(@user.id))
end
end
context "Fetching the post ids for a search" do
context ".search_labels" do
setup do
FactoryBot.create(:tag_alias, antecedent_name: "bbb", consequent_name: "ccc", creator: @user)
FactoryBot.create(:saved_search, user: @user, label_string: "blah", query: "aaa")
FactoryBot.create(:saved_search, user: @user, label_string: "blahbling", query: "CCC BBB AAA")
FactoryBot.create(:saved_search, user: @user, label_string: "qux", query: " aaa bbb ccc ")
end
should "fetch the queries used by a user for a label" do
assert_equal(%w(blah blahbling), SavedSearch.search_labels(@user.id, label: "blah"))
end
end
context ".post_ids_for" do
context "with a label" do
setup do
SavedSearch.expects(:queries_for).with(1, "blah").returns(%w(a b c))
stub_request(:post, "http://localhost:3001/v2/search").to_return(:body => "1 2 3 4")
SavedSearch.expects(:queries_for).with(1, label: "blah").returns(%w(a b c))
end
should "return a list of ids" do
post_ids = SavedSearch.post_ids(1, "blah")
assert_equal([1,2,3,4], post_ids)
context "without a primed cache" do
should "delay processing three times" do
SavedSearch.expects(:populate).times(3)
post_ids = SavedSearch.post_ids_for(1, label: "blah")
assert_equal([], post_ids)
end
end
context "with a primed cached" do
setup do
@mock_redis.sadd("search:a", 1)
@mock_redis.sadd("search:b", 2)
@mock_redis.sadd("search:c", 3)
end
should "fetch the post ids" do
SavedSearch.expects(:delay).never
post_ids = SavedSearch.post_ids_for(1, label: "blah")
assert_equal([1,2,3], post_ids)
end
end
end
context "without a label" do
setup do
SavedSearch.expects(:queries_for).with(1, nil).returns(%w(a b c))
stub_request(:post, "http://localhost:3001/v2/search").to_return(:body => "1 2 3 4")
SavedSearch.expects(:queries_for).with(1, label: nil).returns(%w(a b c))
end
should "return a list of ids" do
post_ids = SavedSearch.post_ids(1)
assert_equal([1,2,3,4], post_ids)
end
end
context "with a nonexistent label" do
setup do
SavedSearch.expects(:queries_for).with(1, "empty").returns([])
context "without a primed cache" do
should "delay processing three times" do
SavedSearch.expects(:populate).times(3)
post_ids = SavedSearch.post_ids_for(1)
assert_equal([], post_ids)
end
end
should "return an empty list of ids" do
post_ids = SavedSearch.post_ids(1, "empty")
assert_equal([], post_ids)
context "with a primed cache" do
setup do
@mock_redis.sadd("search:a", 1)
@mock_redis.sadd("search:b", 2)
@mock_redis.sadd("search:c", 3)
end
should "fetch the post ids" do
SavedSearch.expects(:delay).never
post_ids = SavedSearch.post_ids_for(1)
assert_equal([1,2,3], post_ids)
end
end
end
end
@@ -88,7 +118,7 @@ class SavedSearchTest < ActiveSupport::TestCase
context "Creating a saved search" do
setup do
FactoryBot.create(:tag_alias, antecedent_name: "zzz", consequent_name: "yyy", creator: @user)
@saved_search = @user.saved_searches.create(:query => " ZZZ xxx ")
@saved_search = @user.saved_searches.create(query: " ZZZ xxx ")
end
should "update the bitpref on the user" do

20
test/unit/tag_alias_test.rb
View File

@@ -68,13 +68,19 @@ class TagAliasTest < ActiveSupport::TestCase
assert_nil(Cache.get("ta:#{Cache.hash("aaa")}"))
end
should "move saved searches" do
tag1 = FactoryBot.create(:tag, :name => "...")
tag2 = FactoryBot.create(:tag, :name => "bbb")
ss = FactoryBot.create(:saved_search, :query => "123 ... 456", :user => CurrentUser.user)
ta = FactoryBot.create(:tag_alias, :antecedent_name => "...", :consequent_name => "bbb")
ss.reload
assert_equal(%w(123 456 bbb), ss.query.split.sort)
context "saved searches" do
setup do
SavedSearch.stubs(:enabled?).returns(true)
end
should "move saved searches" do
tag1 = FactoryBot.create(:tag, :name => "...")
tag2 = FactoryBot.create(:tag, :name => "bbb")
ss = FactoryBot.create(:saved_search, :query => "123 ... 456", :user => CurrentUser.user)
ta = FactoryBot.create(:tag_alias, :antecedent_name => "...", :consequent_name => "bbb")
ss.reload
assert_equal(%w(123 456 bbb), ss.query.split.sort)
end
end
should "update any affected posts when saved" do