mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-22 05:08:03 +00:00
62bafa20a1
* Revert "Add indication that you have been blocked in web UI (#10420)" This reverts commitbd02ec6daa. * Revert "Add `blocked_by` relationship to the REST API (#10373)" This reverts commit9745de883b. * Hide blocking accounts from search results * Filter blocking accouts from account followers * Filter blocking accouts from account's following accounts * Filter blocking accounts from “reblogged by” and “favourited by” lists * Remove blocking account from URL search * Return 410 on trying to fetch user data from a user who blocked us * Return 410 in /api/v1/account/statuses for suspended or blocking accounts * Fix status filtering when performing URL search * Restore some React improvements Restore some cleanup frombd02ec6daa* Refactor by adding `without_blocking` scope
104 lines
3.5 KiB
Ruby
104 lines
3.5 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
require 'rails_helper'
|
|
|
|
describe SearchService, type: :service do
|
|
let(:current_account) { Fabricate(:user).account }
|
|
|
|
subject { described_class.new }
|
|
|
|
describe '#call' do
|
|
describe 'with a blank query' do
|
|
it 'returns empty results without searching' do
|
|
allow(AccountSearchService).to receive(:new)
|
|
allow(Tag).to receive(:search_for)
|
|
results = subject.call('', current_account, 10)
|
|
|
|
expect(results).to eq(empty_results)
|
|
expect(AccountSearchService).not_to have_received(:new)
|
|
expect(Tag).not_to have_received(:search_for)
|
|
end
|
|
end
|
|
|
|
describe 'with an url query' do
|
|
before do
|
|
@query = 'http://test.host/query'
|
|
end
|
|
|
|
context 'that does not find anything' do
|
|
it 'returns the empty results' do
|
|
service = double(call: nil)
|
|
allow(ResolveURLService).to receive(:new).and_return(service)
|
|
results = subject.call(@query, current_account, 10)
|
|
|
|
expect(service).to have_received(:call).with(@query, on_behalf_of: current_account)
|
|
expect(results).to eq empty_results
|
|
end
|
|
end
|
|
|
|
context 'that finds an account' do
|
|
it 'includes the account in the results' do
|
|
account = Fabricate(:account)
|
|
service = double(call: account)
|
|
allow(ResolveURLService).to receive(:new).and_return(service)
|
|
|
|
results = subject.call(@query, current_account, 10)
|
|
expect(service).to have_received(:call).with(@query, on_behalf_of: current_account)
|
|
expect(results).to eq empty_results.merge(accounts: [account])
|
|
end
|
|
end
|
|
|
|
context 'that finds a status' do
|
|
it 'includes the status in the results' do
|
|
status = Fabricate(:status)
|
|
service = double(call: status)
|
|
allow(ResolveURLService).to receive(:new).and_return(service)
|
|
|
|
results = subject.call(@query, current_account, 10)
|
|
expect(service).to have_received(:call).with(@query, on_behalf_of: current_account)
|
|
expect(results).to eq empty_results.merge(statuses: [status])
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'with a non-url query' do
|
|
context 'that matches an account' do
|
|
it 'includes the account in the results' do
|
|
query = 'username'
|
|
account = Fabricate(:account)
|
|
service = double(call: [account])
|
|
allow(AccountSearchService).to receive(:new).and_return(service)
|
|
|
|
results = subject.call(query, current_account, 10)
|
|
expect(service).to have_received(:call).with(query, current_account, limit: 10, offset: 0, resolve: false)
|
|
expect(results).to eq empty_results.merge(accounts: [account])
|
|
end
|
|
end
|
|
|
|
context 'that matches a tag' do
|
|
it 'includes the tag in the results' do
|
|
query = '#tag'
|
|
tag = Tag.new
|
|
allow(Tag).to receive(:search_for).with('tag', 10, 0).and_return([tag])
|
|
|
|
results = subject.call(query, current_account, 10)
|
|
expect(Tag).to have_received(:search_for).with('tag', 10, 0)
|
|
expect(results).to eq empty_results.merge(hashtags: [tag])
|
|
end
|
|
it 'does not include tag when starts with @ character' do
|
|
query = '@username'
|
|
allow(Tag).to receive(:search_for)
|
|
|
|
results = subject.call(query, current_account, 10)
|
|
expect(Tag).not_to have_received(:search_for)
|
|
expect(results).to eq empty_results
|
|
end
|
|
end
|
|
end
|
|
end
|
|
|
|
def empty_results
|
|
{ accounts: [], hashtags: [], statuses: [] }
|
|
end
|
|
end
|