Merge branch 'master' of github.com:Codeception/Verify

Author: DavertMik

.travis.yml

@@ -3,4 +3,13 @@ language: php
 php:
   - 5.3
   - 5.4
-  - 5.5
+  - 5.5
+  - 5.6
+
+sudo: false
+
+before_install:
+  - composer self-update
+  - composer install --prefer-source
+
+script: vendor/bin/phpunit

composer.lock

@@ -1,7 +1,7 @@
 <?php
 namespace Codeception;
 
-use \PHPUnit_Framework_Assert as a;
+use PHPUnit_Framework_Assert as a;
 
 class Verify {
 
@@ -140,7 +140,7 @@ public function notInternalType($type)
 
     public function hasAttribute($attribute)
     {
-        if ( is_string($attribute)) {
+        if (is_string($attribute)) {
             a::assertClassHasAttribute($attribute, $this->actual, $this->description);
         } else {
             a::assertObjectHasAttribute($attribute, $this->actual, $this->description);
@@ -149,7 +149,7 @@ public function hasAttribute($attribute)
 
     public function notHasAttribute($attribute)
     {
-        if ( is_string($attribute)) {
+        if (is_string($attribute)) {
             a::assertClassNotHasAttribute($attribute, $this->actual, $this->description);
         } else {
             a::assertObjectNotHasAttribute($attribute, $this->actual, $this->description);
@@ -198,23 +198,23 @@ public function equalXMLStructure($xml, $checkAttributes = FALSE)
 
     public function exists()
     {
-        if ( ! $this->isFileExpectation ) {
+        if (!$this->isFileExpectation ) {
             throw new \Exception('exists() expectation should be called with expect_file()');
         }
         a::assertFileExists($this->actual, $this->description);
     }
 
     public function notExists()
     {
-        if ( ! $this->isFileExpectation ) {
+        if (!$this->isFileExpectation ) {
             throw new \Exception('notExists() expectation should be called with expect_file()');
         }
         a::assertFileNotExists($this->actual, $this->description);
     }
 
     public function equalsJsonFile($file)
     {
-        if ( ! $this->isFileExpectation ) {
+        if (!$this->isFileExpectation ) {
             a::assertJsonStringEqualsJsonFile($file, $this->actual, $this->description);
         } else {
             a::assertJsonFileEqualsJsonFile($file, $this->actual, $this->description);
@@ -261,21 +261,6 @@ public function notSame($expected)
         a::assertNotSame($expected, $this->actual, $this->description);
     }
 
-    public function selectCount($selector, $count)
-    {
-        a::assertSelectCount($selector, $count, $this->actual, $this->description);
-    }
-
-    public function selectEquals($selector, $content,  $count)
-    {
-        a::assertSelectEquals($selector, $content,  $count, $this->actual, $this->description);
-    }
-
-    public function selectRegExp($selector, $pattern, $count)
-    {
-        a::assertSelectRegExp($selector, $pattern,  $count, $this->actual, $this->description);
-    }
-
     public function endsWith($suffix)
     {
         a::assertStringEndsWith($suffix, $this->actual, $this->description);
@@ -306,14 +291,9 @@ public function notStartsWith($prefix)
         a::assertStringStartsNotWith($prefix, $this->actual, $this->description);
     }
 
-    public function tag($matcher)
-    {
-        a::assertTag($matcher, $this->actual, $this->description);
-    }
-
     public function equalsXmlFile($file)
     {
-        if ( ! $this->isFileExpectation ) {
+        if (!$this->isFileExpectation ) {
             a::assertXmlStringEqualsXmlFile($file, $this->actual, $this->description);
         } else {
             a::assertXmlFileEqualsXmlFile($file, $this->actual, $this->description);
@@ -324,6 +304,4 @@ public function equalsXmlString($xmlString)
     {
         a::assertXmlStringEqualsXmlString($xmlString, $this->actual, $this->description);
     }
-
 }
-

src/Codeception/Verify.php

@@ -1,5 +1,7 @@
 <?php
+
 include __DIR__.'/../src/Codeception/function.php';
+include __DIR__.'/../vendor/autoload.php';
 
 class VerifyTest extends PHPUnit_Framework_TestCase {
 
@@ -173,24 +175,6 @@ public function testSame()
         expect(1)->notSame(true);
     }
 
-    public function testSelectCount()
-    {
-        expect($this->xml)->selectCount('foo bar', true);
-        expect($this->xml)->selectCount('foo bar', 2);
-    }
-
-    public function testSelectEquals()
-    {
-        expect($this->xml)->selectEquals('foo bar', 'Baz', true);
-        expect($this->xml)->selectEquals('foo bar', 'Baz', 2);
-    }
-
-    public function testSelectRegExp()
-    {
-        expect($this->xml)->selectRegExp('foo bar', '/Ba.*/', true);
-        expect($this->xml)->selectRegExp('foo bar', '/Ba.*/', 2);
-    }
-
     public function testEndsWith()
     {
         expect('A completely not funny string')->endsWith('ny string');
@@ -209,15 +193,6 @@ public function testStartsWith()
         expect('A completely not funny string')->notStartsWith('string');
     }
 
-    public function testTag()
-    {
-        $matcher = array(
-            'tag' => 'bar',
-            'parent' => array('tag' => 'foo')
-        );
-        expect($this->xml)->tag($matcher);
-    }
-
     public function testEqualsXmlFile()
     {
         expect_file(__DIR__ . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . 'xml-test-file.xml')
@@ -231,12 +206,11 @@ public function testEqualsXmlString()
         expect('<foo><bar>Baz</bar><bar>Baz</bar></foo>')
             ->equalsXmlString('<foo><bar>Baz</bar><bar>Baz</bar></foo>');
     }
-
 }
 
 
 
 class FakeClassForTesting
 {
     static $staticProperty;
-}
+}