1 files changed, 49 insertions, 0 deletions
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 37752b8fbb..57b0f56bee 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -111,4 +111,53 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
 		$this->assert_response_html(404);
 		$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
 	}
+
+	/**
+	 * Check the redirect after using the login_box() form
+	 */
+	public function test_login_redirect()
+	{
+		$this->markTestIncomplete('Session table contains incorrect data for controllers on travis,'
+			. 'therefor the redirect fails.');
+
+		$this->phpbb_extension_manager->enable('foo/bar');
+		$crawler = self::request('GET', 'app.php/foo/login_redirect');
+		$this->assertContainsLang('LOGIN', $crawler->filter('h2')->text());
+		$form = $crawler->selectButton('login')->form(array(
+			'username'	=> 'admin',
+			'password'	=> 'adminadmin',
+		));
+		$this->assertStringStartsWith('./app.php/foo/login_redirect', $form->get('redirect')->getValue());
+
+		$crawler = self::submit($form);
+		$this->assertContains("I am a variable", $crawler->filter('#content')->text(), 'Unsuccessful redirect after using login_box()');
+		$this->phpbb_extension_manager->purge('foo/bar');
+	}
+
+	/**
+	* Check the output of a controller using the template system
+	*/
+	public function test_redirect()
+	{
+		$this->phpbb_extension_manager->enable('foo/bar');
+		$crawler = self::request('GET', 'app.php/foo/redirect');
+
+		$nodes = $crawler->filter('div')->extract(array('id'));
+
+		foreach ($nodes as $redirect)
+		{
+			if (strpos($redirect, 'redirect_expected') !== 0)
+			{
+				continue;
+			}
+
+			$row_num = str_replace('redirect_expected_', '', $redirect);
+
+			$redirect = $crawler->filter('#redirect_' . $row_num)->text();
+			$redirect = substr($redirect, 0, strpos($redirect, 'sid') - 1);
+			$this->assertEquals($crawler->filter('#redirect_expected_' .  $row_num)->text(), $redirect);
+		}
+
+		$this->phpbb_extension_manager->purge('foo/bar');
+	}
 }