Use createMock shortcut contained in new PHPUnit

Author: OndraM

tests/unit/WebDriverExpectedConditionTest.php

@@ -34,11 +34,7 @@ class WebDriverExpectedConditionTest extends TestCase
 
     protected function setUp()
     {
-        // TODO: replace with createMock() once PHP 5.5 support is dropped
-        $this->driverMock = $this
-            ->getMockBuilder(RemoteWebDriver::class)
-            ->disableOriginalConstructor()
-            ->getMock();
+        $this->driverMock = $this->createMock(RemoteWebDriver::class);
         $this->wait = new WebDriverWait($this->driverMock, 1, 1);
     }
 
@@ -141,7 +137,7 @@ public function testShouldDetectPresenceOfElementLocatedCondition()
 
     public function testShouldDetectPresenceOfAllElementsLocatedByCondition()
     {
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $this->driverMock->expects($this->at(0))
             ->method('findElements')
@@ -166,7 +162,7 @@ public function testShouldDetectVisibilityOfElementLocatedCondition()
         // Call #3: return Element, but isDisplayed will return false
         // Call #4: return Element, isDisplayed will true and condition will match
 
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
         $element->expects($this->at(0))
             ->method('isDisplayed')
             ->willThrowException(new StaleElementReferenceException(''));
@@ -189,9 +185,9 @@ public function testShouldDetectVisibilityOfElementLocatedCondition()
     public function testShouldDetectVisibilityOfAnyElementLocated()
     {
         $elementList = [
-            $this->createRemoteWebElementMock(),
-            $this->createRemoteWebElementMock(),
-            $this->createRemoteWebElementMock(),
+            $this->createMock(RemoteWebElement::class),
+            $this->createMock(RemoteWebElement::class),
+            $this->createMock(RemoteWebElement::class),
         ];
 
         $elementList[0]->expects($this->once())
@@ -218,7 +214,7 @@ public function testShouldDetectVisibilityOfAnyElementLocated()
 
     public function testShouldDetectInvisibilityOfElementLocatedConditionOnNoSuchElementException()
     {
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $this->driverMock->expects($this->at(0))
             ->method('findElement')
@@ -241,7 +237,7 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionOnNoSuchEle
 
     public function testShouldDetectInvisibilityOfElementLocatedConditionOnStaleElementReferenceException()
     {
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $this->driverMock->expects($this->exactly(2))
             ->method('findElement')
@@ -263,7 +259,7 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionOnStaleElem
 
     public function testShouldDetectInvisibilityOfElementLocatedConditionWhenElementBecamesInvisible()
     {
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $this->driverMock->expects($this->exactly(2))
             ->method('findElement')
@@ -285,7 +281,7 @@ public function testShouldDetectInvisibilityOfElementLocatedConditionWhenElement
 
     public function testShouldDetectVisibilityOfCondition()
     {
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
         $element->expects($this->at(0))
             ->method('isDisplayed')
             ->willReturn(false);
@@ -307,7 +303,7 @@ public function testShouldDetectElementTextContainsCondition()
         // Call #3: return Element, but getText will throw StaleElementReferenceException
         // Call #4: return Element, getText will return new text and condition will match
 
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
         $element->expects($this->at(0))
             ->method('getText')
             ->willReturn('this is an old text');
@@ -335,7 +331,7 @@ public function testShouldDetectElementTextIsCondition()
         // Call #3: return Element, getText will return not-matching text
         // Call #4: return Element, getText will return new text and condition will match
 
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
         $element->expects($this->at(0))
             ->method('getText')
             ->willThrowException(new StaleElementReferenceException(''));
@@ -366,7 +362,7 @@ public function testShouldDetectElementTextMatchesCondition()
         // Call #3: return Element, getText will return not-matching text
         // Call #4: return Element, getText will return matching text
 
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $element->expects($this->at(0))
             ->method('getText')
@@ -398,7 +394,7 @@ public function testShouldDetectElementValueContainsCondition()
         // Call #3: return Element, getAttribute('value') will return not-matching text
         // Call #4: return Element, getAttribute('value') will return matching text
 
-        $element = $this->createRemoteWebElementMock();
+        $element = $this->createMock(RemoteWebElement::class);
 
         $element->expects($this->at(0))
             ->method('getAttribute')
@@ -456,17 +452,4 @@ private function setupDriverToReturnElementAfterAnException($element, $expectedN
                 ->willReturn($element);
         }
     }
-
-    /**
-     * @todo Replace with createMock() once PHP 5.5 support is dropped
-     * @return \PHPUnit_Framework_MockObject_MockObject|RemoteWebElement
-     */
-    private function createRemoteWebElementMock()
-    {
-        return $this->getMockBuilder(RemoteWebElement::class)
-            ->disableOriginalConstructor()
-            ->disableOriginalClone()
-            ->disableArgumentCloning()
-            ->getMock();
-    }
 }