aboutsummaryrefslogtreecommitdiffstats
path: root/tests/migrator
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-12-29 15:11:23 +0100
committerMarc Alexander <admin@m-a-styles.de>2019-12-29 15:11:23 +0100
commit71a1c9fee7aaf3f92e934302abd121d75d4c5df2 (patch)
treee17dcc9b8477c68182e166f52db970f49f7c201a /tests/migrator
parent94808e2cbc880aa16212aa24c7dd7e94bf511305 (diff)
parentdcab0762210a4059cca7458344dcc1aeb0360c42 (diff)
downloadforums-71a1c9fee7aaf3f92e934302abd121d75d4c5df2.tar
forums-71a1c9fee7aaf3f92e934302abd121d75d4c5df2.tar.gz
forums-71a1c9fee7aaf3f92e934302abd121d75d4c5df2.tar.bz2
forums-71a1c9fee7aaf3f92e934302abd121d75d4c5df2.tar.xz
forums-71a1c9fee7aaf3f92e934302abd121d75d4c5df2.zip
Merge pull request #5796 from rxu/ticket/16276
[ticket/16276] Fix bbcode_firstpass undefined mode property
Diffstat (limited to 'tests/migrator')
-rw-r--r--tests/migrator/get_callable_from_step_test.php3
-rw-r--r--tests/migrator/schema_generator_test.php4
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/migrator/get_callable_from_step_test.php b/tests/migrator/get_callable_from_step_test.php
index f08caf3181..b0abb6199c 100644
--- a/tests/migrator/get_callable_from_step_test.php
+++ b/tests/migrator/get_callable_from_step_test.php
@@ -15,7 +15,7 @@ class get_callable_from_step_test extends phpbb_database_test_case
{
public function setUp(): void
{
- global $phpbb_root_path, $php_ext, $table_prefix, $phpbb_log;
+ global $phpbb_root_path, $php_ext, $table_prefix, $phpbb_log, $user;
parent::setUp();
@@ -24,6 +24,7 @@ class get_callable_from_step_test extends phpbb_database_test_case
$factory = new \phpbb\db\tools\factory();
$cache_service = $this->getMockBuilder('\phpbb\cache\service')->disableOriginalConstructor()->getMock();
$user = $this->getMockBuilder('\phpbb\user')->disableOriginalConstructor()->getMock();
+ $user->ip = '127.0.0.1';
$module_manager = new \phpbb\module\module_manager(
$this->getMockBuilder('\phpbb\cache\driver\dummy')->disableOriginalConstructor()->getMock(),
$db,
diff --git a/tests/migrator/schema_generator_test.php b/tests/migrator/schema_generator_test.php
index 88257430a7..1349b98953 100644
--- a/tests/migrator/schema_generator_test.php
+++ b/tests/migrator/schema_generator_test.php
@@ -26,6 +26,8 @@ class schema_generator_test extends phpbb_test_case
public function setUp(): void
{
+ global $phpbb_root_path, $phpEx;
+
parent::setUp();
$this->config = new \phpbb\config\config(array());
@@ -33,6 +35,8 @@ class schema_generator_test extends phpbb_test_case
$factory = new \phpbb\db\tools\factory();
$this->db_tools = $factory->get($this->db);
$this->table_prefix = 'phpbb_';
+ $this->phpbb_root_path = $phpbb_root_path;
+ $this->php_ext = $phpEx;
}
protected function get_schema_generator(array $class_names)