Skip to content

Commit a7b4a10

Browse files
committed
MAGETWO-81736: Stabilization Jenkins on 2.1-develop
1 parent 10a6fbd commit a7b4a10

File tree

6 files changed

+19
-4
lines changed

6 files changed

+19
-4
lines changed

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Product/View.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,13 @@ class View extends AbstractConfigureBlock
201201
*/
202202
private $videoContainer = 'div.fotorama-video-container';
203203

204+
/**
205+
* Success message block after add to cart click.
206+
*
207+
* @var string
208+
*/
209+
private $addToCartSuccess = '.message-success';
210+
204211
/**
205212
* Get block price.
206213
*
@@ -247,6 +254,7 @@ public function addToCart(FixtureInterface $product)
247254
public function clickAddToCart()
248255
{
249256
$this->_rootElement->find($this->addToCart, Locator::SELECTOR_CSS)->click();
257+
$this->waitForElementVisible($this->addToCartSuccess);
250258
}
251259

252260
/**

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/EditShippingAddressOnePageCheckoutTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Checkout\Test\TestCase\EditShippingAddressOnePageCheckoutTest" summary="Customer can place order with new addresses that was edited during checkout with several conditions" ticketId="MAGETWO-71053">
1010
<variation name="EditShippingAddressOnePageCheckoutTestVariation1">
11-
<data name="tag" xsi:type="string">stable:no</data><!-- was severity:S1 -->
11+
<data name="tag" xsi:type="string">severity:S1</data>
1212
<data name="customer/dataset" xsi:type="string">johndoe_with_addresses</data>
1313
<data name="shippingAddress/dataset" xsi:type="string">UK_address_without_email</data>
1414
<data name="editShippingAddress/dataset" xsi:type="string">empty_UK_address_without_email</data>

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateAddressOnCheckoutWithMultipleAddressesTest.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Checkout\Test\TestCase\UpdateAddressOnCheckoutWithMultipleAddressesTest" summary="Check Addresses On Checkout With Multiple Addresses." ticketId="MAGETWO-64728">
1010
<variation name="UpdateAddressOnCheckoutWithMultipleAddressesTestVariation1">
11-
<data name="tag" xsi:type="string">stable:no</data>
1211
<data name="products" xsi:type="string">catalogProductSimple::default, catalogProductSimple::default</data>
1312
<data name="customer/dataset" xsi:type="string">johndoe_with_multiple_addresses</data>
1413
<constraint name="Magento\Multishipping\Test\Constraint\AssertMultishippingAddresses"/>

dev/tests/js/jasmine/require.conf.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@ require.config({
1616
]
1717
},
1818
paths: {
19-
'tests': 'dev/tests/js/jasmine'
19+
'tests': 'dev/tests/js/jasmine',
20+
'squire': 'node_modules/squirejs/src/Squire'
21+
},
22+
shim: {
23+
squire: {
24+
exports: 'squire'
25+
}
2026
},
2127
config: {
2228
jsbuild: {

dev/tests/js/jasmine/spec_runner/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@
5757
"^\/_SpecRunner.html",
5858
"^\/dev\/tests",
5959
"^\/.grunt",
60-
"^\/pub\/static"
60+
"^\/pub\/static",
61+
"^\/node_modules"
6162
],
6263
"options": {
6364
/**

package.json.sample

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"node-minify": "^1.0.1",
3535
"path": "^0.11.14",
3636
"serve-static": "^1.7.1",
37+
"squirejs": "0.2.1",
3738
"strip-json-comments": "^1.0.2",
3839
"time-grunt": "^1.0.0",
3940
"underscore": "^1.7.0"

0 commit comments

Comments
 (0)