Skip to content
This repository was archived by the owner on Dec 19, 2019. It is now read-only.

Commit 6e49308

Browse files
authored
Merge pull request #1565 from magento-pangolin/sprint-develop
[Pangolins] Sprint 10 MQE-335 Headless Browser Spike MQE-415 Change required-entity's persistedKey in test schema to createDataKey MQE-352 Review and Update SampleCest.xml for added functionality MQE-428 Update Magento2 Acceptance Readme File
2 parents e0e5a93 + b63f9ef commit 6e49308

19 files changed

+93
-339
lines changed

dev/tests/acceptance/README.md

-270
This file was deleted.

dev/tests/acceptance/RoboFile.php

+14-4
Original file line numberDiff line numberDiff line change
@@ -44,39 +44,49 @@ function generateTests()
4444
}
4545

4646
/**
47-
* Run all Acceptance tests using the Chrome environment
47+
* Run all Functional tests using the Chrome environment
4848
*/
4949
function chrome()
5050
{
5151
$this->_exec('./vendor/bin/codecept run functional --env chrome --skip-group skip');
5252
}
5353

5454
/**
55-
* Run all Acceptance tests using the FireFox environment
55+
* Run all Functional tests using the FireFox environment
5656
*/
5757
function firefox()
5858
{
5959
$this->_exec('./vendor/bin/codecept run functional --env firefox --skip-group skip');
6060
}
6161

6262
/**
63-
* Run all Acceptance tests using the PhantomJS environment
63+
* Run all Functional tests using the PhantomJS environment
6464
*/
6565
function phantomjs()
6666
{
6767
$this->_exec('./vendor/bin/codecept run functional --env phantomjs --skip-group skip');
6868
}
6969

70+
/**
71+
* Run all Functional tests using the Chrome Headless environment
72+
*/
73+
function headless()
74+
{
75+
$this->_exec('./vendor/bin/codecept run functional --env headless --skip-group skip');
76+
}
77+
7078
/**
7179
* Run all Tests with the specified @group tag, excluding @group 'skip', using the Chrome environment
80+
* @param string $args
7281
*/
7382
function group($args = '')
7483
{
7584
$this->taskExec('./vendor/bin/codecept run functional --verbose --steps --env chrome --skip-group skip --group')->args($args)->run();
7685
}
7786

7887
/**
79-
* Run all Acceptance tests located under the Directory Path provided using the Chrome environment
88+
* Run all Functional tests located under the Directory Path provided using the Chrome environment
89+
* @param string $args
8090
*/
8191
function folder($args = '')
8292
{

dev/tests/acceptance/tests/functional.suite.dist.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ modules:
2626
\Magento\FunctionalTestingFramework\Module\MagentoWebDriver:
2727
url: "%MAGENTO_BASE_URL%"
2828
backend_name: admin
29-
browser: chrome
29+
browser: 'chrome'
3030
window_size: maximize
3131
username: "%MAGENTO_ADMIN_USERNAME%"
3232
password: "%MAGENTO_ADMIN_PASSWORD%"

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Backend/Cest/AdminLoginCest.xml

+6-5
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@
1212
<annotations>
1313
<features value="Admin Login"/>
1414
<stories value="Login on the Admin Login page"/>
15-
<group value="example"/>
16-
<group value="login"/>
17-
<env value="chrome"/>
18-
<env value="firefox"/>
19-
<env value="phantomjs"/>
2015
</annotations>
2116
<test name="LoginAsAdmin">
2217
<annotations>
2318
<title value="You should be able to log into the Magento Admin backend."/>
2419
<description value="You should be able to log into the Magento Admin backend."/>
2520
<severity value="CRITICAL"/>
2621
<testCaseId value="MAGETWO-71572"/>
22+
<group value="example"/>
23+
<group value="login"/>
24+
<env value="chrome"/>
25+
<env value="firefox"/>
26+
<env value="phantomjs"/>
27+
<env value="headless"/>
2728
</annotations>
2829
<amOnPage url="{{AdminLoginPage}}" mergeKey="amOnAdminLoginPage"/>
2930
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" mergeKey="fillUsername"/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Catalog/Cest/AdminCreateCategoryCest.xml

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@
1212
<annotations>
1313
<features value="Category Creation"/>
1414
<stories value="Create a Category via the Admin"/>
15-
<group value="category"/>
16-
<env value="chrome"/>
17-
<env value="firefox"/>
18-
<env value="phantomjs"/>
1915
</annotations>
2016
<after>
2117
<amOnPage url="admin/admin/auth/logout/" mergeKey="amOnLogoutPage"/>
@@ -26,6 +22,9 @@
2622
<description value="You should be able to create a Category in the admin back-end."/>
2723
<severity value="CRITICAL"/>
2824
<testCaseId value="MAGETWO-72102"/>
25+
<group value="category"/>
26+
<env value="chrome"/>
27+
<env value="headless"/>
2928
</annotations>
3029
<amOnPage url="{{AdminLoginPage}}" mergeKey="amOnAdminLoginPage"/>
3130
<fillField selector="{{AdminLoginFormSection.username}}" userInput="{{_ENV.MAGENTO_ADMIN_USERNAME}}" mergeKey="fillUsername"/>

0 commit comments

Comments
 (0)