aboutsummaryrefslogtreecommitdiffstats
path: root/tests/extension
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2014-09-02 20:54:51 +0200
committerMarc Alexander <admin@m-a-styles.de>2014-09-02 20:54:51 +0200
commit6777d462ffb5a45428fc1597e18663224c802af6 (patch)
treec3b255decaf1ba95d150c91b65ccc6d54fab765e /tests/extension
parentd86817ef07de8d6b581dd50c5a18796ceea7f471 (diff)
parent9d44c5d940a03599ad7a31bd9aafca7835d00214 (diff)
downloadforums-6777d462ffb5a45428fc1597e18663224c802af6.tar
forums-6777d462ffb5a45428fc1597e18663224c802af6.tar.gz
forums-6777d462ffb5a45428fc1597e18663224c802af6.tar.bz2
forums-6777d462ffb5a45428fc1597e18663224c802af6.tar.xz
forums-6777d462ffb5a45428fc1597e18663224c802af6.zip
Merge pull request #2908 from Pico/t/12661
[ticket/12661] Load extensions templates from "all" folder by render()
Diffstat (limited to 'tests/extension')
-rw-r--r--tests/extension/ext/vendor4/bar/composer.json23
-rw-r--r--tests/extension/ext/vendor4/bar/styles/all/template/foobar_body.html1
-rw-r--r--tests/extension/manager_test.php2
3 files changed, 25 insertions, 1 deletions
diff --git a/tests/extension/ext/vendor4/bar/composer.json b/tests/extension/ext/vendor4/bar/composer.json
new file mode 100644
index 0000000000..1a2fddc3f4
--- /dev/null
+++ b/tests/extension/ext/vendor4/bar/composer.json
@@ -0,0 +1,23 @@
+{
+ "name": "vendor4/bar",
+ "type": "phpbb-extension",
+ "description": "An example/sample extension to be used for testing purposes in phpBB Development.",
+ "version": "1.0.0",
+ "time": "2012-02-15 01:01:01",
+ "license": "GPL-2.0",
+ "authors": [{
+ "name": "John Smith",
+ "email": "email@phpbb.com",
+ "homepage": "http://phpbb.com",
+ "role": "N/A"
+ }],
+ "require": {
+ "php": ">=5.3"
+ },
+ "extra": {
+ "display-name": "phpBB Bar Extension",
+ "soft-require": {
+ "phpbb/phpbb": "3.1.*@dev"
+ }
+ }
+}
diff --git a/tests/extension/ext/vendor4/bar/styles/all/template/foobar_body.html b/tests/extension/ext/vendor4/bar/styles/all/template/foobar_body.html
new file mode 100644
index 0000000000..c8f8cf957e
--- /dev/null
+++ b/tests/extension/ext/vendor4/bar/styles/all/template/foobar_body.html
@@ -0,0 +1 @@
+All folder
diff --git a/tests/extension/manager_test.php b/tests/extension/manager_test.php
index 5ec8e60a68..5c7cad89f6 100644
--- a/tests/extension/manager_test.php
+++ b/tests/extension/manager_test.php
@@ -36,7 +36,7 @@ class phpbb_extension_manager_test extends phpbb_database_test_case
public function test_all_available()
{
// barfoo and vendor3/bar should not listed due to missing composer.json. barfoo also has incorrect dir structure.
- $this->assertEquals(array('vendor/moo', 'vendor2/bar', 'vendor2/foo', 'vendor3/foo'), array_keys($this->extension_manager->all_available()));
+ $this->assertEquals(array('vendor/moo', 'vendor2/bar', 'vendor2/foo', 'vendor3/foo', 'vendor4/bar'), array_keys($this->extension_manager->all_available()));
}
public function test_all_enabled()