Skip to content

Commit 3eff218

Browse files
committed
Merge branch 'MQE-494' into sprint-develop
2 parents c229c07 + a948df6 commit 3eff218

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/DataObjectHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private function initDataObjects()
116116
$entityParsedData = $entityParser->readDataProfiles();
117117

118118
if (!$entityParsedData) {
119-
trigger_error("No entities could be parsed from xml definitions", E_USER_NOTICE);
119+
// No *Data.xml files found so give up
120120
return;
121121
}
122122

src/Magento/FunctionalTestingFramework/Module/MagentoRestDriver.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,11 @@ class MagentoRestDriver extends REST
104104
public function _beforeSuite($settings = [])
105105
{
106106
parent::_beforeSuite($settings);
107+
108+
if (empty($this->config['url']) || empty($this->config['username']) || empty($this->config['password'])) {
109+
return;
110+
}
111+
107112
$this->haveHttpHeader('Content-Type', 'application/json');
108113
$this->sendPOST(
109114
'integration/admin/token',

src/Magento/FunctionalTestingFramework/Page/Handlers/PageObjectHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ private function initPageObjects()
9797
$parsedObjs = $parser->getData(self::TYPE);
9898

9999
if (!$parsedObjs) {
100-
trigger_error("No " . self::TYPE . " objects defined", E_USER_NOTICE);
100+
// No *Page.xml files found so give up
101101
return;
102102
}
103103

src/Magento/FunctionalTestingFramework/Page/Handlers/SectionObjectHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private function initSectionObjects()
101101
$parsedObjs = $parser->getData(self::TYPE);
102102

103103
if (!$parsedObjs) {
104-
trigger_error("No " . self::TYPE . " objects defined", E_USER_NOTICE);
104+
// No *Section.xml files found so give up
105105
return;
106106
}
107107

src/Magento/FunctionalTestingFramework/Util/ModuleResolver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ public function getModulesPath()
193193
*/
194194
protected function getAdminToken()
195195
{
196-
$login = $_ENV['MAGENTO_ADMIN_USERNAME'];
197-
$password = $_ENV['MAGENTO_ADMIN_PASSWORD'];
196+
$login = $_ENV['MAGENTO_ADMIN_USERNAME'] ?? null;
197+
$password = $_ENV['MAGENTO_ADMIN_PASSWORD'] ?? null;
198198
if (!$login || !$password || !isset($_ENV['MAGENTO_BASE_URL'])) {
199199
return false;
200200
}

0 commit comments

Comments
 (0)