Actually add the test this time

[bookstack] / tests / Entity / SearchOptionsTest.php

diff --git a/tests/Entity/SearchOptionsTest.php b/tests/Entity/SearchOptionsTest.php
index c9e116523ed0fdf943622fc4c6a77a7d07ceb689..ea4d727a42850002353b686823ce362a048b4395 100644 (file)
--- a/tests/Entity/SearchOptionsTest.php
+++ b/tests/Entity/SearchOptionsTest.php
@@ -1,6 +1,9 @@
-<?php namespace Tests\Entity;
+<?php

 
 

-use BookStack\Entities\Tools\SearchOptions;
+namespace Tests\Entity;
+
+use BookStack\Search\SearchOptions;
+use Illuminate\Http\Request;

 use Tests\TestCase;
 
 class SearchOptionsTest extends TestCase
 use Tests\TestCase;
 
 class SearchOptionsTest extends TestCase


@@ -15,10 +18,17 @@ class SearchOptionsTest extends TestCase
         $this->assertEquals(['is_tree' => ''], $options->filters);
     }
 
         $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}';
     public function test_to_string_includes_all_items_in_the_correct_format()
     {
         $expected = 'cat "dog" [tag=good] {is_tree}';

-        $options = new SearchOptions;
+        $options = new SearchOptions();

         $options->searches = ['cat'];
         $options->exacts = ['dog'];
         $options->tags = ['tag=good'];
         $options->searches = ['cat'];
         $options->exacts = ['dog'];
         $options->tags = ['tag=good'];


@@ -30,14 +40,41 @@ class SearchOptionsTest extends TestCase
         }
     }
 
         }
     }
 

+    public function test_to_string_escapes_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}');
 
         $this->assertEquals([
             'is_tree' => '',
     public function test_correct_filter_values_are_set_from_string()
     {
         $opts = SearchOptions::fromString('{is_tree} {name:dan} {cat:happy}');
 
         $this->assertEquals([
             'is_tree' => '',

-            'name' => 'dan',
-            'cat' => 'happy',
+            'name'    => 'dan',
+            'cat'     => 'happy',

         ], $opts->filters);
     }
         ], $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);
+    }

 }
 }