fix

oleg-andreyev · Jul 12, 2023 · 7c346ad · 7c346ad
1 parent 07feb70
commit 7c346ad
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -161,7 +161,11 @@ jobs:
             defaults read /Applications/Safari.app/Contents/Info CFBundleShortVersionString
           fi;
           
-          /usr/bin/safaridriver -p 4444 --diagnose &
+          if [[ "${{ matrix.use_safari_technology_preview }}" == true ]]; then
+            /Applications/Safari\ Technology\ Preview.app/Contents/MacOS/safaridriver -p 4444 --diagnose &
+          else 
+            /usr/bin/safaridriver -p 4444 --diagnose &
+          fi;
           
           while ! nc -z localhost 4444 </dev/null; do echo Waiting for driver to start...; sleep 1; done
 

diff --git a/README.md b/README.md
@@ -24,8 +24,11 @@ https://github.com/oleg-andreyev/MinkPhpWebdriverExtension
 You must enable the 'Allow Remote Automation' option in Safari's Develop menu to control Safari via WebDriver.
 
 ```bash
-./bin/start_webdriver.sh &
-# ./bin/start_driver.sh <browser> <version>
+./bin/start_webserver.sh &
+# ./bin/start_driver.sh <browser> [<version>]
+# ./bin/start_driver.sh chrome
+# ./bin/start_driver.sh firefox
+# ./bin/start_driver.sh safari
 ./bin/start_driver.sh chrome latest &
 BROWSER_NAME=chrome ./bin/phpunit
 ```

diff --git a/bin/browser/safari.sh b/bin/browser/safari.sh
@@ -12,13 +12,23 @@ fi
 
 rm -rf ~/Library/Logs/com.apple.WebDriver/*
 
-/usr/bin/safaridriver --port=4444 --diagnose &
+if [[ "$USE_SAFARI_TECHNOLOGY_PREVIEW" == true ]]; then
+  /Applications/Safari\ Technology\ Preview.app/Contents/MacOS/safaridriver -p 4444 --diagnose &
+else
+  /usr/bin/safaridriver -p 4444 --diagnose &
+fi;
+
 SAFARIDRIVER_PID=$!
 
 function stop {
     kill $SAFARIDRIVER_PID
 }
 
 trap stop SIGINT
+trap stop ERR
+
+# generate first log
+sleep 5
+curl 127.0.0.1:4444 -vvv
 
-tail -f ~/Library/Logs/com.apple.WebDriver/* /dev/null
+tail -F ~/Library/Logs/com.apple.WebDriver/*
diff --git a/src/WebDriver.php b/src/WebDriver.php
@@ -18,6 +18,7 @@
 use Facebook\WebDriver\Exception\NoSuchCookieException;
 use Facebook\WebDriver\Exception\NoSuchElementException;
 use Facebook\WebDriver\Exception\ScriptTimeoutException;
+use Facebook\WebDriver\Exception\TimeoutException;
 use Facebook\WebDriver\Remote\DesiredCapabilities;
 use Facebook\WebDriver\Remote\LocalFileDetector;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
@@ -72,32 +73,36 @@ class WebDriver extends CoreDriver
     /**
      * Instantiates the driver.
      *
-     * @param string                    $browserName         Browser name
-     * @param array<string, mixed>|null $desiredCapabilities The desired capabilities
-     * @param string                    $wdHost              The WebDriver host
+     * @param string                                        $browserName         Browser name
+     * @param array<string, mixed>|DesiredCapabilities|null $desiredCapabilities The desired capabilities
+     * @param string                                        $wdHost              The WebDriver host
      */
     public function __construct(
         string $browserName = 'firefox',
-        $desiredCapabilities = null,
+        array|DesiredCapabilities $desiredCapabilities = null,
         string $wdHost = 'http://localhost:4444/wd/hub'
     ) {
         $this->wdHost = $wdHost;
         $this->browserName = $browserName;
 
-        if ('firefox' === $browserName) {
-            $this->desiredCapabilities = DesiredCapabilities::firefox();
-        } elseif ('chrome' === $browserName) {
-            $this->desiredCapabilities = DesiredCapabilities::chrome();
-        } else if ($browserName === 'safari') {
-            $this->desiredCapabilities = DesiredCapabilities::safari();
-        } else {
-            $this->desiredCapabilities = new DesiredCapabilities();
-        }
+        if (!$desiredCapabilities instanceof DesiredCapabilities) {
+            if ('firefox' === $browserName) {
+                $this->desiredCapabilities = DesiredCapabilities::firefox();
+            } elseif ('chrome' === $browserName) {
+                $this->desiredCapabilities = DesiredCapabilities::chrome();
+            } else if ($browserName === 'safari') {
+                $this->desiredCapabilities = DesiredCapabilities::safari();
+            } else {
+                $this->desiredCapabilities = new DesiredCapabilities();
+            }
 
-        if ($desiredCapabilities) {
-            foreach ($desiredCapabilities as $key => $val) {
-                $this->desiredCapabilities->setCapability($key, $val);
+            if (is_array($desiredCapabilities)) {
+                foreach ($desiredCapabilities as $key => $val) {
+                    $this->desiredCapabilities->setCapability($key, $val);
+                }
             }
+        } else {
+            $this->desiredCapabilities = $desiredCapabilities;
         }
     }
 
@@ -338,7 +343,11 @@ public function stop()
      */
     public function reset()
     {
-        $this->webDriver->manage()->deleteAllCookies();
+        // if about:blank (safari just empty) we cannot delete cookies.
+        if ($this->webDriver->getCurrentURL() !== '') {
+            $this->webDriver->manage()->deleteAllCookies();
+        }
+
         // TODO: resizeWindow does not accept NULL
         $this->maximizeWindow();
         // reset timeout
@@ -551,16 +560,15 @@ public function getTagName(
         return $element->getTagName();
     }
 
+    /**
+     * @see https://www.w3.org/TR/webdriver1/#get-element-text
+     */
     public function getText(
         #[Language('xpath')]
         $xpath
-    ) {
+    ): string {
         $element = $this->findElement($xpath);
-        $text = $element->getText();
-
-        $text = (string) str_replace(["\r", "\r\n", "\n"], ' ', $text);
-
-        return $text;
+        return $element->getText();
     }
 
     /**

diff --git a/tests/WebDriverConfig.php b/tests/WebDriverConfig.php
@@ -40,6 +40,9 @@ public function createDriver()
             }
         } else if ($browser === 'safari') {
             $desiredCapabilities = DesiredCapabilities::safari();
+            if (($_SERVER['USE_SAFARI_TECHNOLOGY_PREVIEW'] ?? 'false') === 'true') {
+                $desiredCapabilities->setBrowserName('Safari Technology Preview');
+            }
         } else {
             $desiredCapabilities = new DesiredCapabilities();
         }
@@ -63,7 +66,8 @@ public function createDriver()
                 $optionsOrProfile = $this->buildFirefoxProfile($desiredCapabilities, $optionsOrProfile, $driverOptions);
             } else if ($browser === 'safari') {
                 $optionsOrProfile = [
-                    'technologyPreview' => ($_ENV['USE_SAFARI_TECHNOLOGY_PREVIEW'] ?? 'false') === 'true',
+//                    'safari:automaticInspection' => true,
+                    'technologyPreview' => ($_SERVER['USE_SAFARI_TECHNOLOGY_PREVIEW'] ?? 'false') === 'true',
                 ];
             }