Skip to content

Commit

Permalink
Merge pull request #93 from magento-firedrakes/config2
Browse files Browse the repository at this point in the history
[Firedrakes] MTF Page and Constraint Configuration
  • Loading branch information
sivaschenko committed Feb 16, 2015
2 parents 8ce0b8d + efd58a2 commit 6c53c3e
Show file tree
Hide file tree
Showing 437 changed files with 9,687 additions and 11,729 deletions.
2 changes: 1 addition & 1 deletion dev/tests/functional/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"magento/mtf": "1.0.0-rc16",
"magento/mtf": "1.0.0-rc17",
"php": "~5.5.0|~5.6.0",
"phpunit/phpunit": "4.1.0",
"phpunit/phpunit-selenium": ">=1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
<reopenBrowser>testCase</reopenBrowser>
<backendLogin>admin</backendLogin>
<backendPassword>123123q</backendPassword>
<appBackendUrl>http://magento.dev/backend/</appBackendUrl>
<backendLoginUrl>admin</backendLoginUrl>
<appBackendUrl>http://magento2ce.com/admin/</appBackendUrl>
<backendLoginUrl>admin/auth/login</backendLoginUrl>
</application>
<install>
<host>127.0.0.1</host>
<user>root</user>
<password>123123q</password>
<dbName>default</dbName>
<baseUrl>http://127.0.0.1/magento2/</baseUrl>
<baseUrl>http://magento2ce.com/</baseUrl>
<backendName>backend</backendName>
</install>
</config>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
* See COPYING.txt for license details.
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../lib/internal/Magento/Framework/ObjectManager/etc/config.xsd">
<preference for="Magento\Mtf\Util\Generate\Fixture\FieldsProviderInterface" type="Magento\Mtf\Util\Generate\Fixture\FieldsProvider" />
<preference for="Magento\Mtf\Util\Generate\Repository\CollectionProviderInterface" type="Magento\Mtf\Util\Generate\Repository\CollectionProvider" />
<virtualType name="Magento\Mtf\Config\SchemaLocator\Config" type="Magento\Mtf\Config\SchemaLocator">
<arguments>
<argument name="schemaPath" xsi:type="string">etc/global/config.xsd</argument>
<argument name="schemaPath" xsi:type="string">etc/config.xsd</argument>
</arguments>
</virtualType>
</config>
File renamed without changes.
File renamed without changes.
67 changes: 0 additions & 67 deletions dev/tests/functional/etc/global/variations.xsd

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
<?xml version="1.0" ?>
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page mca="admin/cache/" module="Magento_Backend">
<blocks>
<messagesBlock>
<class>Magento\Core\Test\Block\Messages</class>
<locator>#messages .messages</locator>
<strategy>css selector</strategy>
</messagesBlock>
<actionsBlock>
<class>Magento\Backend\Test\Block\Cache</class>
<locator>div.page-actions</locator>
<strategy>css selector</strategy>
</actionsBlock>
</blocks>
</page>
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="AdminCache" area="Adminhtml" mca="admin/cache/" module="Magento_Backend">
<block name="messagesBlock" class="Magento\Core\Test\Block\Messages" locator="#messages .messages" strategy="css selector"/>
<block name="actionsBlock" class="Magento\Backend\Test\Block\Cache" locator="div.page-actions" strategy="css selector"/>
</page>
</config>
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,13 @@
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page mca="admin/dashboard" module="Magento_Backend">
<blocks>
<adminPanelHeader>
<class>Magento\Backend\Test\Block\Page\Header</class>
<locator>.page-header</locator>
<strategy>css selector</strategy>
</adminPanelHeader>
<titleBlock>
<class>Magento\Theme\Test\Block\Html\Title</class>
<locator>.page-title</locator>
<strategy>css selector</strategy>
</titleBlock>
<mainBlock>
<class>Magento\Backend\Test\Block\Page\Main</class>
<locator>.dashboard-main</locator>
<strategy>css selector</strategy>
</mainBlock>
<menuBlock>
<class>Magento\Backend\Test\Block\Menu</class>
<locator>.navigation</locator>
<strategy>css selector</strategy>
</menuBlock>
<storeStatsBlock>
<class>Magento\Backend\Test\Block\Dashboard\StoreStats</class>
<locator>.dashboard-store-stats</locator>
<strategy>css selector</strategy>
</storeStatsBlock>
</blocks>
</page>
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="Dashboard" area="Adminhtml" mca="admin/dashboard" module="Magento_Backend">
<block name="adminPanelHeader" class="Magento\Backend\Test\Block\Page\Header" locator=".page-header" strategy="css selector"/>
<block name="titleBlock" class="Magento\Theme\Test\Block\Html\Title" locator=".page-title" strategy="css selector"/>
<block name="mainBlock" class="Magento\Backend\Test\Block\Page\Main" locator=".dashboard-main" strategy="css selector"/>
<block name="menuBlock" class="Magento\Backend\Test\Block\Menu" locator=".navigation" strategy="css selector"/>
<block name="storeStatsBlock" class="Magento\Backend\Test\Block\Dashboard\StoreStats" locator=".dashboard-store-stats" strategy="css selector"/>
</page>
</config>
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
<?xml version="1.0" ?>
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page mca="system_store/deleteGroup" module="Magento_Backend">
<blocks>
<deleteGroupForm>
<class>Magento\Backend\Test\Block\System\Store\Delete\Form</class>
<locator>#edit_form</locator>
<strategy>css selector</strategy>
</deleteGroupForm>
<formPageActions>
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
<locator>.page-main-actions</locator>
<strategy>css selector</strategy>
</formPageActions>
</blocks>
</page>
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="DeleteGroup" area="Adminhtml" mca="system_store/deleteGroup" module="Magento_Backend">
<block name="deleteGroupForm" class="Magento\Backend\Test\Block\System\Store\Delete\Form" locator="#edit_form" strategy="css selector"/>
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
</page>
</config>
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
<?xml version="1.0" ?>
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page mca="system_store/deleteWebsite" module="Magento_Backend">
<blocks>
<deleteWebsiteForm>
<class>Magento\Backend\Test\Block\System\Store\Delete\Form</class>
<locator>#edit_form</locator>
<strategy>css selector</strategy>
</deleteWebsiteForm>
<formPageActions>
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
<locator>.page-main-actions</locator>
<strategy>css selector</strategy>
</formPageActions>
</blocks>
</page>
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="DeleteWebsite" area="Adminhtml" mca="system_store/deleteWebsite" module="Magento_Backend">
<block name="deleteWebsiteForm" class="Magento\Backend\Test\Block\System\Store\Delete\Form" locator="#edit_form" strategy="css selector"/>
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
</page>
</config>
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
<?xml version="1.0" ?>
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page mca="system_store/editGroup" module="Magento_Backend">
<blocks>
<formPageActions>
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
<locator>.page-main-actions</locator>
<strategy>css selector</strategy>
</formPageActions>
<editFormGroup>
<class>Magento\Backend\Test\Block\System\Store\Edit\Form\GroupForm</class>
<locator>#edit_form</locator>
<strategy>css selector</strategy>
</editFormGroup>
</blocks>
</page>
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="EditGroup" area="Adminhtml" mca="system_store/editGroup" module="Magento_Backend">
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
<block name="editFormGroup" class="Magento\Backend\Test\Block\System\Store\Edit\Form\GroupForm" locator="#edit_form" strategy="css selector"/>
</page>
</config>
Original file line number Diff line number Diff line change
@@ -1,26 +1,14 @@
<?xml version="1.0" ?>
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page mca="admin/system_store/editStore" module="Magento_Backend">
<blocks>
<formPageActions>
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
<locator>.page-main-actions</locator>
<strategy>css selector</strategy>
</formPageActions>
<storeForm>
<class>Magento\Backend\Test\Block\System\Store\Edit\Form\StoreForm</class>
<locator>[id="page:main-container"]</locator>
<strategy>css selector</strategy>
</storeForm>
<messagesBlock>
<class>Magento\Core\Test\Block\Messages</class>
<locator>#messages</locator>
<strategy>css selector</strategy>
</messagesBlock>
</blocks>
</page>
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="EditStore" area="Adminhtml" mca="admin/system_store/editStore" module="Magento_Backend">
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
<block name="storeForm" class="Magento\Backend\Test\Block\System\Store\Edit\Form\StoreForm" locator="[id='page:main-container']" strategy="css selector"/>
<block name="messagesBlock" class="Magento\Core\Test\Block\Messages" locator="#messages" strategy="css selector"/>
</page>
</config>
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
<?xml version="1.0" ?>
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page mca="system_store/editWebsite" module="Magento_Backend">
<blocks>
<formPageActions>
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
<locator>.page-main-actions</locator>
<strategy>css selector</strategy>
</formPageActions>
<editFormWebsite>
<class>Magento\Backend\Test\Block\System\Store\Edit\Form\WebsiteForm</class>
<locator>#edit_form</locator>
<strategy>css selector</strategy>
</editFormWebsite>
</blocks>
</page>
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="EditWebsite" area="Adminhtml" mca="system_store/editWebsite" module="Magento_Backend">
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
<block name="editFormWebsite" class="Magento\Backend\Test\Block\System\Store\Edit\Form\WebsiteForm" locator="#edit_form" strategy="css selector"/>
</page>
</config>
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
<?xml version="1.0" ?>
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page mca="system_store/newGroup/index" module="Magento_Backend">
<blocks>
<formPageActions>
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
<locator>.page-main-actions</locator>
<strategy>css selector</strategy>
</formPageActions>
<editFormGroup>
<class>Magento\Backend\Test\Block\System\Store\Edit\Form\GroupForm</class>
<locator>#edit_form</locator>
<strategy>css selector</strategy>
</editFormGroup>
</blocks>
</page>
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="NewGroupIndex" area="Adminhtml" mca="system_store/newGroup/index" module="Magento_Backend">
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
<block name="editFormGroup" class="Magento\Backend\Test\Block\System\Store\Edit\Form\GroupForm" locator="#edit_form" strategy="css selector"/>
</page>
</config>
Original file line number Diff line number Diff line change
@@ -1,21 +1,13 @@
<?xml version="1.0" ?>
<?xml version="1.0" encoding="utf-8"?>
<!--
/**
* Copyright © 2015 Magento. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<page mca="system_store/newWebsite/index" module="Magento_Backend">
<blocks>
<formPageActions>
<class>Magento\Backend\Test\Block\System\Store\FormPageActions</class>
<locator>.page-main-actions</locator>
<strategy>css selector</strategy>
</formPageActions>
<editWebsiteForm>
<class>Magento\Backend\Test\Block\System\Store\Edit\Form\WebsiteForm</class>
<locator>#edit_form</locator>
<strategy>css selector</strategy>
</editWebsiteForm>
</blocks>
</page>
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
<page name="NewWebsiteIndex" area="Adminhtml" mca="system_store/newWebsite/index" module="Magento_Backend">
<block name="formPageActions" class="Magento\Backend\Test\Block\System\Store\FormPageActions" locator=".page-main-actions" strategy="css selector"/>
<block name="editWebsiteForm" class="Magento\Backend\Test\Block\System\Store\Edit\Form\WebsiteForm" locator="#edit_form" strategy="css selector"/>
</page>
</config>
Loading

0 comments on commit 6c53c3e

Please sign in to comment.