Skip to content

Commit 9a7c7e1

Browse files
committed
MQE-1650: update MFTF configuration to read Test entities from new location
- address reviews
1 parent 1639361 commit 9a7c7e1

File tree

4 files changed

+30
-31
lines changed

4 files changed

+30
-31
lines changed

src/Magento/FunctionalTestingFramework/Composer/Handlers/AbstractComposerHandler.php

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -99,33 +99,4 @@ protected function getComposer()
9999
}
100100
return $this->composer;
101101
}
102-
103-
/**
104-
* Parse input array and return all suggested magento module names in pattern like: Magento_Store, Amazon_Core, etc
105-
*
106-
* @param array $suggests
107-
* @return array
108-
*/
109-
protected function parseSuggestsForMagentoModuleNames($suggests)
110-
{
111-
$magentoModuleNames = [];
112-
foreach ($suggests as $suggest) {
113-
$parts = explode(',', $suggest);
114-
$data = [];
115-
foreach ($parts as $part) {
116-
if (strpos($part, ':') !== false) {
117-
list($name, $value) = explode(':', $part, 2);
118-
$data[strtolower(trim($name))] = trim($value);
119-
}
120-
}
121-
122-
if (isset($data[self::SUGGEST_TYPE])
123-
&& $data[self::SUGGEST_TYPE] == self::MAGENTO_MODULE_PACKAGE_TYPE
124-
&& isset($data[self::SUGGEST_NAME])
125-
&& strpos($data[self::SUGGEST_NAME], '_') !== false) {
126-
$magentoModuleNames[] = $data[self::SUGGEST_NAME];
127-
}
128-
}
129-
return array_unique($magentoModuleNames);
130-
}
131102
}

src/Magento/FunctionalTestingFramework/Composer/Handlers/ComposerPackager.php

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,4 +153,33 @@ public function getRootPackage()
153153
}
154154
return $this->rootPackage;
155155
}
156+
157+
/**
158+
* Parse input array and return all suggested magento module names in pattern like: Magento_Store, Amazon_Core, etc
159+
*
160+
* @param array $suggests
161+
* @return array
162+
*/
163+
private function parseSuggestsForMagentoModuleNames($suggests)
164+
{
165+
$magentoModuleNames = [];
166+
foreach ($suggests as $suggest) {
167+
$parts = explode(',', $suggest);
168+
$data = [];
169+
foreach ($parts as $part) {
170+
if (strpos($part, ':') !== false) {
171+
list($name, $value) = explode(':', $part, 2);
172+
$data[strtolower(trim($name))] = trim($value);
173+
}
174+
}
175+
176+
if (isset($data[self::SUGGEST_TYPE])
177+
&& $data[self::SUGGEST_TYPE] == self::MAGENTO_MODULE_PACKAGE_TYPE
178+
&& isset($data[self::SUGGEST_NAME])
179+
&& strpos($data[self::SUGGEST_NAME], '_') !== false) {
180+
$magentoModuleNames[] = $data[self::SUGGEST_NAME];
181+
}
182+
}
183+
return array_unique($magentoModuleNames);
184+
}
156185
}

src/Magento/FunctionalTestingFramework/Page/Config/Dom.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function initDom($xml, $filename = null)
9393
foreach ($pageNodes as $pageNode) {
9494
$pageModule = $pageNode->getAttribute("module");
9595
$pageName = $pageNode->getAttribute("name");
96-
if ($pageModule != $currentModule) {
96+
if ($pageModule !== $currentModule) {
9797
if (MftfApplicationConfig::getConfig()->verboseEnabled()) {
9898
print(
9999
"Page Module does not match path Module. " .

src/Magento/FunctionalTestingFramework/Test/Util/TestObjectExtractor.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use Magento\FunctionalTestingFramework\Test\Objects\ActionObject;
1212
use Magento\FunctionalTestingFramework\Test\Objects\TestObject;
1313
use Magento\FunctionalTestingFramework\Util\ModulePathExtractor;
14-
use Magento\FunctionalTestingFramework\Util\ModuleResolver;
1514
use Magento\FunctionalTestingFramework\Util\Validation\NameValidationUtil;
1615

1716
/**

0 commit comments

Comments
 (0)