diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-05-12 13:10:23 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-05-12 13:10:23 +0200 |
| commit | ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5 (patch) | |
| tree | 035bd0c49360f900f2c26693c17ff13bab389ac0 /tests | |
| parent | 4f8b33cc14fb8337202794813c0ca29dc8262677 (diff) | |
| parent | b62c39c36e39d4b2fad1225106407a4083808ca0 (diff) | |
| download | forums-ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5.tar forums-ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5.tar.gz forums-ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5.tar.bz2 forums-ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5.tar.xz forums-ddced2ac4d7f17b9b2277f5e7bc420ea6d8ed9c5.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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.php | 4 |
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() |