Merge remote-tracking branch 'remotes/upstream/develop' into MAGETWO-…

…31613-UpgradeZf1-1.12.10
magento · Feb 10, 2015 · fb4cb78 · fb4cb78
2 parents 1bbfbe8 + 9a7c0a4
commit fb4cb78
Show file tree

Hide file tree

Showing 296 changed files with 6,946 additions and 904 deletions.
diff --git a/app/code/Magento/Review/view/frontend/templates/review.phtml b/app/code/Magento/Review/view/frontend/templates/review.phtml
@@ -5,7 +5,7 @@
  */
 ?>
 
-<div id="product-review-container"></div>
+<div id="product-review-container" data-role="product-review"></div>
 <?php echo $block->getChildHtml(); ?>
 
 <script>
@@ -19,7 +19,7 @@
                 dataType: 'html'
             }).done(function (data) {
                 $('#product-review-container').html(data);
-                $('.pages a').each(function (index, element) {
+                $('[data-role="product-review"] .pages a').each(function (index, element) {
                     $(element).click(function (event) {
                         processReviews($(element).attr('href'), true);
                         event.preventDefault();

diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
@@ -1,6 +1,6 @@
 {
     "require": {
-        "magento/mtf": "1.0.0-rc15",
+        "magento/mtf": "1.0.0-rc16",
         "php": "~5.5.0|~5.6.0",
         "phpunit/phpunit": "4.1.0",
         "phpunit/phpunit-selenium": ">=1.2",

diff --git a/dev/tests/functional/config/application.yml.dist b/dev/tests/functional/config/application.yml.dist
diff --git a/dev/tests/functional/config/handler.yml.dist b/dev/tests/functional/config/handler.yml.dist
diff --git a/dev/tests/functional/config/install_data.yml.dist b/dev/tests/functional/config/install_data.yml.dist
diff --git a/dev/tests/functional/config/isolation.yml.dist b/dev/tests/functional/config/isolation.yml.dist
diff --git a/dev/tests/functional/config/server.yml.dist b/dev/tests/functional/config/server.yml.dist
diff --git a/dev/tests/functional/etc/global/config.xml b/dev/tests/functional/etc/global/config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="config.xsd">
+    <application>
+        <reopenBrowser>testCase</reopenBrowser>
+        <backendLogin>admin</backendLogin>
+        <backendPassword>123123q</backendPassword>
+        <appBackendUrl>http://magento.dev/backend/</appBackendUrl>
+        <backendLoginUrl>admin</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>
+        <backendName>backend</backendName>
+    </install>
+</config>
diff --git a/dev/tests/functional/etc/global/config.xsd b/dev/tests/functional/etc/global/config.xsd
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="config">
+        <xs:complexType>
+            <xs:all>
+                <xs:element name="application" maxOccurs="1" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:choice maxOccurs="unbounded">
+                                <xs:element name="reopenBrowser" type="reopenBrowserType"/>
+                                <xs:element name="backendLogin" type="backendLoginType" />
+                                <xs:element name="backendPassword" type="backendPasswordType" />
+                                <xs:element name="backendLoginUrl" type="backendLoginUrlType" />
+                                <xs:element name="appBackendUrl" type="appBackendUrlType" />
+                            </xs:choice>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="isolation" maxOccurs="1" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:choice maxOccurs="unbounded">
+                                <xs:element name="resetUrlPath" type="notEmptyType"/>
+                                <xs:element name="testSuite" type="isolationModeType" />
+                                <xs:element name="testCase" type="isolationModeType" />
+                                <xs:element name="test" type="isolationModeType" />
+                            </xs:choice>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="server" minOccurs="0">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:choice maxOccurs="unbounded" minOccurs="1">
+                                <xs:element name="item" type="serverItemType"/>
+                            </xs:choice>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+                <xs:element name="install" minOccurs="0" maxOccurs="1">
+                    <xs:complexType>
+                        <xs:sequence>
+                            <xs:choice maxOccurs="unbounded">
+                                <xs:element name="host" type="notEmptyType"/>
+                                <xs:element name="user" type="notEmptyType" />
+                                <xs:element name="password" type="notEmptyType" />
+                                <xs:element name="dbName" type="notEmptyType" />
+                                <xs:element name="baseUrl" type="notEmptyType" />
+                                <xs:element name="backendName" type="notEmptyType" />
+                            </xs:choice>
+                        </xs:sequence>
+                    </xs:complexType>
+                </xs:element>
+            </xs:all>
+        </xs:complexType>
+    </xs:element>
+    <xs:simpleType name="reopenBrowserType">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="testCase|test"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="backendLoginType">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="backendLoginUrlType">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="appBackendUrlType">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="backendPasswordType">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="notEmptyType">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="isolationModeType">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="none|before|after|both"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="serverTypeType">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="default"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="portType">
+        <xs:restriction base="xs:int"/>
+    </xs:simpleType>
+    <xs:simpleType name="timeoutType">
+        <xs:restriction base="xs:int">
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="serverItemType">
+        <xs:choice>
+            <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+        </xs:choice>
+        <xs:attribute name="type" type="serverTypeType" use="optional"/>
+        <xs:attribute name="name" type="xs:string" use="required"/>
+        <xs:attribute name="browser" type="notEmptyType"/>
+        <xs:attribute name="browserName" type="notEmptyType"/>
+        <xs:attribute name="host" type="notEmptyType"/>
+        <xs:attribute name="port" type="portType"/>
+        <xs:attribute name="seleniumServerRequestsTimeout" type="timeoutType" use="optional"/>
+        <xs:attribute name="sessionStrategy" type="notEmptyType" use="optional"/>
+    </xs:complexType>
+    <xs:simpleType name="enableDisableType">
+        <xs:restriction base="xs:string">
+            <xs:pattern value="false|true"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="specificModuleType">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="module" type="notEmptyType" maxOccurs="unbounded"/>
+            </xs:choice>
+        </xs:sequence>
+        <xs:attribute name="enabled" type="enableDisableType"/>
+    </xs:complexType>
+</xs:schema>
diff --git a/dev/tests/functional/etc/global/di.xml b/dev/tests/functional/etc/global/di.xml
@@ -8,4 +8,9 @@
 <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>
+        </arguments>
+    </virtualType>
 </config>
diff --git a/dev/tests/functional/etc/global/variations.xsd b/dev/tests/functional/etc/global/variations.xsd
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+    <xs:element name="config">
+        <xs:annotation>
+            <xs:documentation>
+                The root element for configuration data.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="testCase" maxOccurs="unbounded" minOccurs="1">
+                    <xs:annotation>
+                        <xs:documentation>
+                            An element that contains configuration data of a test case.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:element>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="testCase">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="variation" maxOccurs="unbounded" minOccurs="1">
+                    <xs:annotation>
+                        <xs:documentation>
+                            An element that contains configuration data of a test case variation.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:element>
+            </xs:sequence>
+            <xs:attribute type="xs:string" name="name" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="variation">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element ref="data" maxOccurs="unbounded" minOccurs="1">
+                    <xs:annotation>
+                        <xs:documentation>
+                            An element that contains a single configuration data set of a test case variation.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:element>
+            </xs:sequence>
+            <xs:attribute type="xs:string" name="name" use="required"/>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:element name="data">
+        <xs:complexType>
+            <xs:simpleContent>
+                <xs:extension base="xs:string">
+                    <xs:attribute type="xs:string" name="name" use="required"/>
+                </xs:extension>
+            </xs:simpleContent>
+        </xs:complexType>
+    </xs:element>
+</xs:schema>
diff --git a/dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php b/dev/tests/functional/lib/Magento/Mtf/ObjectManagerFactory.php
@@ -64,26 +64,6 @@ public function create(array $sharedInstances = [])
         return $objectManager;
     }
 
-    /**
-     * Create instance of application deployment config
-     *
-     * @param \Magento\Framework\App\Filesystem\DirectoryList $directoryList
-     * @param array $arguments
-     * @return \Magento\Framework\App\DeploymentConfig
-     */
-    protected function createDeploymentConfig(
-        \Magento\Framework\App\Filesystem\DirectoryList $directoryList,
-        array $arguments
-    ) {
-        $data = isset($arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE])
-            ? $arguments[\Magento\Framework\App\Arguments\Loader::PARAM_CUSTOM_FILE]
-            : null;
-        return new \Magento\Framework\App\DeploymentConfig(
-            new \Magento\Framework\App\DeploymentConfig\Reader($directoryList),
-            $data
-        );
-    }
-
     /**
      * Return newly created instance on an argument interpreter, suitable for processing DI arguments
      *

diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/AbstractFactory.php
@@ -171,7 +171,11 @@ protected function collectItems($type)
                     );
                     foreach ($dirIterator as $info) {
                         /** @var $info \SplFileInfo */
-                        $this->_processItem($items, $rewrites, $info->getRealPath(), $location, $path);
+                        $realPath = $info->getPathname();
+                        if (is_link($realPath)) {
+                            $realPath = readlink($realPath);
+                        }
+                        $this->_processItem($items, $rewrites, $realPath, $location, $path);
                     }
                 }
             }

diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/CollectionProvider.php b/dev/tests/functional/lib/Magento/Mtf/Util/Generate/Repository/CollectionProvider.php
@@ -20,7 +20,7 @@ class CollectionProvider implements CollectionProviderInterface
     protected $objectManager;
 
     /**
-     * Magetno resource instance.
+     * Magento resource instance.
      *
      * @var \Magento\Framework\App\Resource
      */