Skip to content

Commit 87475a2

Browse files
doboothdobooth
authored
Merge branch 'develop' into db_tips_fix
2 parents 16d26ae + 08c0423 commit 87475a2

File tree

81 files changed

+417
-826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+417
-826
lines changed

‎dev/tests/verification/Resources/ActionGroupContainsStepKeyInArgText.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
5-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
6-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
75
use \Codeception\Util\Locator;
86
use Yandex\Allure\Adapter\Annotation\Features;
97
use Yandex\Allure\Adapter\Annotation\Stories;

‎dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
5-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
6-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
75
use \Codeception\Util\Locator;
86
use Yandex\Allure\Adapter\Annotation\Features;
97
use Yandex\Allure\Adapter\Annotation\Stories;

‎dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
5-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
6-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
75
use \Codeception\Util\Locator;
86
use Yandex\Allure\Adapter\Annotation\Features;
97
use Yandex\Allure\Adapter\Annotation\Stories;

‎dev/tests/verification/Resources/ActionGroupSkipReadiness.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
5-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
6-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
75
use \Codeception\Util\Locator;
86
use Yandex\Allure\Adapter\Annotation\Features;
97
use Yandex\Allure\Adapter\Annotation\Stories;

‎dev/tests/verification/Resources/ActionGroupToExtend.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
5-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
6-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
75
use \Codeception\Util\Locator;
86
use Yandex\Allure\Adapter\Annotation\Features;
97
use Yandex\Allure\Adapter\Annotation\Stories;

‎dev/tests/verification/Resources/ActionGroupUsingCreateData.txt

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
5-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
6-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
75
use \Codeception\Util\Locator;
86
use Yandex\Allure\Adapter\Annotation\Features;
97
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -26,24 +24,8 @@ class ActionGroupUsingCreateDataCest
2624
public function _before(AcceptanceTester $I)
2725
{
2826
$I->comment("Entering Action Group [Key1] actionGroupWithCreateData");
29-
$I->comment("[createCategoryKey1] create 'ApiCategory' entity");
30-
PersistedObjectHandler::getInstance()->createEntity(
31-
"createCategoryKey1",
32-
"hook",
33-
"ApiCategory",
34-
[],
35-
[]
36-
);
37-
38-
$I->comment("[createConfigProductKey1] create 'ApiConfigurableProduct' entity");
39-
PersistedObjectHandler::getInstance()->createEntity(
40-
"createConfigProductKey1",
41-
"hook",
42-
"ApiConfigurableProduct",
43-
["createCategoryKey1"],
44-
[]
45-
);
46-
27+
$I->createEntity("createCategoryKey1", "hook", "ApiCategory", [], []); // stepKey: createCategoryKey1
28+
$I->createEntity("createConfigProductKey1", "hook", "ApiConfigurableProduct", ["createCategoryKey1"], []); // stepKey: createConfigProductKey1
4729
$I->comment("Exiting Action Group [Key1] actionGroupWithCreateData");
4830
}
4931

‎dev/tests/verification/Resources/ActionGroupUsingNestedArgument.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
5-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
6-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
75
use \Codeception\Util\Locator;
86
use Yandex\Allure\Adapter\Annotation\Features;
97
use Yandex\Allure\Adapter\Annotation\Stories;

‎dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
5-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
6-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
75
use \Codeception\Util\Locator;
86
use Yandex\Allure\Adapter\Annotation\Features;
97
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -26,15 +24,7 @@ class ActionGroupWithDataOverrideTestCest
2624
*/
2725
public function _before(AcceptanceTester $I)
2826
{
29-
$I->comment("[createPersonParam] create 'ReplacementPerson' entity");
30-
PersistedObjectHandler::getInstance()->createEntity(
31-
"createPersonParam",
32-
"hook",
33-
"ReplacementPerson",
34-
[],
35-
[]
36-
);
37-
27+
$I->createEntity("createPersonParam", "hook", "ReplacementPerson", [], []); // stepKey: createPersonParam
3828
$I->comment("Entering Action Group [beforeGroup] FunctionalActionGroup");
3929
$I->fillField("#foo", "myData1"); // stepKey: fillField1BeforeGroup
4030
$I->fillField("#bar", "myData2"); // stepKey: fillField2BeforeGroup

‎dev/tests/verification/Resources/ActionGroupWithDataTest.txt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
5-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
6-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
75
use \Codeception\Util\Locator;
86
use Yandex\Allure\Adapter\Annotation\Features;
97
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -26,15 +24,7 @@ class ActionGroupWithDataTestCest
2624
*/
2725
public function _before(AcceptanceTester $I)
2826
{
29-
$I->comment("[createPersonParam] create 'ReplacementPerson' entity");
30-
PersistedObjectHandler::getInstance()->createEntity(
31-
"createPersonParam",
32-
"hook",
33-
"ReplacementPerson",
34-
[],
35-
[]
36-
);
37-
27+
$I->createEntity("createPersonParam", "hook", "ReplacementPerson", [], []); // stepKey: createPersonParam
3828
$I->comment("Entering Action Group [beforeGroup] FunctionalActionGroup");
3929
$I->fillField("#foo", "myData1"); // stepKey: fillField1BeforeGroup
4030
$I->fillField("#bar", "myData2"); // stepKey: fillField2BeforeGroup

‎dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
namespace Magento\AcceptanceTest\_default\Backend;
33

44
use Magento\FunctionalTestingFramework\AcceptanceTester;
5-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
6-
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
75
use \Codeception\Util\Locator;
86
use Yandex\Allure\Adapter\Annotation\Features;
97
use Yandex\Allure\Adapter\Annotation\Stories;

0 commit comments

Comments
 (0)