aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-08-07 13:00:21 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-08-07 13:00:21 +0200
commit3722aac495014f190d2c8f14d7b3ee0b1b712186 (patch)
tree86fa40fccf11c7b9b6126187b6dcf2f98c0f4058 /tests/functional
parent28224bad70fe5c2d912d96f2f35e4e5d99301c71 (diff)
parentf474e33a430176fd7ef809141b258eec77993e03 (diff)
downloadforums-3722aac495014f190d2c8f14d7b3ee0b1b712186.tar
forums-3722aac495014f190d2c8f14d7b3ee0b1b712186.tar.gz
forums-3722aac495014f190d2c8f14d7b3ee0b1b712186.tar.bz2
forums-3722aac495014f190d2c8f14d7b3ee0b1b712186.tar.xz
forums-3722aac495014f190d2c8f14d7b3ee0b1b712186.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12847] Allow the extensions to say if they can be enabled
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/extension_acp_test.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index b6dd5db708..6490c1ead3 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -84,7 +84,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid);
$this->assertCount(1, $crawler->filter('.ext_enabled'));
- $this->assertCount(4, $crawler->filter('.ext_disabled'));
+ $this->assertCount(5, $crawler->filter('.ext_disabled'));
$this->assertContains('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text());
$this->assertContainsLang('EXTENSION_DISABLE', $crawler->filter('.ext_enabled')->eq(0)->text());
@@ -162,6 +162,10 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
$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('#main')->text());
+
+ // Correctly submit the enable form
+ $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=enable_pre&ext_name=vendor3%2Ffoo&sid=' . $this->sid);
+ $this->assertContainsLang('EXTENSION_NOT_ENABLEABLE', $crawler->filter('.errorbox')->text());
}
public function test_disable_pre()