Ensure remote web driver is not null before executing

tr33m4n · Apr 14, 2022 · a556cc8 · a556cc8
1 parent ed8d039
commit a556cc8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/Codeception/Module/Percy.php b/src/Codeception/Module/Percy.php
@@ -92,6 +92,11 @@ public function takeAPercySnapshot(
             return;
         }
 
+        // If remote web driver has not been set, return
+        if (null === $this->webDriver->webDriver) {
+            return;
+        }
+
         // Add Percy CLI JS to page
         $this->webDriver->executeJS($this->percyCliJs);
 
@@ -106,7 +111,7 @@ public function takeAPercySnapshot(
                     )
                 ))
                 ->withClientInfo(InfoProvider::getClientInfo())
-                ->withEnvironmentInfo(InfoProvider::getEnvironmentInfo($this->webDriver))
+                ->withEnvironmentInfo(InfoProvider::getEnvironmentInfo($this->webDriver->webDriver))
         );
     }
 

diff --git a/src/Codeception/Module/Percy/InfoProvider.php b/src/Codeception/Module/Percy/InfoProvider.php
@@ -4,7 +4,7 @@
 
 namespace Codeception\Module\Percy;
 
-use Codeception\Module\WebDriver;
+use Facebook\WebDriver\Remote\RemoteWebDriver;
 use PackageVersions\Versions;
 
 final class InfoProvider
@@ -18,16 +18,16 @@ final class InfoProvider
     /**
      * Get environment info
      *
-     * @param \Codeception\Module\WebDriver $webDriver
+     * @param \Facebook\WebDriver\Remote\RemoteWebDriver $webDriver
      * @return string
      */
-    public static function getEnvironmentInfo(WebDriver $webDriver): string
+    public static function getEnvironmentInfo(RemoteWebDriver $webDriver): string
     {
         if (null !== self::$environmentInfo) {
             return self::$environmentInfo;
         }
 
-        $webDriverCapabilities = $webDriver->webDriver->getCapabilities();
+        $webDriverCapabilities = $webDriver->getCapabilities();
 
         return self::$environmentInfo = sprintf(
             'codeception-php; %s; %s/%s',