From 29999eed6d080732ab48bfd9c630effa35003784 Mon Sep 17 00:00:00 2001 From: Nick Liu Date: Mon, 23 Dec 2019 19:09:08 +0100 Subject: [PATCH] Updated to Codeception 4.0 --- e107_tests/codeception.yml | 3 +-- e107_tests/composer.json | 4 +++- e107_tests/tests/unit/e107_db_debugTest.php | 2 +- e107_tests/tests/unit/e_dateTest.php | 6 +++--- e107_tests/tests/unit/e_db_abstractTest.php | 10 ++++----- e107_tests/tests/unit/e_formTest.php | 6 +++--- e107_tests/tests/unit/e_parseTest.php | 24 ++++++++++----------- e107_tests/tests/unit/pluginsTest.php | 4 ++-- e107_tests/tests/unit/xmlClassTest.php | 6 +++--- 9 files changed, 33 insertions(+), 32 deletions(-) diff --git a/e107_tests/codeception.yml b/e107_tests/codeception.yml index 987d66892..9331cb6cd 100644 --- a/e107_tests/codeception.yml +++ b/e107_tests/codeception.yml @@ -5,8 +5,7 @@ paths: support: tests/_support envs: tests/_envs actor_suffix: Tester -settings: - bootstrap: _bootstrap.php +bootstrap: _bootstrap.php coverage: enabled: true include: diff --git a/e107_tests/composer.json b/e107_tests/composer.json index 8bd10c022..3a89538df 100644 --- a/e107_tests/composer.json +++ b/e107_tests/composer.json @@ -3,7 +3,9 @@ "description": "Test harness for e107", "license": "GPL-3.0-or-later", "require-dev": { - "codeception/codeception": "^2.5", + "codeception/codeception": "^4.0", + "codeception/module-asserts": "^1.1", + "codeception/module-db": "^1.0", "twig/twig": ">=1.28" } } diff --git a/e107_tests/tests/unit/e107_db_debugTest.php b/e107_tests/tests/unit/e107_db_debugTest.php index dde4e0ccf..750a55142 100644 --- a/e107_tests/tests/unit/e107_db_debugTest.php +++ b/e107_tests/tests/unit/e107_db_debugTest.php @@ -60,7 +60,7 @@ $result = $this->dbg->Show_Log(); - $this->assertContains('e107_db_debugTest->testLog()',$result); + $this->assertStringContainsString('e107_db_debugTest->testLog()',$result); } /* diff --git a/e107_tests/tests/unit/e_dateTest.php b/e107_tests/tests/unit/e_dateTest.php index 11ce3f1ff..51a15c601 100644 --- a/e107_tests/tests/unit/e_dateTest.php +++ b/e107_tests/tests/unit/e_dateTest.php @@ -127,9 +127,9 @@ { $actual = $this->dateObj->buildDateLocale(); - $this->assertContains('$.fn.datetimepicker.dates["en"]', $actual); - $this->assertContains('days: ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],', $actual); - $this->assertContains('monthsShort: ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],', $actual); + $this->assertStringContainsString('$.fn.datetimepicker.dates["en"]', $actual); + $this->assertStringContainsString('days: ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],', $actual); + $this->assertStringContainsString('monthsShort: ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],', $actual); } public function testToTime() diff --git a/e107_tests/tests/unit/e_db_abstractTest.php b/e107_tests/tests/unit/e_db_abstractTest.php index 6e4722899..3f52ecdfd 100644 --- a/e107_tests/tests/unit/e_db_abstractTest.php +++ b/e107_tests/tests/unit/e_db_abstractTest.php @@ -72,7 +72,7 @@ abstract class e_db_abstractTest extends \Codeception\Test\Unit { $result = $this->db->getServerInfo(); - $this->assertNotContains('?',$result); + $this->assertStringNotContainsString('?',$result); } /** @@ -926,10 +926,10 @@ abstract class e_db_abstractTest extends \Codeception\Test\Unit $tmp = file_get_contents($result); - $this->assertNotContains("DROP TABLE IF EXISTS `e107_user`;", $tmp); - $this->assertContains("CREATE TABLE `e107_user` (", $tmp); - $this->assertContains("INSERT INTO `e107_user` VALUES (1", $tmp); - $this->assertContains("CREATE TABLE `e107_core_media_cat`", $tmp); + $this->assertStringNotContainsString("DROP TABLE IF EXISTS `e107_user`;", $tmp); + $this->assertStringContainsString("CREATE TABLE `e107_user` (", $tmp); + $this->assertStringContainsString("INSERT INTO `e107_user` VALUES (1", $tmp); + $this->assertStringContainsString("CREATE TABLE `e107_core_media_cat`", $tmp); $result = $this->db->backup('*', null, $opts); $size = filesize($result); diff --git a/e107_tests/tests/unit/e_formTest.php b/e107_tests/tests/unit/e_formTest.php index 885e69930..d0c942c6e 100644 --- a/e107_tests/tests/unit/e_formTest.php +++ b/e107_tests/tests/unit/e_formTest.php @@ -371,7 +371,7 @@ class e_formTest extends \Codeception\Test\Unit foreach($tests as $var) { $result = $this->_frm->progressBar('progress', $var['value']); - $this->assertContains($var['expected'],$result); + $this->assertStringContainsString($var['expected'],$result); } } @@ -556,7 +556,7 @@ class e_formTest extends \Codeception\Test\Unit foreach($tests as $var) { $result = $this->_frm->uc_select('uc', $var['value'], $var['options'], array('default'=>$var['default'])); - $this->assertContains($var['expected'],$result); + $this->assertStringContainsString($var['expected'],$result); } @@ -892,7 +892,7 @@ class e_formTest extends \Codeception\Test\Unit // $this->expectExceptionMessage($result); } - $this->assertContains('data-token',$result,$field." doesn't contain 'data-token'"); + $this->assertStringContainsString('data-token',$result,$field." doesn't contain 'data-token'"); } } diff --git a/e107_tests/tests/unit/e_parseTest.php b/e107_tests/tests/unit/e_parseTest.php index b4c25fb94..180223c92 100644 --- a/e107_tests/tests/unit/e_parseTest.php +++ b/e107_tests/tests/unit/e_parseTest.php @@ -83,7 +83,7 @@ TMP; { $needle = '