Merge pull request #679 from OndraM/feature/w3c-window

Add W3C window size and position commands

Author: OndraM

lib/Remote/HttpCommandExecutor.php

@@ -144,8 +144,9 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         DriverCommand::ACCEPT_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/alert/accept'],
         DriverCommand::ACTIONS => ['method' => 'POST', 'url' => '/session/:sessionId/actions'],
         DriverCommand::DISMISS_ALERT => ['method' => 'POST', 'url' => '/session/:sessionId/alert/dismiss'],
-        DriverCommand::EXECUTE_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/sync'],
         DriverCommand::EXECUTE_ASYNC_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/async'],
+        DriverCommand::EXECUTE_SCRIPT => ['method' => 'POST', 'url' => '/session/:sessionId/execute/sync'],
+        DriverCommand::GET_ALERT_TEXT => ['method' => 'GET', 'url' => '/session/:sessionId/alert/text'],
         DriverCommand::GET_CURRENT_WINDOW_HANDLE => ['method' => 'GET', 'url' => '/session/:sessionId/window'],
         DriverCommand::GET_ELEMENT_LOCATION => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/rect'],
         DriverCommand::GET_ELEMENT_PROPERTY => [
@@ -154,11 +155,15 @@ class HttpCommandExecutor implements WebDriverCommandExecutor
         ],
         DriverCommand::GET_ELEMENT_SIZE => ['method' => 'GET', 'url' => '/session/:sessionId/element/:id/rect'],
         DriverCommand::GET_WINDOW_HANDLES => ['method' => 'GET', 'url' => '/session/:sessionId/window/handles'],
-        DriverCommand::GET_ALERT_TEXT => ['method' => 'GET', 'url' => '/session/:sessionId/alert/text'],
+        DriverCommand::GET_WINDOW_POSITION => ['method' => 'GET', 'url' => '/session/:sessionId/window/rect'],
+        DriverCommand::GET_WINDOW_SIZE => ['method' => 'GET', 'url' => '/session/:sessionId/window/rect'],
         DriverCommand::IMPLICITLY_WAIT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
+        DriverCommand::MAXIMIZE_WINDOW => ['method' => 'POST', 'url' => '/session/:sessionId/window/maximize'],
         DriverCommand::SET_ALERT_VALUE => ['method' => 'POST', 'url' => '/session/:sessionId/alert/text'],
         DriverCommand::SET_SCRIPT_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
         DriverCommand::SET_TIMEOUT => ['method' => 'POST', 'url' => '/session/:sessionId/timeouts'],
+        DriverCommand::SET_WINDOW_SIZE => ['method' => 'POST', 'url' => '/session/:sessionId/window/rect'],
+        DriverCommand::SET_WINDOW_POSITION => ['method' => 'POST', 'url' => '/session/:sessionId/window/rect'],
     ];
     /**
      * @var string

tests/functional/WebDriverWindowTest.php

@@ -0,0 +1,87 @@
+<?php
+
+namespace Facebook\WebDriver;
+
+/**
+ * @covers \Facebook\WebDriver\WebDriverWindow
+ */
+class WebDriverWindowTest extends WebDriverTestCase
+{
+    /**
+     * @group exclude-saucelabs
+     */
+    public function testShouldGetPosition()
+    {
+        $position = $this->driver->manage()
+            ->window()
+            ->getPosition();
+
+        $this->assertGreaterThanOrEqual(0, $position->getX());
+        $this->assertGreaterThanOrEqual(0, $position->getY());
+    }
+
+    public function testShouldGetSize()
+    {
+        $size = $this->driver->manage()
+            ->window()
+            ->getSize();
+
+        $this->assertGreaterThan(0, $size->getWidth());
+        $this->assertGreaterThan(0, $size->getHeight());
+    }
+
+    public function testShouldMaximizeWindow()
+    {
+        $sizeBefore = $this->driver->manage()
+            ->window()
+            ->getSize();
+
+        $this->driver->manage()
+            ->window()
+            ->maximize();
+
+        $sizeAfter = $this->driver->manage()
+            ->window()
+            ->getSize();
+
+        $this->assertGreaterThanOrEqual($sizeBefore->getWidth(), $sizeAfter->getWidth());
+        $this->assertGreaterThanOrEqual($sizeBefore->getHeight(), $sizeAfter->getHeight());
+    }
+
+    /**
+     * @group exclude-saucelabs
+     */
+    public function testShouldSetSize()
+    {
+        $sizeBefore = $this->driver->manage()
+            ->window()
+            ->getSize();
+        $this->assertNotSame(500, $sizeBefore->getWidth());
+        $this->assertNotSame(666, $sizeBefore->getHeight());
+
+        $this->driver->manage()
+            ->window()
+            ->setSize(new WebDriverDimension(500, 666));
+
+        $sizeAfter = $this->driver->manage()
+            ->window()
+            ->getSize();
+
+        $this->assertSame(500, $sizeAfter->getWidth());
+        $this->assertSame(666, $sizeAfter->getHeight());
+    }
+
+    public function testShouldSetWindowPosition()
+    {
+        $this->driver->manage()
+            ->window()
+            ->setPosition(new WebDriverPoint(33, 66));
+
+        $positionAfter = $this->driver->manage()
+            ->window()
+            ->getPosition();
+
+        $this->assertSame(33, $positionAfter->getX());
+        $this->assertSame(66, $positionAfter->getY());
+    }
+}