Less duplicate code

Lullabot · Jul 3, 2024 · 2d243b8 · 2d243b8
1 parent edb6aeb
commit 2d243b8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 45 deletions.
diff --git a/test/Test/WebDriver/ChromeDriverNonW3CTest.php b/test/Test/WebDriver/ChromeDriverNonW3CTest.php
@@ -22,55 +22,14 @@
 
 namespace Test\WebDriver;
 
-use Test\WebDriver\WebDriverTestBase;
-use WebDriver\Browser;
-use WebDriver\Session;
-
 /**
  * ChromeDriver
  *
  * @package WebDriver
  *
  * @group Functional
  */
-class ChromeDriverNonW3CTest extends WebDriverTestBase
+class ChromeDriverNonW3CTest extends ChromeDriverTest
 {
-    protected $testWebDriverRootUrl = 'http://localhost:9515';
-    protected $testWebDriverName    = 'chromedriver';
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-        try {
-            $this->status = $this->driver->status();
-            $this->session = $this->driver->session(Browser::CHROME, [
-                'goog:chromeOptions' => [
-                    'w3c' => false,
-                    'args' => [
-                        '--no-sandbox',
-                        '--ignore-certificate-errors',
-                        '--allow-insecure-localhost',
-                        '--headless',
-                    ],
-                ],
-            ]);
-        }
-        catch (\Exception $e) {
-            if ($this->isWebDriverDown($e)) {
-                $this->fail("{$this->testWebDriverName} server not running: {$e->getMessage()}");
-            }
-            throw $e;
-        }
-    }
-
-    /**
-     * Test driver status
-     */
-    public function testStatus()
-    {
-        $this->assertEquals(1, $this->status['ready'], 'Chromedriver is not ready');
-        $this->assertEquals('ChromeDriver ready for new sessions.', $this->status['message'], 'Chromedriver is not ready');
-        $this->assertNotEmpty($this->status['os'], 'OS info not detected');
-        $this->assertFalse($this->driver->isW3c());
-    }
+    protected $w3c = false;
 }
diff --git a/test/Test/WebDriver/ChromeDriverTest.php b/test/Test/WebDriver/ChromeDriverTest.php
@@ -37,6 +37,7 @@ class ChromeDriverTest extends WebDriverTestBase
 {
     protected $testWebDriverRootUrl = 'http://localhost:9515';
     protected $testWebDriverName    = 'chromedriver';
+    protected $w3c = true;
 
     protected function setUp(): void
     {
@@ -45,7 +46,7 @@ protected function setUp(): void
             $this->status = $this->driver->status();
             $this->session = $this->driver->session(Browser::CHROME, [
                 'goog:chromeOptions' => [
-                    'w3c' => true,
+                    'w3c' => $this->w3c,
                     'args' => [
                         '--no-sandbox',
                         '--ignore-certificate-errors',
@@ -71,6 +72,6 @@ public function testStatus()
         $this->assertEquals(1, $this->status['ready'], 'Chromedriver is not ready');
         $this->assertEquals('ChromeDriver ready for new sessions.', $this->status['message'], 'Chromedriver is not ready');
         $this->assertNotEmpty($this->status['os'], 'OS info not detected');
-        $this->assertTrue($this->driver->isW3c());
+        $this->assertSame($this->w3c, $this->driver->isW3c());
     }
 }