aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-12-13 23:31:04 +0100
committerAndreas Fischer <bantu@phpbb.com>2012-12-13 23:31:04 +0100
commit73e7fa8e8ee9c2db7874dbe18605d3a0aa59b86f (patch)
tree5fd4660cc1c2fd3c0d9ed636f58fe1f248eb55e8
parent7611e1160832dd8338225d36093026198a1ba0d8 (diff)
parent789c04b90025cf230b3b965ece8022104128c92c (diff)
downloadforums-73e7fa8e8ee9c2db7874dbe18605d3a0aa59b86f.tar
forums-73e7fa8e8ee9c2db7874dbe18605d3a0aa59b86f.tar.gz
forums-73e7fa8e8ee9c2db7874dbe18605d3a0aa59b86f.tar.bz2
forums-73e7fa8e8ee9c2db7874dbe18605d3a0aa59b86f.tar.xz
forums-73e7fa8e8ee9c2db7874dbe18605d3a0aa59b86f.zip
Merge remote-tracking branch 'p/ticket/11265' into develop-olympus
* p/ticket/11265: [ticket/11265] Add assertions for board installation success.
-rw-r--r--tests/test_framework/phpbb_functional_test_case.php14
1 files changed, 11 insertions, 3 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php
index 93a4ab2fbf..8ab6469e9a 100644
--- a/tests/test_framework/phpbb_functional_test_case.php
+++ b/tests/test_framework/phpbb_functional_test_case.php
@@ -183,12 +183,20 @@ class phpbb_functional_test_case extends phpbb_test_case
self::assertNotSame(false, $content);
self::assertContains('Welcome to Installation', $content);
- self::do_request('create_table', $data);
+ $content = self::do_request('create_table', $data);
+ self::assertNotSame(false, $content);
+ self::assertContains('The database tables used by phpBB', $content);
+ // 3.0 or 3.1
+ self::assertContains('have been created and populated with some initial data.', $content);
- self::do_request('config_file', $data);
+ $content = self::do_request('config_file', $data);
+ self::assertNotSame(false, $content);
+ self::assertContains('Configuration file', $content);
file_put_contents($phpbb_root_path . "config.$phpEx", phpbb_create_config_file_data($data, self::$config['dbms'], array(), true, true));
- self::do_request('final', $data);
+ $content = self::do_request('final', $data);
+ self::assertNotSame(false, $content);
+ self::assertContains('You have successfully installed', $content);
copy($phpbb_root_path . "config.$phpEx", $phpbb_root_path . "config_test.$phpEx");
}