Skip to content

Commit fb4cb78

Browse files
anupdugaranupdugar
committed
Merge remote-tracking branch 'remotes/upstream/develop' into MAGETWO-31613-UpgradeZf1-1.12.10
2 parents 1bbfbe8 + 9a7c0a4 commit fb4cb78

File tree

296 files changed

+6946
-904
lines changed

Some content is hidden

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

296 files changed

+6946
-904
lines changed

‎app/code/Magento/Review/view/frontend/templates/review.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
?>
77

8-
<div id="product-review-container"></div>
8+
<div id="product-review-container" data-role="product-review"></div>
99
<?php echo $block->getChildHtml(); ?>
1010

1111
<script>
@@ -19,7 +19,7 @@
1919
dataType: 'html'
2020
}).done(function (data) {
2121
$('#product-review-container').html(data);
22-
$('.pages a').each(function (index, element) {
22+
$('[data-role="product-review"] .pages a').each(function (index, element) {
2323
$(element).click(function (event) {
2424
processReviews($(element).attr('href'), true);
2525
event.preventDefault();

‎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-rc15",
3+
"magento/mtf": "1.0.0-rc16",
44
"php": "~5.5.0|~5.6.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2",

‎dev/tests/functional/config/application.yml.dist

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

‎dev/tests/functional/config/handler.yml.dist

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

‎dev/tests/functional/config/install_data.yml.dist

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

‎dev/tests/functional/config/isolation.yml.dist

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

‎dev/tests/functional/config/server.yml.dist

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

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="config.xsd">
9+
<application>
10+
<reopenBrowser>testCase</reopenBrowser>
11+
<backendLogin>admin</backendLogin>
12+
<backendPassword>123123q</backendPassword>
13+
<appBackendUrl>http://magento.dev/backend/</appBackendUrl>
14+
<backendLoginUrl>admin</backendLoginUrl>
15+
</application>
16+
<install>
17+
<host>127.0.0.1</host>
18+
<user>root</user>
19+
<password>123123q</password>
20+
<dbName>default</dbName>
21+
<baseUrl>http://127.0.0.1/magento2/</baseUrl>
22+
<backendName>backend</backendName>
23+
</install>
24+
</config>

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

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
9+
<xs:element name="config">
10+
<xs:complexType>
11+
<xs:all>
12+
<xs:element name="application" maxOccurs="1" minOccurs="0">
13+
<xs:complexType>
14+
<xs:sequence>
15+
<xs:choice maxOccurs="unbounded">
16+
<xs:element name="reopenBrowser" type="reopenBrowserType"/>
17+
<xs:element name="backendLogin" type="backendLoginType" />
18+
<xs:element name="backendPassword" type="backendPasswordType" />
19+
<xs:element name="backendLoginUrl" type="backendLoginUrlType" />
20+
<xs:element name="appBackendUrl" type="appBackendUrlType" />
21+
</xs:choice>
22+
</xs:sequence>
23+
</xs:complexType>
24+
</xs:element>
25+
<xs:element name="isolation" maxOccurs="1" minOccurs="0">
26+
<xs:complexType>
27+
<xs:sequence>
28+
<xs:choice maxOccurs="unbounded">
29+
<xs:element name="resetUrlPath" type="notEmptyType"/>
30+
<xs:element name="testSuite" type="isolationModeType" />
31+
<xs:element name="testCase" type="isolationModeType" />
32+
<xs:element name="test" type="isolationModeType" />
33+
</xs:choice>
34+
</xs:sequence>
35+
</xs:complexType>
36+
</xs:element>
37+
<xs:element name="server" minOccurs="0">
38+
<xs:complexType>
39+
<xs:sequence>
40+
<xs:choice maxOccurs="unbounded" minOccurs="1">
41+
<xs:element name="item" type="serverItemType"/>
42+
</xs:choice>
43+
</xs:sequence>
44+
</xs:complexType>
45+
</xs:element>
46+
<xs:element name="install" minOccurs="0" maxOccurs="1">
47+
<xs:complexType>
48+
<xs:sequence>
49+
<xs:choice maxOccurs="unbounded">
50+
<xs:element name="host" type="notEmptyType"/>
51+
<xs:element name="user" type="notEmptyType" />
52+
<xs:element name="password" type="notEmptyType" />
53+
<xs:element name="dbName" type="notEmptyType" />
54+
<xs:element name="baseUrl" type="notEmptyType" />
55+
<xs:element name="backendName" type="notEmptyType" />
56+
</xs:choice>
57+
</xs:sequence>
58+
</xs:complexType>
59+
</xs:element>
60+
</xs:all>
61+
</xs:complexType>
62+
</xs:element>
63+
<xs:simpleType name="reopenBrowserType">
64+
<xs:restriction base="xs:string">
65+
<xs:pattern value="testCase|test"/>
66+
</xs:restriction>
67+
</xs:simpleType>
68+
<xs:simpleType name="backendLoginType">
69+
<xs:restriction base="xs:string">
70+
<xs:minLength value="1"/>
71+
</xs:restriction>
72+
</xs:simpleType>
73+
<xs:simpleType name="backendLoginUrlType">
74+
<xs:restriction base="xs:string">
75+
<xs:minLength value="1"/>
76+
</xs:restriction>
77+
</xs:simpleType>
78+
<xs:simpleType name="appBackendUrlType">
79+
<xs:restriction base="xs:string">
80+
<xs:minLength value="1"/>
81+
</xs:restriction>
82+
</xs:simpleType>
83+
<xs:simpleType name="backendPasswordType">
84+
<xs:restriction base="xs:string">
85+
<xs:minLength value="1"/>
86+
</xs:restriction>
87+
</xs:simpleType>
88+
<xs:simpleType name="notEmptyType">
89+
<xs:restriction base="xs:string">
90+
<xs:minLength value="1"/>
91+
</xs:restriction>
92+
</xs:simpleType>
93+
<xs:simpleType name="isolationModeType">
94+
<xs:restriction base="xs:string">
95+
<xs:pattern value="none|before|after|both"/>
96+
</xs:restriction>
97+
</xs:simpleType>
98+
<xs:simpleType name="serverTypeType">
99+
<xs:restriction base="xs:string">
100+
<xs:pattern value="default"/>
101+
</xs:restriction>
102+
</xs:simpleType>
103+
<xs:simpleType name="portType">
104+
<xs:restriction base="xs:int"/>
105+
</xs:simpleType>
106+
<xs:simpleType name="timeoutType">
107+
<xs:restriction base="xs:int">
108+
</xs:restriction>
109+
</xs:simpleType>
110+
<xs:complexType name="serverItemType">
111+
<xs:choice>
112+
<xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" />
113+
</xs:choice>
114+
<xs:attribute name="type" type="serverTypeType" use="optional"/>
115+
<xs:attribute name="name" type="xs:string" use="required"/>
116+
<xs:attribute name="browser" type="notEmptyType"/>
117+
<xs:attribute name="browserName" type="notEmptyType"/>
118+
<xs:attribute name="host" type="notEmptyType"/>
119+
<xs:attribute name="port" type="portType"/>
120+
<xs:attribute name="seleniumServerRequestsTimeout" type="timeoutType" use="optional"/>
121+
<xs:attribute name="sessionStrategy" type="notEmptyType" use="optional"/>
122+
</xs:complexType>
123+
<xs:simpleType name="enableDisableType">
124+
<xs:restriction base="xs:string">
125+
<xs:pattern value="false|true"/>
126+
</xs:restriction>
127+
</xs:simpleType>
128+
<xs:complexType name="specificModuleType">
129+
<xs:sequence>
130+
<xs:choice>
131+
<xs:element name="module" type="notEmptyType" maxOccurs="unbounded"/>
132+
</xs:choice>
133+
</xs:sequence>
134+
<xs:attribute name="enabled" type="enableDisableType"/>
135+
</xs:complexType>
136+
</xs:schema>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@
88
<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" />
11+
<virtualType name="Magento\Mtf\Config\SchemaLocator\Config" type="Magento\Mtf\Config\SchemaLocator">
12+
<arguments>
13+
<argument name="schemaPath" xsi:type="string">etc/global/config.xsd</argument>
14+
</arguments>
15+
</virtualType>
1116
</config>

0 commit comments

Comments
 (0)