Add changes for Codeception 2.2

Author: janhenkgerritsen

composer.json

@@ -13,7 +13,7 @@
   "require-dev": {
     "phpunit/phpunit": "~4.0",
     "phpspec/phpspec": "~2.1",
-    "codeception/codeception": "2.1.x-dev",
+    "codeception/codeception": "dev-master",
     "symfony/dom-crawler": "~3.0",
     "symfony/css-selector": "~3.0"
   },

tests/functional/ModelFactoryCest.php

@@ -4,42 +4,22 @@
 
 class ModelFactoryCest
 {
-    public function testHaveModel(FunctionalTester $I)
+    public function testHave(FunctionalTester $I)
     {
-        $user = $I->haveModel(User::class, ['email' => 'johndoe@example.com']);
+        $user = $I->have(User::class, ['email' => 'johndoe@example.com']);
 
         $I->assertEquals('johndoe@example.com', $user->email);
         $I->seeRecord('users', ['email' => 'johndoe@example.com']);
     }
 
-    public function testHaveModelWithName(FunctionalTester $I)
+    public function testHaveWithName(FunctionalTester $I)
     {
-        $I->haveModel(User::class, [], 'admin');
+        $I->have(User::class, [], 'admin');
     }
 
-    public function testHaveModelWithCount(FunctionalTester $I)
+    public function testHaveMultiple(FunctionalTester $I)
     {
-        $users = $I->haveModel(User::class, [], 'admin', 3);
-
-        $I->assertEquals(3, count($users));
-    }
-
-    public function testMakeModel(FunctionalTester $I)
-    {
-        $user = $I->makeModel(User::class, ['email' => 'johndoe@example.com']);
-
-        $I->assertEquals('johndoe@example.com', $user->email);
-        $I->dontSeeRecord('users', ['email' => 'johndoe@example.com']);
-    }
-
-    public function testMakeModelWithName(FunctionalTester $I)
-    {
-        $I->makeModel(User::class, [], 'admin');
-    }
-
-    public function testMakeModelWithCount(FunctionalTester $I)
-    {
-        $users = $I->makeModel(User::class, [], 'admin', 3);
+        $users = $I->haveMultiple(User::class, 3);
 
         $I->assertEquals(3, count($users));
     }

tests/functional/RecordCest.php

@@ -0,0 +1,45 @@
+<?php
+
+class RecordCest
+{
+    protected $userAttributes = [
+        'email' => 'johndoe@example.com',
+        'password' => 'password',
+        'created_at' => '',
+        'updated_at' => ''
+    ];
+
+    public function testHaveRecordWithTableName(FunctionalTester $I)
+    {
+        $id = $I->haveRecord('users', $this->userAttributes);
+
+        $I->seeRecord('users', ['id' => $id, 'email' => 'johndoe@example.com']);
+        $I->dontSeeRecord('users', ['id' => $id, 'email' => 'janedoe@example.com']);
+    }
+
+    public function testHaveRecordWithModel(FunctionalTester $I)
+    {
+        $user = $I->haveRecord('App\User', $this->userAttributes);
+
+        $I->seeRecord('App\User', ['id' => $user->id, 'email' => 'johndoe@example.com']);
+        $I->dontSeeRecord('App\User', ['id' => $user->id, 'email' => 'janedoe@example.com']);
+    }
+
+    public function testGrabRecordWithTableName(FunctionalTester $I)
+    {
+        $I->haveRecord('App\User', $this->userAttributes);
+
+        $record = $I->grabRecord('users', ['email' => 'johndoe@example.com']);
+
+        $I->assertTrue(is_array($record));
+    }
+
+    public function testGrabRecordWithModel(FunctionalTester $I)
+    {
+        $I->haveRecord('App\User', $this->userAttributes);
+
+        $model = $I->grabRecord('App\User', ['email' => 'johndoe@example.com']);
+
+        $I->assertTrue($model instanceof App\User);
+    }
+}