Merge pull request #42 from shouze/atoum/adopt2.0

Adopt atoum 2.0.
ubirak · Dec 15, 2015 · 14a924b · 14a924b
2 parents 6be651d + 7795b06
commit 14a924b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,12 @@ php:
     - 5.4
     - 5.5
     - 5.6
+    - 7.0
 
 before_script:
-    - composer self-update || true
-    - composer install --dev --prefer-dist
+    - git clone --branch trusty --depth=1 https://github.com/rezzza/travis-ci.git ~/.rezzza.travis-ci
+    - ~/.rezzza.travis-ci/php/bootstrap.sh
+    - composer install --prefer-dist --optimize-autoloader
     - php -S 127.0.0.1:8888 -t "$TRAVIS_BUILD_DIR/www" > /dev/null &
 
 script:

diff --git a/composer.json b/composer.json
@@ -17,9 +17,9 @@
     "require": {
         "php": ">=5.3.2",
         "behat/behat": "~2.5.0",
-        "atoum/atoum": "~1.0",
+        "atoum/atoum": "~2.0",
         "guzzle/http": "~3.9",
-        "symfony/property-access": "~2.4",
+        "symfony/property-access": "~2.4|~3.0",
         "justinrainbow/json-schema": "~1.3"
     },
     "require-dev": {
@@ -31,7 +31,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-master": "1.2.x-dev"
         }
     }
 }
diff --git a/src/Json/JsonContext.php b/src/Json/JsonContext.php
@@ -73,7 +73,7 @@ public function theJsonNodeShouldContain($jsonNode, $expectedValue)
     {
         $realValue = $this->evaluateJsonNodeValue($jsonNode);
 
-        $this->asserter->string((string) $realValue)->contains($expectedValue);
+        $this->asserter->phpString((string) $realValue)->contains($expectedValue);
     }
 
     /**
@@ -85,7 +85,7 @@ public function theJsonNodeShouldNotContain($jsonNode, $unexpectedValue)
     {
         $realValue = $this->evaluateJsonNodeValue($jsonNode);
 
-        $this->asserter->string((string) $realValue)->notContains($unexpectedValue);
+        $this->asserter->phpString((string) $realValue)->notContains($unexpectedValue);
     }
 
     /**

diff --git a/src/Xml/XmlContext.php b/src/Xml/XmlContext.php
@@ -232,7 +232,7 @@ public function theXmlElementShouldContain($element, $text)
         $elements = $this->theXmlElementShouldExist($element);
 
         $this->asserter
-            ->string($elements->item(0)->nodeValue)
+            ->phpString($elements->item(0)->nodeValue)
             ->contains($text);
     }
 
@@ -246,7 +246,7 @@ public function theXmlElementShouldNotContain($element, $text)
         $elements = $this->theXmlElementShouldExist($element);
 
         $this->asserter
-            ->string($elements->item(0)->nodeValue)
+            ->phpString($elements->item(0)->nodeValue)
             ->notContains($text);
     }
 

diff --git a/tests/Units/Json/Json.php b/tests/Units/Json/Json.php
@@ -75,7 +75,7 @@ public function test_should_read_valid_expression()
             ->when(
                 $result = $sut->read('foo', $accessor)
             )
-                ->string($result)
+                ->phpString($result)
                     ->isEqualTo('bar')
         ;
     }

diff --git a/tests/Units/RestApiContext.php b/tests/Units/RestApiContext.php
@@ -213,7 +213,7 @@ public function test_create_request_with_slashes_to_clean($baseUrl, $stepUrl, $e
         // Then
         $request = $restApiContext->getRequest();
 
-        $this->string($request->getUrl())->isEqualTo($expectedUrl);
+        $this->phpString($request->getUrl())->isEqualTo($expectedUrl);
     }
 
     public function urlWithSlashesProvider()