Use only PHPUnit 5.4+, drop deprecated calls

Author: OndraM

composer.json

@@ -11,13 +11,13 @@
     "source": "https://github.com/facebook/php-webdriver"
   },
   "require": {
-    "php": "^5.5 || ~7.0",
+    "php": "^5.6 || ~7.0",
     "symfony/process": "^2.8 || ^3.1",
     "ext-curl": "*",
     "ext-zip": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "4.6.* || ~5.0",
+    "phpunit/phpunit": "^5.4",
     "friendsofphp/php-cs-fixer": "^2.0",
     "squizlabs/php_codesniffer": "^2.6",
     "php-mock/php-mock-phpunit": "^1.1",

tests/functional/RemoteWebDriverFindElementTest.php

@@ -28,7 +28,7 @@ public function testShouldThrowExceptionOfElementCannotBeFound()
     {
         $this->driver->get($this->getTestPageUrl('index.html'));
 
-        $this->setExpectedException(NoSuchElementException::class);
+        $this->expectException(NoSuchElementException::class);
         $this->driver->findElement(WebDriverBy::id('not_existing'));
     }
 

tests/functional/WebDriverAlertTest.php

@@ -48,7 +48,7 @@ public function testShouldAcceptAlert()
 
         $this->driver->switchTo()->alert()->accept();
 
-        $this->setExpectedException(NoAlertOpenException::class);
+        $this->expectException(NoAlertOpenException::class);
         $this->driver->switchTo()->alert()->accept();
     }
 

tests/functional/WebDriverSelectTest.php

@@ -51,10 +51,8 @@ public function testShouldThrowExceptionWhenNotInstantiatedOnSelectElement()
     {
         $notSelectElement = $this->driver->findElement(WebDriverBy::cssSelector('textarea'));
 
-        $this->setExpectedException(
-            UnexpectedTagNameException::class,
-            'Element should have been "select" but was "textarea"'
-        );
+        $this->expectException(UnexpectedTagNameException::class);
+        $this->expectExceptionMessage('Element should have been "select" but was "textarea"');
         new WebDriverSelect($notSelectElement);
     }
 
@@ -109,10 +107,8 @@ public function testShouldThrowExceptionIfThereIsNoFirstSelectedOptionOfMultiple
     {
         $select = $this->getWebDriverSelectForMultipleSelect();
 
-        $this->setExpectedException(
-            NoSuchElementException::class,
-            'No options are selected'
-        );
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('No options are selected');
         $select->getFirstSelectedOption();
     }
 
@@ -155,10 +151,8 @@ public function testShouldThrowExceptionIfThereIsNoOptionIndexToSelect()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            NoSuchElementException::class,
-            'Cannot locate option with index: 1337'
-        );
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate option with index: 1337');
         $select->selectByIndex(1337);
     }
 
@@ -201,10 +195,8 @@ public function testShouldThrowExceptionIfThereIsNoOptionValueToSelect()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            NoSuchElementException::class,
-            'Cannot locate option with value: 1337'
-        );
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate option with value: 1337');
         $select->selectByValue(1337);
     }
 
@@ -247,10 +239,8 @@ public function testShouldThrowExceptionIfThereIsNoOptionVisibleTextToSelect()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            NoSuchElementException::class,
-            'Cannot locate option with text: second'
-        );
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate option with text: second');
         $select->selectByVisibleText('second'); // the option is "This is second option"
     }
 
@@ -296,21 +286,17 @@ public function testShouldThrowExceptionIfThereIsNoOptionVisiblePartialTextToSel
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            NoSuchElementException::class,
-            'Cannot locate option with text: Not existing option'
-        );
+        $this->expectException(NoSuchElementException::class);
+        $this->expectExceptionMessage('Cannot locate option with text: Not existing option');
         $select->selectByVisiblePartialText('Not existing option');
     }
 
     public function testShouldThrowExceptionWhenDeselectingOnSimpleSelect()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            UnsupportedOperationException::class,
-            'You may only deselect all options of a multi-select'
-        );
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You may only deselect all options of a multi-select');
         $select->deselectAll();
     }
 
@@ -353,10 +339,8 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByIndex()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            UnsupportedOperationException::class,
-            'You may only deselect options of a multi-select'
-        );
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You may only deselect options of a multi-select');
         $select->deselectByIndex(0);
     }
 
@@ -381,10 +365,8 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByValue()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            UnsupportedOperationException::class,
-            'You may only deselect options of a multi-select'
-        );
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You may only deselect options of a multi-select');
         $select->deselectByValue('first');
     }
 
@@ -411,10 +393,8 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisibleText()
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            UnsupportedOperationException::class,
-            'You may only deselect options of a multi-select'
-        );
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You may only deselect options of a multi-select');
         $select->deselectByVisibleText('First');
     }
 
@@ -447,10 +427,8 @@ public function testShouldThrowExceptionIfDeselectingSimpleSelectByVisiblePartia
     {
         $select = $this->getWebDriverSelectForSimpleSelect();
 
-        $this->setExpectedException(
-            UnsupportedOperationException::class,
-            'You may only deselect options of a multi-select'
-        );
+        $this->expectException(UnsupportedOperationException::class);
+        $this->expectExceptionMessage('You may only deselect options of a multi-select');
         $select->deselectByVisiblePartialText('First');
     }
 

tests/functional/WebDriverTimeoutsTest.php

@@ -30,7 +30,7 @@ public function testShouldFailGettingDelayedElementWithoutWait()
     {
         $this->driver->get($this->getTestPageUrl('delayed_element.html'));
 
-        $this->setExpectedException(NoSuchElementException::class);
+        $this->expectException(NoSuchElementException::class);
         $this->driver->findElement(WebDriverBy::id('delayed'));
     }
 

tests/unit/CookieTest.php

@@ -146,7 +146,8 @@ public function testShouldBeCreatableFromAnArrayWithAllValues()
     public function testShouldValidateCookie($name, $value, $domain, $expectedMessage)
     {
         if ($expectedMessage) {
-            $this->setExpectedException(\InvalidArgumentException::class, $expectedMessage);
+            $this->expectException(\InvalidArgumentException::class);
+            $this->expectExceptionMessage($expectedMessage);
         }
 
         $cookie = new Cookie($name, $value);

tests/unit/WebDriverOptionsTest.php

@@ -88,10 +88,8 @@ public function testShouldNotAllowToCreateCookieFromDifferentObjectThanCookie()
 
         $options = new WebDriverOptions($this->executor);
 
-        $this->setExpectedException(
-            \InvalidArgumentException::class,
-            'Cookie must be set from instance of Cookie class or from array.'
-        );
+        $this->expectException(\InvalidArgumentException::class);
+        $this->expectExceptionMessage('Cookie must be set from instance of Cookie class or from array.');
         $options->addCookie($notCookie);
     }