Merge remote-tracking branch 'unknownbliss/ticket/10631' into develop

2 files changed, 163 insertions, 0 deletions

diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index fca66516ba..d002615e8c 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -125,6 +125,7 @@ class phpbb_functional_test_case extends phpbb_test_case
 		{
 			$this->extension_manager = new phpbb_extension_manager(
 				$this->get_db(),
+				new phpbb_config(),
 				self::$config['table_prefix'] . 'ext',
 				$phpbb_root_path,
 				".$phpEx",
@@ -251,6 +252,48 @@ class phpbb_functional_test_case extends phpbb_test_case
 		}
 	}
 
+	/**
+	* Login to the ACP
+	* You must run login() before calling this.
+	*/
+	protected function admin_login()
+	{
+		$this->add_lang('acp/common');
+
+		// Requires login first!
+		if (empty($this->sid))
+		{
+			$this->fail('$this->sid is empty. Make sure you call login() before admin_login()');
+			return;
+		}
+
+		$crawler = $this->request('GET', 'adm/index.php?sid=' . $this->sid);
+		$this->assertContains($this->lang('LOGIN_ADMIN_CONFIRM'), $crawler->filter('html')->text());
+
+		$form = $crawler->selectButton($this->lang('LOGIN'))->form();
+
+		foreach ($form->getValues() as $field => $value)
+		{
+			if (strpos($field, 'password_') === 0)
+			{
+				$login = $this->client->submit($form, array('username' => 'admin', $field => 'admin'));
+
+				$cookies = $this->cookieJar->all();
+
+				// The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie
+				foreach ($cookies as $cookie);
+				{
+					if (substr($cookie->getName(), -4) == '_sid')
+					{
+						$this->sid = $cookie->getValue();
+					}
+				}
+
+				break;
+			}
+		}
+	}
+
 	protected function add_lang($lang_file)
 	{
 		if (is_array($lang_file))
@@ -287,4 +330,16 @@ class phpbb_functional_test_case extends phpbb_test_case
 
 		return call_user_func_array('sprintf', $args);
 	}
+
+    /**
+     * assertContains for language strings
+     *
+     * @param string $needle Search string
+     * @param string $haystack Search this
+     * @param string $message Optional failure message
+     */
+    public function assertContainsLang($needle, $haystack, $message = null)
+    {
+        $this->assertContains(html_entity_decode($this->lang($needle), ENT_QUOTES), $haystack, $message);
+    }
 }
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php
index 46feef550a..d10645a732 100644
--- a/tests/test_framework/phpbb_test_case_helpers.php
+++ b/tests/test_framework/phpbb_test_case_helpers.php
@@ -115,4 +115,112 @@ class phpbb_test_case_helpers
 
 		return $config;
 	}
+
+	/**
+	* Recursive directory copying function
+	*
+	* @param string $source
+	* @param string $dest
+	* @return array list of files copied
+	*/
+	public function copy_dir($source, $dest)
+	{
+		$source = (substr($source, -1) == '/') ? $source : $source . '/';
+		$dest = (substr($dest, -1) == '/') ? $dest : $dest . '/';
+
+		$copied_files = array();
+
+		if (!is_dir($dest))
+		{
+			$this->makedirs($dest);
+		}
+
+		$files = scandir($source);
+		foreach ($files as $file)
+		{
+			if ($file == '.' || $file == '..')
+			{
+				continue;
+			}
+
+			if (is_dir($source . $file))
+			{
+				$created_dir = false;
+				if (!is_dir($dest . $file))
+				{
+					$created_dir = true;
+					$this->makedirs($dest . $file);
+				}
+
+				$copied_files = array_merge($copied_files, self::copy_dir($source . $file, $dest . $file));
+
+				if ($created_dir)
+				{
+					$copied_files[] = $dest . $file;
+				}
+			}
+			else
+			{
+				if (!file_exists($dest . $file))
+				{
+					copy($source . $file, $dest . $file);
+
+					$copied_files[] = $dest . $file;
+				}
+			}
+		}
+
+		return $copied_files;
+	}
+
+	/**
+	* Remove files/directories that are listed in an array
+	* Designed for use with $this->copy_dir()
+	*
+	* @param array $file_list
+	*/
+	public function remove_files($file_list)
+	{
+		foreach ($file_list as $file)
+		{
+			if (is_dir($file))
+			{
+				rmdir($file);
+			}
+			else
+			{
+				unlink($file);
+			}
+		}
+	}
+
+	/**
+	* Empty directory (remove any subdirectories/files below)
+	*
+	* @param array $file_list
+	*/
+	public function empty_dir($path)
+	{
+		$path = (substr($path, -1) == '/') ? $path : $path . '/';
+
+		$files = scandir($path);
+		foreach ($files as $file)
+		{
+			if ($file == '.' || $file == '..')
+			{
+				continue;
+			}
+
+			if (is_dir($path . $file))
+			{
+				$this->empty_dir($path . $file);
+
+				rmdir($path . $file);
+			}
+			else
+			{
+				unlink($path . $file);
+			}
+		}
+	}
 }