Skip to content

Commit e87c464

Browse files
tomreecetomreece
committed
Merge branch 'sprint-develop' into MQE-421
2 parents 8a112cd + 6a17e5e commit e87c464

38 files changed

+919
-11
lines changed

‎.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,10 @@ php:
33
- 7.0
44
- 7.1
55
install: composer install --no-interaction --prefer-source
6+
env:
7+
matrix:
8+
- VERIFICATION_TOOL=copyright-check
9+
- VERIFICATION_TOOL=phpunit-checks
10+
- VERIFICATION_TOOL=static-checks
611
script:
7-
- vendor/bin/phpcs ./src --standard=./dev/tests/static/Magento
12+
- bin/$VERIFICATION_TOOL

‎composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"codeception/codeception": "2.2|2.3",
99
"flow/jsonpath": ">0.2",
1010
"fzaninotto/faker": "^1.6",
11-
"mustache/mustache": "~2.5"
11+
"mustache/mustache": "~2.5",
12+
"epfremme/swagger-php": "^2.0"
1213
},
1314
"require-dev": {
1415
"squizlabs/php_codesniffer": "1.5.3",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8+
use \Codeception\Util\Locator;
89
use Yandex\Allure\Adapter\Annotation\Features;
910
use Yandex\Allure\Adapter\Annotation\Stories;
1011
use Yandex\Allure\Adapter\Annotation\Title;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8+
use \Codeception\Util\Locator;
89
use Yandex\Allure\Adapter\Annotation\Features;
910
use Yandex\Allure\Adapter\Annotation\Stories;
1011
use Yandex\Allure\Adapter\Annotation\Title;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8+
use \Codeception\Util\Locator;
89
use Yandex\Allure\Adapter\Annotation\Features;
910
use Yandex\Allure\Adapter\Annotation\Stories;
1011
use Yandex\Allure\Adapter\Annotation\Title;

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

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<?php
2+
namespace Magento\AcceptanceTest\_generated\Backend;
3+
4+
use Magento\FunctionalTestingFramework\AcceptanceTester;
5+
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
6+
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
7+
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8+
use \Codeception\Util\Locator;
9+
use Yandex\Allure\Adapter\Annotation\Features;
10+
use Yandex\Allure\Adapter\Annotation\Stories;
11+
use Yandex\Allure\Adapter\Annotation\Title;
12+
use Yandex\Allure\Adapter\Annotation\Description;
13+
use Yandex\Allure\Adapter\Annotation\Parameter;
14+
use Yandex\Allure\Adapter\Annotation\Severity;
15+
use Yandex\Allure\Adapter\Model\SeverityLevel;
16+
use Yandex\Allure\Adapter\Annotation\TestCaseId;
17+
18+
/**
19+
*/
20+
class LocatorFunctionCest
21+
{
22+
/**
23+
* @Parameter(name = "AcceptanceTester", value="$I")
24+
* @param AcceptanceTester $I
25+
* @return void
26+
*/
27+
public function LocatorFuctionTest(AcceptanceTester $I)
28+
{
29+
$I->amGoingTo("create entity that has the mergeKey: data");
30+
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
31+
$data = new DataPersistenceHandler($ReplacementPerson);
32+
$data->createEntity();
33+
$I->click(Locator::contains("'label'", "'Name'"));
34+
$I->click(Locator::contains("'label'", "'Name'"));
35+
$I->click(Locator::find("'img'", ['title' => 'diagram']));
36+
$I->click(Locator::contains("string", "'Name'"));
37+
$I->click(Locator::contains("John", "'Name'"));
38+
$I->click(Locator::contains($data->getCreatedDataByName('key') . "", "'Name'"));
39+
$I->click(Locator::contains("string1", "string2"));
40+
$I->click(Locator::contains("John", "Doe"));
41+
$I->click(Locator::contains($data->getCreatedDataByName('key1') . "", "" . $data->getCreatedDataByName('key2')));
42+
$I->click(Locator::contains("string1", "John"));
43+
$I->click(Locator::contains("string1", "" . $data->getCreatedDataByName('key1')));
44+
$I->click(Locator::contains("John", "" . $data->getCreatedDataByName('key1')));
45+
}
46+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8+
use \Codeception\Util\Locator;
89
use Yandex\Allure\Adapter\Annotation\Features;
910
use Yandex\Allure\Adapter\Annotation\Stories;
1011
use Yandex\Allure\Adapter\Annotation\Title;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8+
use \Codeception\Util\Locator;
89
use Yandex\Allure\Adapter\Annotation\Features;
910
use Yandex\Allure\Adapter\Annotation\Stories;
1011
use Yandex\Allure\Adapter\Annotation\Title;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8+
use \Codeception\Util\Locator;
89
use Yandex\Allure\Adapter\Annotation\Features;
910
use Yandex\Allure\Adapter\Annotation\Stories;
1011
use Yandex\Allure\Adapter\Annotation\Title;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8+
use \Codeception\Util\Locator;
89
use Yandex\Allure\Adapter\Annotation\Features;
910
use Yandex\Allure\Adapter\Annotation\Stories;
1011
use Yandex\Allure\Adapter\Annotation\Title;

0 commit comments

Comments
 (0)