Fixes link assertion with single or double quote (#965)

* Fixes link assertion with single or double quote Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * Update InteractsWithElements.php * Update MakesAssertions.php Co-authored-by: Taylor Otwell <[email protected]>
laravel · Feb 12, 2022 · bc9fd27 · bc9fd27
1 parent 4c2f1d2
commit bc9fd27
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Concerns/InteractsWithElements.php b/src/Concerns/InteractsWithElements.php
@@ -45,9 +45,11 @@ public function clickLink($link, $element = 'a')
     {
         $this->ensurejQueryIsAvailable();
 
-        $selector = addslashes(trim($this->resolver->format("{$element}:contains({$link}):visible")));
+        $selector = addslashes(trim($this->resolver->format("{$element}")));
 
-        $this->driver->executeScript("jQuery.find(\"{$selector}\")[0].click();");
+        $link = str_replace("'", "\\\\'", $link);
+
+        $this->driver->executeScript("jQuery.find(`{$selector}:contains('{$link}'):visible`)[0].click();");
 
         return $this;
     }

diff --git a/src/Concerns/MakesAssertions.php b/src/Concerns/MakesAssertions.php
@@ -355,10 +355,12 @@ public function seeLink($link)
     {
         $this->ensurejQueryIsAvailable();
 
-        $selector = addslashes(trim($this->resolver->format("a:contains('{$link}')")));
+        $selector = addslashes(trim($this->resolver->format('a')));
+
+        $link = str_replace("'", "\\\\'", $link);
 
         $script = <<<JS
-            var link = jQuery.find("{$selector}");
+            var link = jQuery.find(`{$selector}:contains('{$link}')`);
             return link.length > 0 && jQuery(link).is(':visible');
 JS;
 

diff --git a/tests/WaitsForElementsTest.php b/tests/WaitsForElementsTest.php
@@ -257,13 +257,13 @@ public function test_wait_for_link()
     {
         $driver = m::mock(stdClass::class);
         $driver->shouldReceive('executeScript')
-            ->times(2)
+            ->times(3)
             ->andReturnTrue();
 
         $link = 'https://laravel.com/docs/8.x/dusk';
 
         $script = <<<JS
-            var link = jQuery.find("body a:contains(\'{$link}\')");
+            var link = jQuery.find(`body a:contains('{$link}')`);
             return link.length > 0 && jQuery(link).is(':visible');
 JS;