From 4efbb893b7b8ada8766847dc59724faef9c18142 Mon Sep 17 00:00:00 2001
From: David King <imkingdavid@gmail.com>
Date: Fri, 16 Nov 2012 17:36:39 -0500
Subject: [PATCH] [feature/controller] Fix line endings and permissions, and
 check responses

PHPBB3-10864
---
 tests/functional/extension_controller_test.php       |  4 ++++
 .../fixtures/ext/foo/bar/config/routing.yml          |  0
 .../fixtures/ext/foo/bar/config/services.yml         |  0
 .../fixtures/ext/foo/bar/controller/controller.php   |  0
 tests/functional/fixtures/ext/foo/bar/ext.php        | 12 ++++++------
 5 files changed, 10 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/config/routing.yml
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/config/services.yml
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/controller/controller.php
 mode change 100755 => 100644 tests/functional/fixtures/ext/foo/bar/ext.php

diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 9cc2e0e32f..ba4a4e8ef0 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -91,6 +91,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php/foo/bar');
+		$this->assert_response_success();
 		$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -102,6 +103,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php/foo/template');
+		$this->assert_response_success();
 		$this->assertContains("I am a variable", $crawler->filter('#content')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -114,6 +116,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	{
 		$this->phpbb_extension_manager->enable('foo/bar');
 		$crawler = $this->request('GET', 'app.php/foo/baz');
+		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('Missing value for argument #1: test in class phpbb_ext_foo_bar_controller:baz', $crawler->filter('body')->text());
 		$this->phpbb_extension_manager->purge('foo/bar');
 	}
@@ -130,6 +133,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 	public function test_error_ext_disabled_or_404()
 	{
 		$crawler = $this->request('GET', 'app.php/does/not/exist');
+		$this->assertEquals(404, $this->client->getResponse()->getStatus());
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
 }
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
old mode 100755
new mode 100644
diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
old mode 100755
new mode 100644
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
diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php
old mode 100755
new mode 100644
index 7170209d53..74359d51ab
--- a/tests/functional/fixtures/ext/foo/bar/ext.php
+++ b/tests/functional/fixtures/ext/foo/bar/ext.php
@@ -1,6 +1,6 @@
-<?php
-
-class phpbb_ext_foo_bar_ext extends phpbb_extension_base
-{
-
-}
+<?php
+
+class phpbb_ext_foo_bar_ext extends phpbb_extension_base
+{
+
+}