Merge pull request #10 from andrewmy/multiple_element_search

Multiple element search + optgroup fix
roquie · May 16, 2018 · c9a125a · c9a125a
2 parents 100d251 + fbb9455
commit c9a125a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/macro.php b/src/macro.php
@@ -7,6 +7,7 @@
  */
 
 use Laravel\Dusk\Browser;
+use Facebook\WebDriver\Exception\ElementNotVisibleException;
 
 /**
  * Register simple macros for the Laravel Dusk.
@@ -35,17 +36,22 @@
 
     // check if search field exists and fill it.
     if ($element = $this->element('.select2-container.select2-container--open .select2-search__field')) {
-        foreach ((array) $value as $item) {
-            $element->sendKeys($item);
-            sleep($wait);
-            $this->click('.select2-results__option--highlighted');
+        try {
+            foreach ((array) $value as $item) {
+                $element->sendKeys($item);
+                sleep($wait);
+                $this->click('.select2-results__option--highlighted');
+            }
+
+            return $this;
+        } catch (ElementNotVisibleException $exception) {
+            // ignore the exception and try another way
         }
-
-        return $this;
     }
 
     // another way - w/o search field.
-    $this->script("jQuery.find(\".select2-results__options .select2-results__option:contains('{$value}')\")[0].click()");
+    $field = \str_replace('\\', '\\\\', $field);
+    $this->script("jQuery(\"$field\").val((function () { return jQuery(\"$field option:contains('$value')\").val(); })()).trigger('change')");
 
     return $this;
 });
diff --git a/tests/Browser/Select2Test.php b/tests/Browser/Select2Test.php
@@ -16,13 +16,15 @@ public function testShouldBeSelect2SelectableAutomatically()
             $browser
                 ->visit('/')
                 ->select2('.js-example-basic-single', 'Calif')
-                ->assertSee('California')
-                ->select2('.js-example-basic-hide-search')
+                ->assertSeeIn('.js-example-basic-single + .select2', 'California')
+                ->select2('.js-example-basic-hide-search', 'Nev')
+                ->assertSeeIn('.js-example-basic-hide-search + .select2', 'Nevada')
+                ->click('h3:first-child') // close the previous select
                 ->select2('.js-example-basic-multiple', 'Wy')
                 ->waitFor('.select2-selection__choice')
                 ->select2('.js-example-basic-multiple')
                 ->select2('.js-data-example-ajax', 'laravel')
-                ->assertSee('laravel')
+                ->waitForText('laravel')
             ;
         });
     }