Skip to content

Commit 7c3609a

Browse files
committed
MQE-1961: Remove deprecated actions
removed deprecation notices, and changes from 2.6.1
1 parent 8026f6f commit 7c3609a

File tree

7 files changed

+3
-41
lines changed

7 files changed

+3
-41
lines changed

src/Magento/FunctionalTestingFramework/Console/BaseGenerateCommand.php

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,7 @@
2323

2424
class BaseGenerateCommand extends Command
2525
{
26-
const MFTF_3_O_0_DEPRECATION_MESSAGE = "MFTF NOTICES:\n"
27-
. "DEPRECATED ACTIONS: \"executeInSelenium\" and \"performOn\" actions will be removed in MFTF 3.0.0\n"
28-
. "DEPRECATED TEST PATH: support for \"dev/tests/acceptance/tests/functional/Magento/FunctionalTest will be "
29-
. "removed in MFTF 3.0.0\n"
30-
. "XSD schema change to only allow single entity per xml file for all entities except data and metadata in "
31-
. "MFTF 3.0.0\n";
26+
const MFTF_NOTICES = "Placeholder text for MFTF notices\n";
3227

3328
/**
3429
* Console output style
@@ -218,9 +213,9 @@ protected function setOutputStyle(InputInterface $input, OutputInterface $output
218213
protected function showMftfNotices(OutputInterface $output)
219214
{
220215
if (null !== $this->ioStyle) {
221-
$this->ioStyle->note(self::MFTF_3_O_0_DEPRECATION_MESSAGE);
216+
$this->ioStyle->note(self::MFTF_NOTICES);
222217
} else {
223-
$output->writeln(self::MFTF_3_O_0_DEPRECATION_MESSAGE);
218+
$output->writeln(self::MFTF_NOTICES);
224219
}
225220
}
226221
}

src/Magento/FunctionalTestingFramework/Console/GenerateSuiteCommand.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
5858
$allowSkipped
5959
);
6060

61-
$this->setOutputStyle($input, $output);
62-
$this->showMftfNotices($output);
63-
6461
// Remove previous GENERATED_DIR if --remove option is used
6562
if ($remove) {
6663
$this->removeGeneratedDirectory($output, $output->isVerbose());

src/Magento/FunctionalTestingFramework/Console/GenerateTestsCommand.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
8282
$allowSkipped
8383
);
8484

85-
$this->setOutputStyle($input, $output);
86-
$this->showMftfNotices($output);
87-
8885
if (!empty($tests)) {
8986
$json = $this->getTestAndSuiteConfiguration($tests);
9087
}

src/Magento/FunctionalTestingFramework/Console/RunTestCommand.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
8484
$allowSkipped
8585
);
8686

87-
$this->setOutputStyle($input, $output);
88-
$this->showMftfNotices($output);
89-
9087
$testConfiguration = $this->getTestAndSuiteConfiguration($tests);
9188

9289
if (!$skipGeneration) {

src/Magento/FunctionalTestingFramework/Console/RunTestFailedCommand.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
9696
$allowSkipped
9797
);
9898

99-
$this->setOutputStyle($input, $output);
100-
$this->showMftfNotices($output);
101-
10299
$testConfiguration = $this->getFailedTestList();
103100

104101
if ($testConfiguration === null) {

src/Magento/FunctionalTestingFramework/Console/RunTestGroupCommand.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
7979
$allowSkipped
8080
);
8181

82-
$this->setOutputStyle($input, $output);
83-
$this->showMftfNotices($output);
84-
8582
if (!$skipGeneration) {
8683
$testConfiguration = $this->getGroupAndSuiteConfiguration($groups);
8784
$command = $this->getApplication()->find('generate:tests');

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ class TestGenerator
5959
const ARRAY_WRAP_OPEN = '[';
6060
const ARRAY_WRAP_CLOSE = ']';
6161

62-
const MFTF_3_O_0_DEPRECATION_MESSAGE = ' is DEPRECATED and will be removed in MFTF 3.0.0.';
63-
6462
/**
6563
* Actor name for AcceptanceTest
6664
*
@@ -1039,11 +1037,6 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
10391037
$parameterArray
10401038
);
10411039
break;
1042-
case "executeInSelenium":
1043-
$this->deprecationMessages[] = "DEPRECATED ACTION in Test: at step {$stepKey} 'executeInSelenium'"
1044-
. self::MFTF_3_O_0_DEPRECATION_MESSAGE;
1045-
$testSteps .= $this->wrapFunctionCall($actor, $actionObject, $function);
1046-
break;
10471040
case "executeJS":
10481041
$testSteps .= $this->wrapFunctionCallWithReturnValue(
10491042
$stepKey,
@@ -1052,17 +1045,6 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
10521045
$function
10531046
);
10541047
break;
1055-
case "performOn":
1056-
$this->deprecationMessages[] = "DEPRECATED ACTION in Test: at step {$stepKey} 'performOn'"
1057-
. self::MFTF_3_O_0_DEPRECATION_MESSAGE;
1058-
$testSteps .= $this->wrapFunctionCall(
1059-
$actor,
1060-
$actionObject,
1061-
$selector,
1062-
$function,
1063-
$time
1064-
);
1065-
break;
10661048
case "waitForElementChange":
10671049
$testSteps .= $this->wrapFunctionCall(
10681050
$actor,

0 commit comments

Comments
 (0)