From 9adf059eaa20d992093e76167d13af7b35d083bb Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 6 Nov 2013 16:20:50 +0100 Subject: [PATCH] [ticket/181] Correctly check if Board3 Portal extension is disabled --- tests/functional/portal_redirect_test.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/functional/portal_redirect_test.php b/tests/functional/portal_redirect_test.php index 83e338ba..e2c2cb56 100644 --- a/tests/functional/portal_redirect_test.php +++ b/tests/functional/portal_redirect_test.php @@ -23,17 +23,24 @@ class phpbb_functional_portal_redirect_test extends \board3\portal\tests\testfra protected function enable_board3_portal_ext() { + $enable_portal = false; $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); - $crawler->filter('tr.ext_disabled')->each(function ($node, $i) + $disabled_extensions = $crawler->filter('tr.ext_disabled')->extract(array('_text')); + foreach ($disabled_extensions as $extension) { - if (strpos($node->text(), 'Board3 Portal') !== false) + if (strpos($extension, 'Board3 Portal') !== false) { - $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=board3%2fportal&sid=' . $this->sid); - $form = $crawler->selectButton('Enable')->form(); - $crawler = self::submit($form); - $this->assertContains('The extension was enabled successfully', $crawler->text()); + $enable_portal = true; } - }); + } + + if ($enable_portal) + { + $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=board3%2fportal&sid=' . $this->sid); + $form = $crawler->selectButton('Enable')->form(); + $crawler = self::submit($form); + $this->assertContains('The extension was enabled successfully', $crawler->text()); + } } public function test_redirect()