diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-05-12 18:49:23 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-05-12 18:49:23 -0500 |
| commit | f93a750f28ca4ca502a880d44a45a72c340b6e38 (patch) | |
| tree | afe00006f9eb500db1550b90f5e3576669946240 /tests/functional | |
| parent | a42693e66d2dc6a8d7998afccabe3eedfcf30613 (diff) | |
| parent | bd6cebfe3882d5df810eb1725a10cd64f5473240 (diff) | |
| download | forums-f93a750f28ca4ca502a880d44a45a72c340b6e38.tar forums-f93a750f28ca4ca502a880d44a45a72c340b6e38.tar.gz forums-f93a750f28ca4ca502a880d44a45a72c340b6e38.tar.bz2 forums-f93a750f28ca4ca502a880d44a45a72c340b6e38.tar.xz forums-f93a750f28ca4ca502a880d44a45a72c340b6e38.zip | |
Merge remote-tracking branch 'remotes/Marc/ticket/11465' into develop
# By Marc Alexander (8) and Joas Schilling (3)
# Via Marc Alexander
* remotes/Marc/ticket/11465:
[ticket/11465] Increase count of disabled extensions to 5 in functional test
[ticket/11465] Add disabled ext to allow proper testing of get_module_infos()
[ticket/11465] Add tests for optional arguments of get_module_infos()
[ticket/11465] Add comments explaining the tests
[ticket/11465] Check if class exists before including info file
[ticket/11465] Correctly set the root path for the test
[ticket/11465] The info file does not have _info suffix
[ticket/11465] Add phpBB module to test
[ticket/11465] Move require_once() in unit test to the top of the file
[ticket/11465] Add unit tests for acp_modules::get_module_infos()
[ticket/11465] Use extension finder when adding extensions' acp modules
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/extension_acp_test.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 1879cbd62c..1b406e5042 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -112,7 +112,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case $crawler = $this->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('PURGE', $crawler->filter('.ext_enabled')->eq(0)->text()); |