From 76917558832b0102716448770f365585aac224e9 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 16 Nov 2012 09:23:57 -0500 Subject: [feature/controller] Adapt functional tests given new controller framework PHPBB3-10864 --- .../functional/fixtures/ext/foo/bar/controller/controller.php | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 tests/functional/fixtures/ext/foo/bar/controller/controller.php (limited to 'tests/functional/fixtures/ext/foo/bar/controller/controller.php') diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php new file mode 100755 index 0000000000..4c5274951f --- /dev/null +++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php @@ -0,0 +1,10 @@ + Date: Fri, 16 Nov 2012 10:30:50 -0500 Subject: [feature/controller] Add test for missing argument in controller class PHPBB3-10864 --- tests/functional/fixtures/ext/foo/bar/controller/controller.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/functional/fixtures/ext/foo/bar/controller/controller.php') diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php index 4c5274951f..def5184e8c 100755 --- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php +++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php @@ -7,4 +7,9 @@ class phpbb_ext_foo_bar_controller { return new Response('foo/bar controller handle() method', 200); } + + public function baz($test) + { + return new Response('Value of "test" URL argument is: ' . $test); + } } -- cgit v1.2.1 From 5b013ddf5c48e71166dcefd6d384aea1d801698a Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 16 Nov 2012 11:41:05 -0500 Subject: [feature/controller] Add controller functional test with template PHPBB3-10864 --- .../fixtures/ext/foo/bar/controller/controller.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'tests/functional/fixtures/ext/foo/bar/controller/controller.php') diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php index def5184e8c..50ea5d034b 100755 --- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php +++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php @@ -3,6 +3,14 @@ use Symfony\Component\HttpFoundation\Response; class phpbb_ext_foo_bar_controller { + protected $template; + + public function __construct(phpbb_controller_helper $helper, phpbb_template $template) + { + $this->template = $template; + $this->helper = $helper; + } + public function handle() { return new Response('foo/bar controller handle() method', 200); @@ -12,4 +20,11 @@ class phpbb_ext_foo_bar_controller { return new Response('Value of "test" URL argument is: ' . $test); } + + public function template() + { + $this->template->assign_var('A_VARIABLE', 'I am a variable'); + + return $this->helper->render('foo_bar_body.html'); + } } -- cgit v1.2.1 From 4efbb893b7b8ada8766847dc59724faef9c18142 Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 16 Nov 2012 17:36:39 -0500 Subject: [feature/controller] Fix line endings and permissions, and check responses PHPBB3-10864 --- tests/functional/fixtures/ext/foo/bar/controller/controller.php | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/controller/controller.php (limited to 'tests/functional/fixtures/ext/foo/bar/controller/controller.php') diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php old mode 100755 new mode 100644 -- cgit v1.2.1 From f8614bfc84ba9b9cc814b8f78e343005620f18f8 Mon Sep 17 00:00:00 2001 From: David King Date: Mon, 19 Nov 2012 12:37:20 -0500 Subject: [feature/controller] Check for proper status codes from controllers PHPBB3-10864 --- tests/functional/fixtures/ext/foo/bar/controller/controller.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/functional/fixtures/ext/foo/bar/controller/controller.php') diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php index 50ea5d034b..5a91b5f681 100644 --- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php +++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php @@ -27,4 +27,9 @@ class phpbb_ext_foo_bar_controller return $this->helper->render('foo_bar_body.html'); } + + public function exception() + { + throw new phpbb_controller_exception('Exception thrown from foo/exception route'); + } } -- cgit v1.2.1