diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-13 17:43:57 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-13 17:43:57 -0500 |
| commit | 2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0 (patch) | |
| tree | 8ee6b60b3c4687a36b8d100403ad0a1ad569acd0 /tests/test_framework/phpbb_functional_test_case.php | |
| parent | 586e8cbd97b4e2537f69ebe04b0c9d24fc090a4c (diff) | |
| parent | 93222cf396192cc4e2d9a4dc741c60efda21404d (diff) | |
| download | forums-2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0.tar forums-2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0.tar.gz forums-2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0.tar.bz2 forums-2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0.tar.xz forums-2d5ba0ebd7cc52a09724506b76c72fb0e89cccd0.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop:
[ticket/11262] Add .lock in cache directory to .gitignore
[ticket/11265] Add assertions for board installation success.
[ticket/11263] Fix PHP Notice: Undefined variable: extension_manager
[ticket/10975] Add a test for viewing a profile.
[ticket/10975] Test restricting by first character.
[ticket/10975] Avoid rewriting global config twice.
[ticket/10975] Test memberlist, not user creation.
[ticket/10975] Some quick tests to check the memberlist behaviour
Diffstat (limited to 'tests/test_framework/phpbb_functional_test_case.php')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 3bfbcd8c7b..db7fc4e6a3 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -202,12 +202,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"); } @@ -247,16 +255,12 @@ class phpbb_functional_test_case extends phpbb_test_case // Required by unique_id global $config; - if (!is_array($config)) - { - $config = array(); - } - + $config = new phpbb_config(array()); $config['rand_seed'] = ''; $config['rand_seed_last_update'] = time() + 600; // Required by user_add - global $db, $cache, $config, $phpbb_dispatcher; + global $db, $cache, $phpbb_dispatcher; $db = $this->get_db(); if (!function_exists('phpbb_mock_null_cache')) { @@ -272,7 +276,6 @@ class phpbb_functional_test_case extends phpbb_test_case { require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); } - $config = new phpbb_config(array()); set_config(null, null, null, $config); set_config_count(null, null, null, $config); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); |