mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-08 07:36:32 +02:00
Code Issues Releases Wiki Activity

Updated to Codeception 4.0

Browse Source
This commit is contained in:
Nick Liu
2019-12-23 19:09:08 +01:00
parent f2edd94ea4
commit 29999eed6d
9 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
e107_tests/codeception.yml
View File

@@ -5,8 +5,7 @@ paths:
support: tests/_support support: tests/_support
envs: tests/_envs envs: tests/_envs
actor_suffix: Tester actor_suffix: Tester
settings: bootstrap: _bootstrap.php
bootstrap: _bootstrap.php
coverage: coverage:
enabled: true enabled: true
include: include:

4
e107_tests/composer.json
View File

@@ -3,7 +3,9 @@
"description": "Test harness for e107", "description": "Test harness for e107",
"license": "GPL-3.0-or-later", "license": "GPL-3.0-or-later",
"require-dev": { "require-dev": {
"codeception/codeception": "^2.5", "codeception/codeception": "^4.0",
"codeception/module-asserts": "^1.1",
"codeception/module-db": "^1.0",
"twig/twig": ">=1.28" "twig/twig": ">=1.28"
} }
} }

2
e107_tests/tests/unit/e107_db_debugTest.php
View File

@@ -60,7 +60,7 @@
$result = $this->dbg->Show_Log(); $result = $this->dbg->Show_Log();
$this->assertContains('e107_db_debugTest->testLog()',$result); $this->assertStringContainsString('e107_db_debugTest->testLog()',$result);
} }
/* /*

6
e107_tests/tests/unit/e_dateTest.php
View File

@@ -127,9 +127,9 @@
{ {
$actual = $this->dateObj->buildDateLocale(); $actual = $this->dateObj->buildDateLocale();
$this->assertContains('$.fn.datetimepicker.dates["en"]', $actual); $this->assertStringContainsString('$.fn.datetimepicker.dates["en"]', $actual);
$this->assertContains('days: ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],', $actual); $this->assertStringContainsString('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('monthsShort: ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],', $actual);
} }
public function testToTime() public function testToTime()

10
e107_tests/tests/unit/e_db_abstractTest.php
View File

@@ -72,7 +72,7 @@ abstract class e_db_abstractTest extends \Codeception\Test\Unit
{ {
$result = $this->db->getServerInfo(); $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); $tmp = file_get_contents($result);
$this->assertNotContains("DROP TABLE IF EXISTS `e107_user`;", $tmp); $this->assertStringNotContainsString("DROP TABLE IF EXISTS `e107_user`;", $tmp);
$this->assertContains("CREATE TABLE `e107_user` (", $tmp); $this->assertStringContainsString("CREATE TABLE `e107_user` (", $tmp);
$this->assertContains("INSERT INTO `e107_user` VALUES (1", $tmp); $this->assertStringContainsString("INSERT INTO `e107_user` VALUES (1", $tmp);
$this->assertContains("CREATE TABLE `e107_core_media_cat`", $tmp); $this->assertStringContainsString("CREATE TABLE `e107_core_media_cat`", $tmp);
$result = $this->db->backup('*', null, $opts); $result = $this->db->backup('*', null, $opts);
$size = filesize($result); $size = filesize($result);

6
e107_tests/tests/unit/e_formTest.php
View File

@@ -371,7 +371,7 @@ class e_formTest extends \Codeception\Test\Unit
foreach($tests as $var) foreach($tests as $var)
{ {
$result = $this->_frm->progressBar('progress', $var['value']); $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) foreach($tests as $var)
{ {
$result = $this->_frm->uc_select('uc', $var['value'], $var['options'], array('default'=>$var['default'])); $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->expectExceptionMessage($result);
} }
$this->assertContains('data-token',$result,$field." doesn't contain 'data-token'"); $this->assertStringContainsString('data-token',$result,$field." doesn't contain 'data-token'");
} }
} }

24
e107_tests/tests/unit/e_parseTest.php
View File

@@ -83,7 +83,7 @@ TMP;
{ {
$needle = '<ul class="nav navbar-nav nav-main ml-auto">'; $needle = '<ul class="nav navbar-nav nav-main ml-auto">';
$result = $this->tp->parseTemplate('{NAVIGATION}', true); $result = $this->tp->parseTemplate('{NAVIGATION}', true);
$this->assertContains($needle, $result); $this->assertStringContainsString($needle, $result);
} }
public function testParseTemplateWithDisabledCoreShortcodes() public function testParseTemplateWithDisabledCoreShortcodes()
@@ -131,7 +131,7 @@ TMP;
$needle = "<form class='form-search form-inline' "; $needle = "<form class='form-search form-inline' ";
$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false, $shortcodeObject); $result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false, $shortcodeObject);
$this->assertContains($needle, $result); $this->assertStringContainsString($needle, $result);
$result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false); $result = $this->tp->parseTemplate('{DOWNLOAD_CAT_SEARCH}', false);
$this->assertEmpty($result); $this->assertEmpty($result);
@@ -398,7 +398,7 @@ TMP;
{ {
$actual = $this->tp->replaceConstants('{e_BASE}news','abs'); $actual = $this->tp->replaceConstants('{e_BASE}news','abs');
$this->assertContains(e_HTTP,$actual); $this->assertStringContainsString(e_HTTP,$actual);
} }
@@ -430,7 +430,7 @@ TMP;
$actual = $this->tp->thumbUrl($val['path'], array('w'=>300, 'h'=>200)); $actual = $this->tp->thumbUrl($val['path'], array('w'=>300, 'h'=>200));
$this->assertContains($val['expected'], $actual); $this->assertStringContainsString($val['expected'], $actual);
//echo $$actual."\n\n"; //echo $$actual."\n\n";
} }
@@ -659,7 +659,7 @@ TMP;
foreach($tests as $var) foreach($tests as $var)
{ {
$result = $this->tp->toIcon($var['input'],$var['parms']); $result = $this->tp->toIcon($var['input'],$var['parms']);
$this->assertContains($var['expected'],$result); $this->assertStringContainsString($var['expected'],$result);
//var_dump($result); //var_dump($result);
} }
} }
@@ -753,12 +753,12 @@ TMP;
$result = $tp->makeClickable($email, 'email', array('sub' => '[email]')); $result = $tp->makeClickable($email, 'email', array('sub' => '[email]'));
$this->assertContains('[email]</a>', $result); $this->assertStringContainsString('[email]</a>', $result);
// ----- // -----
$result = $tp->makeClickable($email, 'email', array('sub' => 'fa-envelope.glyph')); $result = $tp->makeClickable($email, 'email', array('sub' => 'fa-envelope.glyph'));
$this->assertContains("<i class='fa fa-envelope' ><!-- --></i></a>", $result); $this->assertStringContainsString("<i class='fa fa-envelope' ><!-- --></i></a>", $result);
// links standard. // links standard.
$tests = array( $tests = array(
@@ -821,17 +821,17 @@ TMP;
$time = 1519512067; // Saturday 24 February 2018 - 22:41:07 $time = 1519512067; // Saturday 24 February 2018 - 22:41:07
$long = $class->toDate($time, 'long'); $long = $class->toDate($time, 'long');
$this->assertContains('Saturday 24 February 2018',$long); $this->assertStringContainsString('Saturday 24 February 2018',$long);
$short = $class->toDate($time, 'short'); $short = $class->toDate($time, 'short');
$this->assertContains('Feb 2018', $short); $this->assertStringContainsString('Feb 2018', $short);
$rel = $class->toDate($time, 'relative'); $rel = $class->toDate($time, 'relative');
$this->assertContains('ago', $rel); $this->assertStringContainsString('ago', $rel);
$this->assertContains('data-livestamp="1519512067"', $rel); $this->assertStringContainsString('data-livestamp="1519512067"', $rel);
$custom = $class->toDate($time, 'dd-M-yy'); $custom = $class->toDate($time, 'dd-M-yy');
$this->assertContains('<span>24-Feb-18</span>', $custom); $this->assertStringContainsString('<span>24-Feb-18</span>', $custom);

4
e107_tests/tests/unit/pluginsTest.php
View File

@@ -134,11 +134,11 @@
$tp = e107::getParser(); $tp = e107::getParser();
$result = $tp->parseTemplate("{BANNER=e107promo}",true); $result = $tp->parseTemplate("{BANNER=e107promo}",true);
$this->assertContains("<img class='e-banner img-responsive img-fluid'", $result); $this->assertStringContainsString("<img class='e-banner img-responsive img-fluid'", $result);
$result = $tp->parseTemplate("{BANNER=e107promo}",false, $result = $tp->parseTemplate("{BANNER=e107promo}",false,
e107::getScBatch('banner', true)); e107::getScBatch('banner', true));
$this->assertContains("<img class='e-banner img-responsive img-fluid'", $result); $this->assertStringContainsString("<img class='e-banner img-responsive img-fluid'", $result);
$result = $tp->parseTemplate("{BANNER=e107promo}",false); $result = $tp->parseTemplate("{BANNER=e107promo}",false);
$this->assertEquals("", $result); $this->assertEquals("", $result);

6
e107_tests/tests/unit/xmlClassTest.php
View File

@@ -153,7 +153,7 @@
$feed = 'https://www.youtube.com/feeds/videos.xml?channel_id=UC7vv3cBq14FRXajteZt6FEg'; $feed = 'https://www.youtube.com/feeds/videos.xml?channel_id=UC7vv3cBq14FRXajteZt6FEg';
$contents = $this->_xml->getRemoteFile($feed,true); $contents = $this->_xml->getRemoteFile($feed,true);
$this->assertContains('<?xml version="1.0" encoding="UTF-8"?>',$contents); $this->assertStringContainsString('<?xml version="1.0" encoding="UTF-8"?>',$contents);
} }
/* /*
@@ -236,8 +236,8 @@
$incorrect = '<core name="e_jslib_plugin"><![CDATA[Array]]></core>'; $incorrect = '<core name="e_jslib_plugin"><![CDATA[Array]]></core>';
$correct = '<core name="e_jslib_plugin"><![CDATA[array ()]]></core>'; $correct = '<core name="e_jslib_plugin"><![CDATA[array ()]]></core>';
$this->assertNotContains($incorrect, $ret); $this->assertStringNotContainsString($incorrect, $ret);
$this->assertContains($correct, $ret); $this->assertStringContainsString($correct, $ret);
} }
} }