webapp/bookstack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2026-01-03 23:42:28 +03:00
Code Activity

Search: Added support for escaped exact terms

Browse Source 
Also prevented use of empty exact matches.
Prevents issues when attempting to use exact search terms in inputs for
just search terms, and use of single " chars within search terms since
these would get auto-promoted to exacts.

For #4535
This commit is contained in:
Dan Brown
2023-09-19 20:09:33 +01:00
parent 4b4d8ba2a1
commit 8964575973
2 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
tests/Entity/SearchOptionsTest.php
View File

@@ -3,6 +3,7 @@
namespace Tests\Entity;
use BookStack\Search\SearchOptions;
use Illuminate\Http\Request;
use Tests\TestCase;
class SearchOptionsTest extends TestCase
@@ -17,6 +18,13 @@ class SearchOptionsTest extends TestCase
$this->assertEquals(['is_tree' => ''], $options->filters);
}
public function test_from_string_properly_parses_escaped_quotes()
{
$options = SearchOptions::fromString('"\"cat\"" surprise "\"\"" "\"donkey" "\""');
$this->assertEquals(['"cat"', '""', '"donkey', '"'], $options->exacts);
}
public function test_to_string_includes_all_items_in_the_correct_format()
{
$expected = 'cat "dog" [tag=good] {is_tree}';
@@ -32,6 +40,15 @@ class SearchOptionsTest extends TestCase
}
}
public function test_to_string_escapes_quotes_as_expected()
{
$options = new SearchOptions();
$options->exacts = ['"cat"', '""', '"donkey', '"'];
$output = $options->toString();
$this->assertEquals('"\"cat\"" "\"\"" "\"donkey" "\""', $output);
}
public function test_correct_filter_values_are_set_from_string()
{
$opts = SearchOptions::fromString('{is_tree} {name:dan} {cat:happy}');
@@ -42,4 +59,22 @@ class SearchOptionsTest extends TestCase
'cat' => 'happy',
], $opts->filters);
}
public function test_it_cannot_parse_out_empty_exacts()
{
$options = SearchOptions::fromString('"" test ""');
$this->assertEmpty($options->exacts);
$this->assertCount(1, $options->searches);
}
public function test_from_request_properly_parses_exacts_from_search_terms()
{
$request = new Request([
'search' => 'biscuits "cheese" "" "baked beans"'
]);
$options = SearchOptions::fromRequest($request);
$this->assertEquals(["biscuits"], $options->searches);
$this->assertEquals(['"cheese"', '""', '"baked', 'beans"'], $options->exacts);
}
}