diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-13 23:42:39 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-13 23:42:39 +0100 |
| commit | 93222cf396192cc4e2d9a4dc741c60efda21404d (patch) | |
| tree | 151729712065efab7a137b0feaa354cea9c60d6e | |
| parent | 196bde21c4745dd2e367e6fe3fd07b1d4e1ec0b8 (diff) | |
| parent | 73e7fa8e8ee9c2db7874dbe18605d3a0aa59b86f (diff) | |
| download | forums-93222cf396192cc4e2d9a4dc741c60efda21404d.tar forums-93222cf396192cc4e2d9a4dc741c60efda21404d.tar.gz forums-93222cf396192cc4e2d9a4dc741c60efda21404d.tar.bz2 forums-93222cf396192cc4e2d9a4dc741c60efda21404d.tar.xz forums-93222cf396192cc4e2d9a4dc741c60efda21404d.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11265] Add assertions for board installation success.
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 14 |
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 b6f8e5c44c..1297e99ca5 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -206,12 +206,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'], 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"); } |