forked from mastodon/mastodon
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "fix up a bit how searchable_by works in the real world (#7)"
This reverts commit 307ea70.
- Loading branch information
1 parent
307ea70
commit e9eb9f3
Showing
5 changed files
with
29 additions
and
234 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,111 +15,4 @@ | |
| expect(transformer.filter_clauses.first).to be_nil | ||
| end | ||
| end | ||
|
|
||
| describe '#apply' do | ||
| subject(:applied_query) do | ||
| described_class.new.apply( | ||
| SearchQueryParser.new.parse(search_term) | ||
| ).apply(query) | ||
| end | ||
|
|
||
| let(:query) { { bool: {} } } | ||
| let(:search_term) { '' } | ||
|
|
||
| context 'when query is just a bool' do | ||
| it 'returns a hash of bool' do | ||
| expect(applied_query).to eq(query) | ||
| end | ||
| end | ||
|
|
||
| context 'when should_clauses are present' do | ||
| let(:search_term) { 'test' } | ||
|
|
||
| it 'adds should clauses to the query' do | ||
| expect(applied_query[:bool][:should].length).to eq(1) | ||
| expect(applied_query[:bool][:should][0][:multi_match][:query]).to eq(search_term) | ||
| end | ||
|
|
||
| it 'sets minimum_should_match to 1' do | ||
| expect(applied_query[:bool][:minimum_should_match]).to eq(1) | ||
| end | ||
| end | ||
|
|
||
| context 'when must_clauses are present' do | ||
| let(:search_term) { '+test' } | ||
|
|
||
| it 'adds must clauses to the query' do | ||
| expect(applied_query[:bool][:must].length).to eq(1) | ||
| expect(applied_query[:bool][:must][0][:multi_match][:query]).to eq(search_term[1..]) | ||
| end | ||
| end | ||
|
|
||
| context 'when must_not_clauses are present' do | ||
| let(:search_term) { '-test' } | ||
|
|
||
| it 'adds must_not clauses to the query' do | ||
| expect(applied_query[:bool][:must_not].length).to eq(1) | ||
| expect(applied_query[:bool][:must_not][0][:multi_match][:query]).to eq(search_term[1..]) | ||
| end | ||
| end | ||
|
|
||
| context 'when filter_clauses are present' do | ||
| let(:search_term) { 'from:@[email protected]' } | ||
|
|
||
| it 'adds filter clauses to the query' do | ||
| account = Fabricate(:account, username: 'test_account', domain: 'example.com') | ||
|
|
||
| expect(applied_query[:bool][:filter].length).to eq(1) | ||
| expect(applied_query[:bool][:filter][0][:term][:account_id]).to eq(account.id) | ||
| puts "Final count of Account records: #{Account.count}" | ||
| end | ||
| end | ||
|
|
||
| context 'when all clauses are present' do | ||
| let(:should_term) { 'should' } | ||
| let(:must_term) { '+must' } | ||
| let(:must_not_term) { '-nope' } | ||
| let(:filter_term) { 'from:@[email protected]' } | ||
| let(:search_term) { "#{should_term} #{must_term} #{must_not_term} #{filter_term}" } | ||
|
|
||
| it 'adds all clauses to the query' do | ||
| account = Fabricate(:account, username: 'test_account', domain: 'example.com') | ||
|
|
||
| expect(applied_query[:bool][:should][0][:multi_match][:query]).to eq(should_term) | ||
| expect(applied_query[:bool][:must][0][:multi_match][:query]).to eq(must_term[1..]) | ||
| expect(applied_query[:bool][:must_not][0][:multi_match][:query]).to eq(must_not_term[1..]) | ||
| expect(applied_query[:bool][:filter][0][:term][:account_id]).to eq(account.id) | ||
| end | ||
|
|
||
| it 'sets minimum_should_match to 1' do | ||
| Fabricate(:account, username: 'test_account', domain: 'example.com') | ||
|
|
||
| expect(applied_query[:bool][:minimum_should_match]).to eq(1) | ||
| end | ||
| end | ||
|
|
||
| context 'when all clauses are present and query has all clauses too' do | ||
| let(:should_term) { 'should' } | ||
| let(:must_term) { '+must' } | ||
| let(:must_not_term) { '-nope' } | ||
| let(:filter_term) { 'from:@[email protected]' } | ||
| let(:search_term) { "#{should_term} #{must_term} #{must_not_term} #{filter_term}" } | ||
| let(:query) { { bool: { should: [{ term: { exists: true } }], must: [{ term: { exists: true } }], must_not: [{ term: { exists: true } }], filter: [{ term: { exists: true } }] } } } | ||
|
|
||
| it 'adds all clauses to the arrays in the query' do | ||
| Fabricate(:account, username: 'test_account', domain: 'example.com') | ||
|
|
||
| expect(applied_query[:bool][:should].length).to eq(2) | ||
| expect(applied_query[:bool][:must].length).to eq(2) | ||
| expect(applied_query[:bool][:must_not].length).to eq(2) | ||
| expect(applied_query[:bool][:filter].length).to eq(2) | ||
| end | ||
|
|
||
| it 'sets minimum_should_match to 1' do | ||
| Fabricate(:account, username: 'test_account', domain: 'example.com') | ||
|
|
||
| expect(applied_query[:bool][:minimum_should_match]).to eq(1) | ||
| end | ||
| end | ||
| end | ||
| end | ||