Skip to content

Commit f9b54b4

Browse files
dadishdadish
committed
Use functional assertions instead of instance method.
1 parent 763cedf commit f9b54b4

File tree

164 files changed

+255
-313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+255
-313
lines changed

‎test/Assert/Functions.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?php
22

3-
namespace ProcessWire\GraphQL\Test\Assert;
4-
53
use ProcessWire\GraphQL\Test\Constraint\TypePathExists;
64
use PHPUnit\Framework\Assert;
75

‎test/Field/Auth/LoginFieldTest.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function testLoginCredentials()
1717
$config = Utils::config();
1818
Utils::session()->login('admin', $config->testUsers['admin']);
1919
$user = Utils::user();
20-
$this->assertEquals('admin', $user->name, 'Unable to login via $session->login()');
20+
assertEquals('admin', $user->name, 'Unable to login via $session->login()');
2121
}
2222

2323
public function testLoginSuccess()
@@ -31,7 +31,8 @@ public function testLoginSuccess()
3131
}
3232
}";
3333
$res = self::execute($query);
34-
$this->assertEquals(200, $res->data->login->statusCode, 'Unable to login via GraphQL');
34+
assertEquals(200, $res->data->login->statusCode, 'Unable to login via GraphQL');
35+
assertFalse(isset($res->errors), 'There are errors.');
3536
}
3637

3738
public function testLoginFailure()
@@ -44,8 +45,9 @@ public function testLoginFailure()
4445
message
4546
}
4647
}";
47-
$res = $this->execute($query);
48-
$this->assertEquals(401, $res->data->login->statusCode, 'Unable to login via GraphQL');
48+
$res = self::execute($query);
49+
assertEquals(401, $res->data->login->statusCode, 'Unable to login via GraphQL');
50+
assertFalse(isset($res->errors), 'There are errors.');
4951
}
5052

5153
}

‎test/Field/Auth/LogoutFieldTest.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ public function testLogout()
1717
$config = Utils::config();
1818
Utils::session()->login('admin', $config->testUsers['admin']);
1919
$user = Utils::user();
20-
$this->assertTrue($user->isSuperuser());
20+
assertTrue($user->isSuperuser());
2121

2222
$query = '{
2323
logout {
2424
statusCode
2525
}
2626
}';
2727
$res = self::execute($query);
28-
$this->assertEquals(200, $res->data->logout->statusCode, 'Unable to logout via GraphQL');
28+
assertEquals(200, $res->data->logout->statusCode, 'Unable to logout via GraphQL');
2929
}
3030

3131
public function testLogoutFailure()
@@ -36,7 +36,7 @@ public function testLogoutFailure()
3636
}
3737
}';
3838
$res = self::execute($query);
39-
$this->assertObjectHasAttribute('errors', $res, 'Unable to logout via GraphQL');
39+
assertObjectHasAttribute('errors', $res, 'Unable to logout via GraphQL');
4040
}
4141

4242
}

‎test/Field/Debug/DbQueryCountFieldTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public function testUnavailable()
2727
$query = '{
2828
dbQuery
2929
}';
30-
$res = $this->execute($query);
31-
$this->assertObjectHasAttribute('errors', $res, 'When debug turned off, `dbQueryCount` field must be unavailable.');
30+
$res = self::execute($query);
31+
assertObjectHasAttribute('errors', $res, 'When debug turned off, `dbQueryCount` field must be unavailable.');
3232
}
3333

3434
public function testValue()
@@ -37,8 +37,8 @@ public function testValue()
3737
$query = '{
3838
dbQuery
3939
}';
40-
$res = $this->execute($query);
41-
$this->assertEquals(count(\ProcessWire\Database::getQueryLog()), count($res->data->dbQuery), '`dbQueryCount` must return the number of db query logs');
40+
$res = self::execute($query);
41+
assertEquals(count(\ProcessWire\Database::getQueryLog()), count($res->data->dbQuery), '`dbQueryCount` must return the number of db query logs');
4242
}
4343

4444
}

‎test/Field/Mutation/CreatePage/CaseFiveTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ public function testValue()
3737
];
3838
$res = self::execute($query, $variables);
3939
$newBuildingSky = Utils::pages()->get("name=not-created-basic-page");
40-
$this->assertEquals(1, count($res->errors), 'createBasicPage does not resolve if parent page template is not legal.');
41-
$this->assertInstanceOf(NullPage::class, $newBuildingSky, 'createBasicPage does not create a page.');
40+
assertEquals(1, count($res->errors), 'createBasicPage does not resolve if parent page template is not legal.');
41+
assertInstanceOf(NullPage::class, $newBuildingSky, 'createBasicPage does not create a page.');
4242
}
4343

4444
}

‎test/Field/Mutation/CreatePage/CaseFourTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function testValue()
3434
]
3535
];
3636
$res = self::execute($query, $variables);
37-
$this->assertStringContainsString(
37+
assertStringContainsString(
3838
'Field value.title of required type PageTitle!',
3939
$res->errors[0]->message
4040
);

‎test/Field/Mutation/CreatePage/CaseOneTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public function testValue()
3737
];
3838
$res = self::execute($query, $variables);
3939
$newBuildingSky = Utils::pages()->get("name=not-created-building-sky");
40-
$this->assertEquals(2, count($res->errors), 'createSkyscraper is not available if required `title` field is not legal.');
41-
$this->assertStringContainsString('SkyscraperCreateInput', $res->errors[0]->message);
42-
$this->assertStringContainsString('createSkyscraper', $res->errors[1]->message);
43-
$this->assertInstanceOf(NullPage::class, $newBuildingSky, 'createSkyscraper does not create a page.');
40+
assertEquals(2, count($res->errors), 'createSkyscraper is not available if required `title` field is not legal.');
41+
assertStringContainsString('SkyscraperCreateInput', $res->errors[0]->message);
42+
assertStringContainsString('createSkyscraper', $res->errors[1]->message);
43+
assertInstanceOf(NullPage::class, $newBuildingSky, 'createSkyscraper does not create a page.');
4444
}
4545

4646
}

‎test/Field/Mutation/CreatePage/CaseThreeTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function testValue()
3636
];
3737
$res = self::execute($query, $variables);
3838
$newBuildingSky = Utils::pages()->get("name=created-building-sky");
39-
$this->assertEquals($variables['page']['name'], $res->data->skyscraper->name, 'createSkyscraper returns correct values in response.');
40-
$this->assertEquals($newBuildingSky->id, $res->data->skyscraper->id, 'createSkyscraper creates skyscraper page if everything is ok.');
39+
assertEquals($variables['page']['name'], $res->data->skyscraper->name, 'createSkyscraper returns correct values in response.');
40+
assertEquals($newBuildingSky->id, $res->data->skyscraper->id, 'createSkyscraper creates skyscraper page if everything is ok.');
4141
}
4242
}

‎test/Field/Mutation/CreatePage/CaseTwoTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public function testValue()
3636
];
3737
$res = self::execute($query, $variables);
3838
$newBuildingSky = Utils::pages()->get("name=not-created-building-sky");
39-
$this->assertEquals(2, count($res->errors), 'createSkyscraper does not exist if allowed parent page is not legal.');
40-
$this->assertStringContainsString('SkyscraperCreateInput', $res->errors[0]->message);
41-
$this->assertStringContainsString('createSkyscraper', $res->errors[1]->message);
42-
$this->assertInstanceOf(NullPage::class, $newBuildingSky, 'createSkyscraper does not create a page.');
39+
assertEquals(2, count($res->errors), 'createSkyscraper does not exist if allowed parent page is not legal.');
40+
assertStringContainsString('SkyscraperCreateInput', $res->errors[0]->message);
41+
assertStringContainsString('createSkyscraper', $res->errors[1]->message);
42+
assertInstanceOf(NullPage::class, $newBuildingSky, 'createSkyscraper does not create a page.');
4343
}
4444

4545
}

‎test/Field/Mutation/UpdatePage/CaseOneTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public function testValue()
3434
],
3535
];
3636
$res = self::execute($query, $variables);
37-
$this->assertEquals(2, count($res->errors), 'updateSkyscraper is not available if `skyscraper` template is not legal.');
38-
$this->assertStringContainsString('SkyscraperUpdateInput', $res->errors[0]->message);
39-
$this->assertStringContainsString('updateSkyscraper', $res->errors[1]->message);
40-
$this->assertTrue($skyscraper->title !== $variables['page']['title'], 'updateSkyscraper does not update the `title`.');
37+
assertEquals(2, count($res->errors), 'updateSkyscraper is not available if `skyscraper` template is not legal.');
38+
assertStringContainsString('SkyscraperUpdateInput', $res->errors[0]->message);
39+
assertStringContainsString('updateSkyscraper', $res->errors[1]->message);
40+
assertTrue($skyscraper->title !== $variables['page']['title'], 'updateSkyscraper does not update the `title`.');
4141
}
4242

4343
}

0 commit comments

Comments
 (0)