aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-05-12 13:09:44 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-05-12 13:09:44 +0200
commitb62c39c36e39d4b2fad1225106407a4083808ca0 (patch)
tree035bd0c49360f900f2c26693c17ff13bab389ac0 /tests
parentbfacf2d6eb37372f2109a76a34b777e0af560a18 (diff)
parentb3eb38ecaf0e3b5d33788bc70c152a9544974b13 (diff)
downloadforums-b62c39c36e39d4b2fad1225106407a4083808ca0.tar
forums-b62c39c36e39d4b2fad1225106407a4083808ca0.tar.gz
forums-b62c39c36e39d4b2fad1225106407a4083808ca0.tar.bz2
forums-b62c39c36e39d4b2fad1225106407a4083808ca0.tar.xz
forums-b62c39c36e39d4b2fad1225106407a4083808ca0.zip
Merge remote-tracking branch 'nickvergessen/ticket/12534' into develop-ascraeus
* nickvergessen/ticket/12534: [ticket/12534] Fix filter for functional tests [ticket/12534] Do not use errorbox for multi steps [ticket/12534] Do not abuse errorbox for en/disable confirmation of extensions
Diffstat (limited to 'tests')
-rw-r--r--tests/functional/extension_acp_test.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 5f02158e20..8a724f2133 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -157,7 +157,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
$this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('div.main thead')->text());
$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor%2Fmoo&sid=' . $this->sid);
- $this->assertContains($this->lang('EXTENSION_ENABLE_CONFIRM', 'phpBB Moo Extension'), $crawler->filter('.errorbox')->text());
+ $this->assertContains($this->lang('EXTENSION_ENABLE_CONFIRM', 'phpBB Moo Extension'), $crawler->filter('#main')->text());
}
public function test_disable_pre()
@@ -169,7 +169,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
$this->assertContainsLang('EXTENSION_ACTIONS', $crawler->filter('div.main thead')->text());
$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=disable_pre&ext_name=vendor2%2Ffoo&sid=' . $this->sid);
- $this->assertContains($this->lang('EXTENSION_DISABLE_CONFIRM', 'phpBB Foo Extension'), $crawler->filter('.errorbox')->text());
+ $this->assertContains($this->lang('EXTENSION_DISABLE_CONFIRM', 'phpBB Foo Extension'), $crawler->filter('#main')->text());
}
public function test_delete_data_pre()