Skip to content

Commit 6c53c3e

Browse files
sivaschenkosivaschenko
committed
Merge pull request #93 from magento-firedrakes/config2
[Firedrakes] MTF Page and Constraint Configuration
2 parents 8ce0b8d + efd58a2 commit 6c53c3e

File tree

437 files changed

+9687
-11729
lines changed

Some content is hidden

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

437 files changed

+9687
-11729
lines changed

‎dev/tests/functional/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"magento/mtf": "1.0.0-rc16",
3+
"magento/mtf": "1.0.0-rc17",
44
"php": "~5.5.0|~5.6.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2",

‎dev/tests/functional/etc/global/config.xml renamed to ‎dev/tests/functional/etc/config.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
<reopenBrowser>testCase</reopenBrowser>
1111
<backendLogin>admin</backendLogin>
1212
<backendPassword>123123q</backendPassword>
13-
<appBackendUrl>http://magento.dev/backend/</appBackendUrl>
14-
<backendLoginUrl>admin</backendLoginUrl>
13+
<appBackendUrl>http://magento2ce.com/admin/</appBackendUrl>
14+
<backendLoginUrl>admin/auth/login</backendLoginUrl>
1515
</application>
1616
<install>
1717
<host>127.0.0.1</host>
1818
<user>root</user>
1919
<password>123123q</password>
2020
<dbName>default</dbName>
21-
<baseUrl>http://127.0.0.1/magento2/</baseUrl>
21+
<baseUrl>http://magento2ce.com/</baseUrl>
2222
<backendName>backend</backendName>
2323
</install>
2424
</config>

‎dev/tests/functional/etc/global/config.xsd renamed to ‎dev/tests/functional/etc/config.xsd

File renamed without changes.

‎dev/tests/functional/etc/global/di.xml renamed to ‎dev/tests/functional/etc/di.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
* See COPYING.txt for license details.
66
*/
77
-->
8-
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
99
<preference for="Magento\Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Magento\Mtf\Util\Generate\Fixture\FieldsProvider" />
1010
<preference for="Magento\Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Magento\Mtf\Util\Generate\Repository\CollectionProvider" />
1111
<virtualType name="Magento\Mtf\Config\SchemaLocator\Config" type="Magento\Mtf\Config\SchemaLocator">
1212
<arguments>
13-
<argument name="schemaPath" xsi:type="string">etc/global/config.xsd</argument>
13+
<argument name="schemaPath" xsi:type="string">etc/config.xsd</argument>
1414
</arguments>
1515
</virtualType>
1616
</config>

‎dev/tests/functional/etc/global/events.xml renamed to ‎dev/tests/functional/etc/events.xml

File renamed without changes.

‎dev/tests/functional/etc/global/events.xsd renamed to ‎dev/tests/functional/etc/events.xsd

File renamed without changes.

‎dev/tests/functional/etc/global/variations.xsd

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/AdminCache.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
/**
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<page mca="admin/cache/" module="Magento_Backend">
9-
<blocks>
10-
<messagesBlock>
11-
<class>Magento\Core\Test\Block\Messages</class>
12-
<locator>#messages .messages</locator>
13-
<strategy>css selector</strategy>
14-
</messagesBlock>
15-
<actionsBlock>
16-
<class>Magento\Backend\Test\Block\Cache</class>
17-
<locator>div.page-actions</locator>
18-
<strategy>css selector</strategy>
19-
</actionsBlock>
20-
</blocks>
21-
</page>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
9+
<page name="AdminCache" area="Adminhtml" mca="admin/cache/" module="Magento_Backend">
10+
<block name="messagesBlock" class="Magento\Core\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
11+
<block name="actionsBlock" class="Magento\Backend\Test\Block\Cache" locator="div.page-actions" strategy="css selector"/>
12+
</page>
13+
</config>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,13 @@
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<page mca="admin/dashboard" module="Magento_Backend">
9-
<blocks>
10-
<adminPanelHeader>
11-
<class>Magento\Backend\Test\Block\Page\Header</class>
12-
<locator>.page-header</locator>
13-
<strategy>css selector</strategy>
14-
</adminPanelHeader>
15-
<titleBlock>
16-
<class>Magento\Theme\Test\Block\Html\Title</class>
17-
<locator>.page-title</locator>
18-
<strategy>css selector</strategy>
19-
</titleBlock>
20-
<mainBlock>
21-
<class>Magento\Backend\Test\Block\Page\Main</class>
22-
<locator>.dashboard-main</locator>
23-
<strategy>css selector</strategy>
24-
</mainBlock>
25-
<menuBlock>
26-
<class>Magento\Backend\Test\Block\Menu</class>
27-
<locator>.navigation</locator>
28-
<strategy>css selector</strategy>
29-
</menuBlock>
30-
<storeStatsBlock>
31-
<class>Magento\Backend\Test\Block\Dashboard\StoreStats</class>
32-
<locator>.dashboard-store-stats</locator>
33-
<strategy>css selector</strategy>
34-
</storeStatsBlock>
35-
</blocks>
36-
</page>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
9+
<page name="Dashboard" area="Adminhtml" mca="admin/dashboard" module="Magento_Backend">
10+
<block name="adminPanelHeader" class="Magento\Backend\Test\Block\Page\Header" locator=".page-header" strategy="css selector"/>
11+
<block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".page-title" strategy="css selector"/>
12+
<block name="mainBlock" class="Magento\Backend\Test\Block\Page\Main" locator=".dashboard-main" strategy="css selector"/>
13+
<block name="menuBlock" class="Magento\Backend\Test\Block\Menu" locator=".navigation" strategy="css selector"/>
14+
<block name="storeStatsBlock" class="Magento\Backend\Test\Block\Dashboard\StoreStats" locator=".dashboard-store-stats" strategy="css selector"/>
15+
</page>
16+
</config>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteGroup.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
/**
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<page mca="system_store/deleteGroup" module="Magento_Backend">
9-
<blocks>
10-
<deleteGroupForm>
11-
<class>Magento\Backend\Test\Block\System\Store\Delete\Form</class>
12-
<locator>#edit_form</locator>
13-
<strategy>css selector</strategy>
14-
</deleteGroupForm>
15-
<formPageActions>
16-
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
17-
<locator>.page-main-actions</locator>
18-
<strategy>css selector</strategy>
19-
</formPageActions>
20-
</blocks>
21-
</page>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
9+
<page name="DeleteGroup" area="Adminhtml" mca="system_store/deleteGroup" module="Magento_Backend">
10+
<block name="deleteGroupForm" class="Magento\Backend\Test\Block\System\Store\Delete\Form" locator="#edit_form" strategy="css selector"/>
11+
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
12+
</page>
13+
</config>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/DeleteWebsite.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
/**
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<page mca="system_store/deleteWebsite" module="Magento_Backend">
9-
<blocks>
10-
<deleteWebsiteForm>
11-
<class>Magento\Backend\Test\Block\System\Store\Delete\Form</class>
12-
<locator>#edit_form</locator>
13-
<strategy>css selector</strategy>
14-
</deleteWebsiteForm>
15-
<formPageActions>
16-
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
17-
<locator>.page-main-actions</locator>
18-
<strategy>css selector</strategy>
19-
</formPageActions>
20-
</blocks>
21-
</page>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
9+
<page name="DeleteWebsite" area="Adminhtml" mca="system_store/deleteWebsite" module="Magento_Backend">
10+
<block name="deleteWebsiteForm" class="Magento\Backend\Test\Block\System\Store\Delete\Form" locator="#edit_form" strategy="css selector"/>
11+
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
12+
</page>
13+
</config>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditGroup.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
/**
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<page mca="system_store/editGroup" module="Magento_Backend">
9-
<blocks>
10-
<formPageActions>
11-
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
12-
<locator>.page-main-actions</locator>
13-
<strategy>css selector</strategy>
14-
</formPageActions>
15-
<editFormGroup>
16-
<class>Magento\Backend\Test\Block\System\Store\Edit\Form\GroupForm</class>
17-
<locator>#edit_form</locator>
18-
<strategy>css selector</strategy>
19-
</editFormGroup>
20-
</blocks>
21-
</page>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
9+
<page name="EditGroup" area="Adminhtml" mca="system_store/editGroup" module="Magento_Backend">
10+
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
11+
<block name="editFormGroup" class="Magento\Backend\Test\Block\System\Store\Edit\Form\GroupForm" locator="#edit_form" strategy="css selector"/>
12+
</page>
13+
</config>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditStore.xml

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
/**
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<page mca="admin/system_store/editStore" module="Magento_Backend">
9-
<blocks>
10-
<formPageActions>
11-
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
12-
<locator>.page-main-actions</locator>
13-
<strategy>css selector</strategy>
14-
</formPageActions>
15-
<storeForm>
16-
<class>Magento\Backend\Test\Block\System\Store\Edit\Form\StoreForm</class>
17-
<locator>[id="page:main-container"]</locator>
18-
<strategy>css selector</strategy>
19-
</storeForm>
20-
<messagesBlock>
21-
<class>Magento\Core\Test\Block\Messages</class>
22-
<locator>#messages</locator>
23-
<strategy>css selector</strategy>
24-
</messagesBlock>
25-
</blocks>
26-
</page>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
9+
<page name="EditStore" area="Adminhtml" mca="admin/system_store/editStore" module="Magento_Backend">
10+
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
11+
<block name="storeForm" class="Magento\Backend\Test\Block\System\Store\Edit\Form\StoreForm" locator="[id='page:main-container']" strategy="css selector"/>
12+
<block name="messagesBlock" class="Magento\Core\Test\Block\Messages" locator="#messages" strategy="css selector"/>
13+
</page>
14+
</config>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/EditWebsite.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
/**
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<page mca="system_store/editWebsite" module="Magento_Backend">
9-
<blocks>
10-
<formPageActions>
11-
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
12-
<locator>.page-main-actions</locator>
13-
<strategy>css selector</strategy>
14-
</formPageActions>
15-
<editFormWebsite>
16-
<class>Magento\Backend\Test\Block\System\Store\Edit\Form\WebsiteForm</class>
17-
<locator>#edit_form</locator>
18-
<strategy>css selector</strategy>
19-
</editFormWebsite>
20-
</blocks>
21-
</page>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
9+
<page name="EditWebsite" area="Adminhtml" mca="system_store/editWebsite" module="Magento_Backend">
10+
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
11+
<block name="editFormWebsite" class="Magento\Backend\Test\Block\System\Store\Edit\Form\WebsiteForm" locator="#edit_form" strategy="css selector"/>
12+
</page>
13+
</config>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/NewGroupIndex.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
/**
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<page mca="system_store/newGroup/index" module="Magento_Backend">
9-
<blocks>
10-
<formPageActions>
11-
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
12-
<locator>.page-main-actions</locator>
13-
<strategy>css selector</strategy>
14-
</formPageActions>
15-
<editFormGroup>
16-
<class>Magento\Backend\Test\Block\System\Store\Edit\Form\GroupForm</class>
17-
<locator>#edit_form</locator>
18-
<strategy>css selector</strategy>
19-
</editFormGroup>
20-
</blocks>
21-
</page>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
9+
<page name="NewGroupIndex" area="Adminhtml" mca="system_store/newGroup/index" module="Magento_Backend">
10+
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
11+
<block name="editFormGroup" class="Magento\Backend\Test\Block\System\Store\Edit\Form\GroupForm" locator="#edit_form" strategy="css selector"/>
12+
</page>
13+
</config>

‎dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/NewWebsiteIndex.xml

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
<?xml version="1.0" ?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
/**
44
* Copyright © 2015 Magento. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7-
-->
8-
<page mca="system_store/newWebsite/index" module="Magento_Backend">
9-
<blocks>
10-
<formPageActions>
11-
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
12-
<locator>.page-main-actions</locator>
13-
<strategy>css selector</strategy>
14-
</formPageActions>
15-
<editWebsiteForm>
16-
<class>Magento\Backend\Test\Block\System\Store\Edit\Form\WebsiteForm</class>
17-
<locator>#edit_form</locator>
18-
<strategy>css selector</strategy>
19-
</editWebsiteForm>
20-
</blocks>
21-
</page>
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
9+
<page name="NewWebsiteIndex" area="Adminhtml" mca="system_store/newWebsite/index" module="Magento_Backend">
10+
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
11+
<block name="editWebsiteForm" class="Magento\Backend\Test\Block\System\Store\Edit\Form\WebsiteForm" locator="#edit_form" strategy="css selector"/>
12+
</page>
13+
</config>

0 commit comments

Comments
 (0)