mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-15 05:04:09 +02:00
Code Issues Releases Wiki Activity

[ticket/16549] Move from assert[Not]Contains to assertString[Not]ContainsString

Browse Source 
PHPBB3-16549
This commit is contained in:
rxu
2020-07-13 13:45:12 +07:00
parent ff5bbda0f4
commit d7cb104fc1
49 changed files with 292 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
tests/functional/memberlist_test.php
View File

@@ -22,15 +22,15 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
// logs in as admin
$this->login();
$crawler = self::request('GET', 'memberlist.php?sid=' . $this->sid);
$this->assertContains('memberlist-test-user', $crawler->text());
$this->assertStringContainsString('memberlist-test-user', $crawler->text());
// restrict by first character
$crawler = self::request('GET', 'memberlist.php?first_char=m&sid=' . $this->sid);
$this->assertContains('memberlist-test-user', $crawler->text());
$this->assertStringContainsString('memberlist-test-user', $crawler->text());
// make sure results for wrong character are not returned
$crawler = self::request('GET', 'memberlist.php?first_char=a&sid=' . $this->sid);
$this->assertNotContains('memberlist-test-user', $crawler->text());
$this->assertStringNotContainsString('memberlist-test-user', $crawler->text());
}
public function test_viewprofile()
@@ -38,7 +38,7 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
$this->login();
// XXX hardcoded user id
$crawler = self::request('GET', 'memberlist.php?mode=viewprofile&u=2&sid=' . $this->sid);
$this->assertContains('admin', $crawler->filter('h2')->text());
$this->assertStringContainsString('admin', $crawler->filter('h2')->text());
}
protected function get_memberlist_leaders_table_crawler()
@@ -55,16 +55,16 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
$crawler = $this->get_memberlist_leaders_table_crawler();
// Admin in admin group, but not in moderators
$this->assertContains('admin', $crawler->eq(0)->text());
$this->assertNotContains('admin', $crawler->eq(1)->text());
$this->assertStringContainsString('admin', $crawler->eq(0)->text());
$this->assertStringNotContainsString('admin', $crawler->eq(1)->text());
// memberlist-test-user in neither group
$this->assertNotContains('memberlist-test-user', $crawler->eq(0)->text());
$this->assertNotContains('memberlist-test-user', $crawler->eq(1)->text());
$this->assertStringNotContainsString('memberlist-test-user', $crawler->eq(0)->text());
$this->assertStringNotContainsString('memberlist-test-user', $crawler->eq(1)->text());
// memberlist-test-moderator in neither group
$this->assertNotContains('memberlist-test-moderator', $crawler->eq(0)->text());
$this->assertNotContains('memberlist-test-moderator', $crawler->eq(1)->text());
$this->assertStringNotContainsString('memberlist-test-moderator', $crawler->eq(0)->text());
$this->assertStringNotContainsString('memberlist-test-moderator', $crawler->eq(1)->text());
}
public function test_leaders_remove_users()
@@ -74,14 +74,14 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
// Remove admin from admins, but is now in moderators
$this->remove_user_group('ADMINISTRATORS', array('admin'));
$crawler = $this->get_memberlist_leaders_table_crawler();
$this->assertNotContains('admin', $crawler->eq(0)->text());
$this->assertContains('admin', $crawler->eq(1)->text());
$this->assertStringNotContainsString('admin', $crawler->eq(0)->text());
$this->assertStringContainsString('admin', $crawler->eq(1)->text());
// Remove admin from moderators, should not be visible anymore
$this->remove_user_group('GLOBAL_MODERATORS', array('admin'));
$crawler = $this->get_memberlist_leaders_table_crawler();
$this->assertNotContains('admin', $crawler->eq(0)->text());
$this->assertNotContains('admin', $crawler->eq(1)->text());
$this->assertStringNotContainsString('admin', $crawler->eq(0)->text());
$this->assertStringNotContainsString('admin', $crawler->eq(1)->text());
}
public function test_leaders_add_users()
@@ -91,20 +91,20 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
// Add memberlist-test-moderator to moderators
$this->add_user_group('GLOBAL_MODERATORS', array('memberlist-test-moderator'));
$crawler = $this->get_memberlist_leaders_table_crawler();
$this->assertNotContains('memberlist-test-moderator', $crawler->eq(0)->text());
$this->assertContains('memberlist-test-moderator', $crawler->eq(1)->text());
$this->assertStringNotContainsString('memberlist-test-moderator', $crawler->eq(0)->text());
$this->assertStringContainsString('memberlist-test-moderator', $crawler->eq(1)->text());
// Add admin to moderators, should be visible as moderator
$this->add_user_group('GLOBAL_MODERATORS', array('admin'), true);
$crawler = $this->get_memberlist_leaders_table_crawler();
$this->assertNotContains('admin', $crawler->eq(0)->text());
$this->assertContains('admin', $crawler->eq(1)->text());
$this->assertStringNotContainsString('admin', $crawler->eq(0)->text());
$this->assertStringContainsString('admin', $crawler->eq(1)->text());
// Add admin to admins as leader, should be visible as admin, not moderator
$this->add_user_group('ADMINISTRATORS', array('admin'), true, true);
$crawler = $this->get_memberlist_leaders_table_crawler();
$this->assertContains('admin', $crawler->eq(0)->text());
$this->assertNotContains('admin', $crawler->eq(1)->text());
$this->assertStringContainsString('admin', $crawler->eq(0)->text());
$this->assertStringNotContainsString('admin', $crawler->eq(1)->text());
}
public function test_group_rank()
@@ -130,7 +130,7 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
$this->assertContainsLang('RANK_UPDATED', $crawler->filter('.successbox')->text());
$crawler = self::request('GET', 'memberlist.php?mode=group&g=2');
$this->assertContains('memberlist-test-user', $crawler->text());
$this->assertStringContainsString('memberlist-test-user', $crawler->text());
unlink(__DIR__ . '/../../phpBB/images/ranks/valid.jpg');
}