Skip to content

Commit 6cd9ff7

Browse files
RuslanKostiv1RuslanKostiv1
committed
Merge remote-tracking branch 'mainline/develop' into NORD-PR-10
2 parents 274641e + 0f1af99 commit 6cd9ff7

40 files changed

+904
-174
lines changed

‎dev/tests/functional/lib/Magento/Mtf/Util/Command/Cli/Setup.php

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Mtf\Util\Command\Cli;
8+
9+
use Magento\Mtf\Util\Command\Cli;
10+
11+
/**
12+
* Setup Magento for tests executions.
13+
*/
14+
class Setup extends Cli
15+
{
16+
/**
17+
* Parameter for uninstall Magento command.
18+
*/
19+
const PARAM_SETUP_UNINSTALL = 'setup:uninstall';
20+
21+
/**
22+
* Options for uninstall Magento command.
23+
*
24+
* @var array
25+
*/
26+
private $options = ['-n'];
27+
28+
/**
29+
* Uninstall Magento.
30+
*
31+
* @return void
32+
*/
33+
public function uninstall()
34+
{
35+
parent::execute(Setup::PARAM_SETUP_UNINSTALL, $this->options);
36+
}
37+
}

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.php

-38
This file was deleted.

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Attribute.xml

-17
This file was deleted.

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/Tab/UpdateAttributeTab.php

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action\Tab;
8+
9+
use Magento\Mtf\Client\Element\SimpleElement;
10+
use Magento\Mtf\Client\Locator;
11+
use Magento\Backend\Test\Block\Widget\Tab;
12+
13+
/**
14+
* Tab on Product update attributes Form.
15+
*/
16+
class UpdateAttributeTab extends Tab
17+
{
18+
/**
19+
* Change checkbox.
20+
*
21+
* @var string
22+
*/
23+
private $changeCheckbox = [
24+
'selector' => './/./ancestor::div[contains(@class,"control")]'
25+
. '//input[@data-role="toggle-editability-all" or contains(@id, "toggle_")]',
26+
'strategy' => Locator::SELECTOR_XPATH,
27+
'input' => 'checkbox',
28+
'value' => 'Yes',
29+
];
30+
31+
/**
32+
* Fill data into fields in the container.
33+
*
34+
* @param array $fields
35+
* @param SimpleElement|null $contextElement
36+
* @return $this
37+
*/
38+
public function setFieldsData(array $fields, SimpleElement $contextElement = null)
39+
{
40+
$context = ($contextElement === null) ? $this->_rootElement : $contextElement;
41+
$mapping = $this->dataMapping($fields);
42+
foreach ($mapping as $field) {
43+
$this->_fill([$this->changeCheckbox], $context->find($field['selector'], $field['strategy']));
44+
$this->_fill([$field], $context);
45+
}
46+
47+
return $this;
48+
}
49+
}

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/UpdateAttributeForm.php

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action;
8+
9+
use Magento\Backend\Test\Block\Widget\FormTabs;
10+
11+
/**
12+
* Product update Attributes Form.
13+
*/
14+
class UpdateAttributeForm extends FormTabs
15+
{
16+
//
17+
}

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Edit/Action/UpdateAttributeForm.xml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" ?>
2+
<!--
3+
/**
4+
* Copyright © 2016 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tabs>
9+
<product-details>
10+
<class>Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action\Tab\UpdateAttributeTab</class>
11+
<selector>#attributes_update_tabs_attributes</selector>
12+
<fields>
13+
<price>
14+
<selector>#price</selector>
15+
</price>
16+
</fields>
17+
</product-details>
18+
<advanced-inventory>
19+
<class>Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action\Tab\UpdateAttributeTab</class>
20+
<selector>#attributes_update_tabs_inventory</selector>
21+
<fields>
22+
<stock_data>
23+
<selector>#inventory_stock_availability</selector>
24+
<input>select</input>
25+
</stock_data>
26+
</fields>
27+
</advanced-inventory>
28+
</tabs>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Grid.php

+8-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
namespace Magento\Catalog\Test\Block\Adminhtml\Product;
88

99
use Magento\Ui\Test\Block\Adminhtml\DataGrid;
10+
use Magento\Mtf\Fixture\FixtureInterface;
1011

1112
/**
1213
* Backend catalog product grid.
@@ -72,12 +73,17 @@ class Grid extends DataGrid
7273
/**
7374
* Update attributes for selected items.
7475
*
75-
* @param array $items [optional]
76+
* @param array $items
7677
* @return void
7778
*/
7879
public function updateAttributes(array $items = [])
7980
{
80-
$this->massaction($items, 'Update attributes');
81+
$products = [];
82+
/** @var FixtureInterface $product */
83+
foreach ($items as $product) {
84+
$products[] = ["sku" => $product->getSku()];
85+
}
86+
$this->massaction($products, 'Update attributes');
8187
}
8288

8389
/**

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertMassProductUpdateSuccessMessage.php

+3-4
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@ class AssertMassProductUpdateSuccessMessage extends AbstractConstraint
2323
* Assert that after mass update successful message appears.
2424
*
2525
* @param CatalogProductIndex $productGrid
26-
* @param array $products
26+
* @param int $productsCount
2727
* @return void
2828
*/
29-
public function processAssert(CatalogProductIndex $productGrid, $products = [])
29+
public function processAssert(CatalogProductIndex $productGrid, $productsCount)
3030
{
31-
$countProducts = count($products) ? count($products) : 1;
32-
$expectedMessage = sprintf(self::SUCCESS_MESSAGE, $countProducts);
31+
$expectedMessage = sprintf(self::SUCCESS_MESSAGE, $productsCount);
3332
$actualMessage = $productGrid->getMessagesBlock()->getSuccessMessage();
3433
\PHPUnit_Framework_Assert::assertEquals(
3534
$expectedMessage,

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductsInStock.php

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Catalog\Test\Constraint;
8+
9+
use Magento\Catalog\Test\Page\Product\CatalogProductView;
10+
use Magento\Mtf\Client\BrowserInterface;
11+
use Magento\Mtf\Constraint\AbstractConstraint;
12+
13+
/**
14+
* Assert that all products are in stock.
15+
*/
16+
class AssertProductsInStock extends AbstractConstraint
17+
{
18+
/**
19+
* Assert that In Stock status is displayed for products.
20+
*
21+
* @param CatalogProductView $catalogProductView
22+
* @param BrowserInterface $browser
23+
* @param AssertProductInStock $assertProductInStock
24+
* @param array $products
25+
* @return void
26+
*/
27+
public function processAssert(
28+
CatalogProductView $catalogProductView,
29+
BrowserInterface $browser,
30+
AssertProductInStock $assertProductInStock,
31+
array $products
32+
) {
33+
foreach ($products as $product) {
34+
$assertProductInStock->processAssert($catalogProductView, $browser, $product);
35+
}
36+
}
37+
38+
/**
39+
* Returns a string representation of the object.
40+
*
41+
* @return string
42+
*/
43+
public function toString()
44+
{
45+
return 'In stock control is visible for each product.';
46+
}
47+
}

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Page/Adminhtml/CatalogProductActionAttributeEdit.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/mtf/etc/pages.xsd">
99
<page name="CatalogProductActionAttributeEdit" area="Adminhtml" mca="catalog/product_action_attribute/edit" module="Magento_Catalog">
10-
<block name="attributesBlockForm" class="Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action\Attribute" locator="body" strategy="css selector" />
10+
<block name="attributesBlockForm" class="Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action\UpdateAttributeForm" locator="body" strategy="css selector" />
1111
<block name="formPageActions" class="Magento\Catalog\Test\Block\Adminhtml\Product\Edit\Action\FormPageActions" locator=".page-main-actions" strategy="css selector" />
1212
</page>
1313
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/Product/TierPrice.xml

+11
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,16 @@
6666
</item>
6767
</field>
6868
</dataset>
69+
70+
<dataset name="not_logged_in">
71+
<field name="0" xsi:type="array">
72+
<item name="price" xsi:type="string">90</item>
73+
<item name="website" xsi:type="string">All Websites [USD]</item>
74+
<item name="price_qty" xsi:type="string">2</item>
75+
<item name="customer_group" xsi:type="array">
76+
<item name="dataset" xsi:type="string">NOT_LOGGED_IN</item>
77+
</item>
78+
</field>
79+
</dataset>
6980
</repository>
7081
</config>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityTest.xml

+23-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
169169
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
170170
<data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
171-
<data name="product/data/price/value" xsi:type="string">10008</data>
171+
<data name="product/data/price/value" xsi:type="string">10008.88</data>
172172
<data name="product/data/short_description" xsi:type="string">Simple Product short_description %isolation%</data>
173173
<data name="product/data/description" xsi:type="string">Simple Product description %isolation%</data>
174174
<data name="product/data/weight" xsi:type="string">58</data>
@@ -461,6 +461,28 @@
461461
<data name="product/data/country_of_manufacture" xsi:type="string">Antarctica</data>
462462
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
463463
</variation>
464+
<variation name="CreateSimpleProductEntityTestVariation28" summary="Create product with tier price for not logged in customer">
465+
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
466+
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
467+
<data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
468+
<data name="product/data/price/value" xsi:type="string">100</data>
469+
<data name="product/data/weight" xsi:type="string">50</data>
470+
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">667</data>
471+
<data name="product/data/tier_price/dataset" xsi:type="string">not_logged_in</data>
472+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
473+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductTierPriceOnProductPage" />
474+
</variation>
475+
<variation name="CreateSimpleProductEntityTestVariation29" summary="Create Simple Product and assign it to custom website">
476+
<data name="product/data/url_key" xsi:type="string">simple-product-%isolation%</data>
477+
<data name="product/data/name" xsi:type="string">Simple Product %isolation%</data>
478+
<data name="product/data/sku" xsi:type="string">simple_sku_%isolation%</data>
479+
<data name="product/data/price/value" xsi:type="string">200.20</data>
480+
<data name="product/data/weight" xsi:type="string">50</data>
481+
<data name="product/data/quantity_and_stock_status/qty" xsi:type="string">668</data>
482+
<data name="product/data/website_ids/0/dataset" xsi:type="string">custom_store</data>
483+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
484+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductOnCustomWebsite" />
485+
</variation>
464486
<variation name="CreateSimpleProductEntityWithEmptySkuMaskTest1" summary="Create Simple Product Entity With Empty Sku Mask" ticketId="MAGETWO-58951">
465487
<data name="configData" xsi:type="string">empty_product_mask_sku</data>
466488
<data name="description" xsi:type="string">Create product with custom options(fixed price)</data>

0 commit comments

Comments
 (0)