Merge pull request #21 from buu-lam/master

fixbug expect($object)->(not)hasAttribute($attributeName)
Codeception · Jul 13, 2016 · dc19c87 · dc19c87
2 parents 76e3090 + 26c309d
commit dc19c87
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Codeception/Verify.php b/src/Codeception/Verify.php
@@ -140,7 +140,7 @@ public function notInternalType($type)
 
     public function hasAttribute($attribute)
     {
-        if (is_string($attribute)) {
+        if (is_string($this->actual)) {
             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($this->actual)) {
             a::assertClassNotHasAttribute($attribute, $this->actual, $this->description);
         } else {
             a::assertObjectNotHasAttribute($attribute, $this->actual, $this->description);

diff --git a/tests/VerifyTest.php b/tests/VerifyTest.php
@@ -100,6 +100,10 @@ public function testHasAttribute()
     {
         expect('Exception')->hasAttribute('message');
         expect('Exception')->notHasAttribute('fakeproperty');
+
+        $testObject = (object) array('existingAttribute' => true);
+        expect($testObject)->hasAttribute('existingAttribute');
+        expect($testObject)->notHasAttribute('fakeproperty');
     }
 
     public function testHasStaticAttribute()