Skip to content

Commit 7402791

Browse files
author
Dmytro Aponasenko
committed
MTA-1602: Sync qmt repository with mainline - Sprint 6
1 parent 6325f9d commit 7402791

File tree

43 files changed

+127
-144
lines changed

Some content is hidden

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

43 files changed

+127
-144
lines changed

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

‎dev/tests/functional/tests/app/Magento/Catalog/Test/etc/constraint.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
<constraint name="assertProductAttributeIsUsedPromoRules" module="Magento_Catalog" severity="low"/>
120120
<constraint name="assertProductAttributeIsUsedInSortOnFrontend" module="Magento_Catalog" severity="low"/>
121121
<constraint name="assertProductAttributeIsGlobal" module="Magento_Catalog" severity="low"/>
122-
<constraint name="assertCrossSellsProductsSection" module="Magento_Catalog" severity="middle">
122+
<constraint name="assertProductCrossSells" module="Magento_Catalog" severity="middle">
123123
<argument name="product1">Magento\Catalog\Test\Fixture\CatalogProductSimple</argument>
124124
<argument name="product2">Magento\Catalog\Test\Fixture\CatalogProductSimple</argument>
125125
<argument name="cmsIndex">Magento\Cms\Test\Page\CmsIndex</argument>
@@ -128,25 +128,25 @@
128128
<argument name="checkoutCart">Magento\Checkout\Test\Page\CheckoutCart</argument>
129129
</constraint>
130130
<constraint name="assertProductAttributeSuccessDeleteMessage" module="Magento_Catalog" severity="high"/>
131-
<constraint name="assertNoCrossSellsProductsSection" module="Magento_Catalog" severity="middle"/>
132-
<constraint name="assertRelatedProductsSection" module="Magento_Catalog" severity="middle">
131+
<constraint name="assertProductAbsentCrossSells" module="Magento_Catalog" severity="middle"/>
132+
<constraint name="assertProductRelatedProducts" module="Magento_Catalog" severity="middle">
133133
<argument name="product1">Magento\Catalog\Test\Fixture\CatalogProductSimple</argument>
134134
<argument name="product2">Magento\Catalog\Test\Fixture\CatalogProductSimple</argument>
135135
<argument name="cmsIndex">Magento\Cms\Test\Page\CmsIndex</argument>
136136
<argument name="catalogCategoryView">Magento\Catalog\Test\Page\Category\CatalogCategoryView</argument>
137137
<argument name="catalogProductView">Magento\Catalog\Test\Page\Product\CatalogProductView</argument>
138138
</constraint>
139-
<constraint name="assertProductAttributeAbsenceInGrid" module="Magento_Catalog" severity="high"/>
140-
<constraint name="assertNoRelatedProductsSection" module="Magento_Catalog" severity="middle"/>
141-
<constraint name="assertUpSellsProductsSection" module="Magento_Catalog" severity="middle">
139+
<constraint name="assertProductAbsentRelatedProducts" module="Magento_Catalog" severity="middle"/>
140+
<constraint name="assertProductUpSells" module="Magento_Catalog" severity="middle">
142141
<argument name="product1">Magento\Catalog\Test\Fixture\CatalogProductSimple</argument>
143142
<argument name="product2">Magento\Catalog\Test\Fixture\CatalogProductSimple</argument>
144143
<argument name="cmsIndex">Magento\Cms\Test\Page\CmsIndex</argument>
145144
<argument name="catalogCategoryView">Magento\Catalog\Test\Page\Category\CatalogCategoryView</argument>
146145
<argument name="catalogProductView">Magento\Catalog\Test\Page\Product\CatalogProductView</argument>
147146
</constraint>
147+
<constraint name="assertProductAbsentUpSells" module="Magento_Catalog" severity="middle"/>
148+
<constraint name="assertProductAttributeAbsenceInGrid" module="Magento_Catalog" severity="high"/>
148149
<constraint name="assertProductAttributeAbsenceInSearchOnProductForm" module="Magento_Catalog" severity="high"/>
149-
<constraint name="assertNoUpSellsProductsSection" module="Magento_Catalog" severity="middle"/>
150150
<constraint name="assertCategorySaveMessage" module="Magento_Catalog" severity="low"/>
151151
<constraint name="assertCategoryForm" module="Magento_Catalog" severity="low"/>
152152
<constraint name="assertCategoryPage" module="Magento_Catalog" severity="low"/>

‎dev/tests/functional/tests/app/Magento/Core/Test/Constraint/AssertCustomVariableNotInCmsPageForm.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Magento\Core\Test\Constraint;
88

9-
use Magento\Cms\Test\Page\Adminhtml\CmsNew;
9+
use Magento\Cms\Test\Page\Adminhtml\CmsPageNew;
1010
use Magento\Core\Test\Fixture\SystemVariable;
1111
use Magento\Mtf\Constraint\AbstractConstraint;
1212

@@ -22,17 +22,17 @@ class AssertCustomVariableNotInCmsPageForm extends AbstractConstraint
2222
/**
2323
* Assert that custom system variable not in cms page form
2424
*
25-
* @param CmsNew $cmsNewPage
25+
* @param CmsPageNew $cmsPageNew
2626
* @param SystemVariable $systemVariable
2727
* @return void
2828
*/
2929
public function processAssert(
30-
CmsNew $cmsNewPage,
30+
CmsPageNew $cmsPageNew,
3131
SystemVariable $systemVariable
3232
) {
3333
$customVariableName = $systemVariable->getName();
34-
$cmsNewPage->open();
35-
$cmsPageForm = $cmsNewPage->getPageForm();
34+
$cmsPageNew->open();
35+
$cmsPageForm = $cmsPageNew->getPageForm();
3636
$variables = $cmsPageForm->getSystemVariables();
3737

3838
\PHPUnit_Framework_Assert::assertFalse(

‎dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Magento\Checkout\Test\Page\CheckoutOnepage;
1111
use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
1212
use Magento\Customer\Test\Fixture\Customer;
13-
use Magento\Sales\Test\Page\OrderView;
13+
use Magento\Sales\Test\Page\CustomerOrderView;
1414
use Magento\Mtf\Fixture\InjectableFixture;
1515
use Magento\Tax\Test\Constraint\AbstractAssertTaxCalculationAfterCheckout;
1616

@@ -34,7 +34,7 @@ abstract class AbstractAssertTaxCalculationAfterCheckoutDownloadable extends Abs
3434
* @param CheckoutCart $checkoutCart
3535
* @param CheckoutOnepage $checkoutOnepage
3636
* @param CheckoutOnepageSuccess $checkoutOnepageSuccess
37-
* @param OrderView $orderView
37+
* @param CustomerOrderView $customerOrderView
3838
* @return void
3939
*/
4040
public function processAssert(
@@ -43,10 +43,10 @@ public function processAssert(
4343
CheckoutCart $checkoutCart,
4444
CheckoutOnepage $checkoutOnepage,
4545
CheckoutOnepageSuccess $checkoutOnepageSuccess,
46-
OrderView $orderView
46+
CustomerOrderView $customerOrderView
4747
) {
4848
$this->checkoutOnepage = $checkoutOnepage;
49-
$this->orderView = $orderView;
49+
$this->customerOrderView = $customerOrderView;
5050

5151
$checkoutCart->getProceedToCheckoutBlock()->proceedToCheckout();
5252
$checkoutOnepage->getBillingBlock()->clickContinue();

‎dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingIncludingTax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function getReviewTotals($actualPrices)
4848
*/
4949
public function getOrderTotals($actualPrices)
5050
{
51-
$viewBlock = $this->orderView->getOrderViewBlock();
51+
$viewBlock = $this->customerOrderView->getOrderViewBlock();
5252
$actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotalExclTax();
5353
$actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotalInclTax();
5454
$actualPrices['discount'] = $viewBlock->getDiscount();

‎dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableExcludingTax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function getReviewTotals($actualPrices)
5050
*/
5151
public function getOrderTotals($actualPrices)
5252
{
53-
$viewBlock = $this->orderView->getOrderViewBlock();
53+
$viewBlock = $this->customerOrderView->getOrderViewBlock();
5454
$actualPrices['subtotal_excl_tax'] = $viewBlock->getSubtotal();
5555
$actualPrices['subtotal_incl_tax'] = null;
5656

‎dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AssertTaxCalculationAfterCheckoutDownloadableIncludingTax.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function getReviewTotals($actualPrices)
4848
*/
4949
public function getOrderTotals($actualPrices)
5050
{
51-
$viewBlock = $this->orderView->getOrderViewBlock();
51+
$viewBlock = $this->customerOrderView->getOrderViewBlock();
5252
$actualPrices['subtotal_excl_tax'] = null;
5353
$actualPrices['subtotal_incl_tax'] = $viewBlock->getSubtotal();
5454
$actualPrices['discount'] = $viewBlock->getDiscount();

‎dev/tests/functional/tests/app/Magento/GiftMessage/Test/Block/Adminhtml/Order/View/Items/ItemProduct.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/**
1313
* Class ItemProduct
14-
* Item product block on OrderView page.
14+
* Item product block on SalesOrderView page.
1515
*/
1616
class ItemProduct extends \Magento\Sales\Test\Block\Adminhtml\Order\Create\Items\ItemProduct
1717
{

‎dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInBackendOrder.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ class AssertGiftMessageInBackendOrder extends AbstractAssertForm
3737
* Assert that message from dataSet is displayed on order(s) view page on backend.
3838
*
3939
* @param GiftMessage $giftMessage
40-
* @param SalesOrderView $orderView
40+
* @param SalesOrderView $salesOrderView
4141
* @param OrderIndex $orderIndex
4242
* @param array $products
4343
* @param string $orderId
4444
* @return void
4545
*/
4646
public function processAssert(
4747
GiftMessage $giftMessage,
48-
SalesOrderView $orderView,
48+
SalesOrderView $salesOrderView,
4949
OrderIndex $orderIndex,
5050
array $products,
5151
$orderId
@@ -54,13 +54,13 @@ public function processAssert(
5454

5555
if ($giftMessage->getAllowGiftMessagesForOrder()) {
5656
$expectedData[] = $giftMessage->getData();
57-
$actualData[] = $orderView->getGiftOptionsBlock()->getData($giftMessage);
57+
$actualData[] = $salesOrderView->getGiftOptionsBlock()->getData($giftMessage);
5858
}
5959

6060
if ($giftMessage->getAllowGiftOptionsForItems()) {
6161
foreach ($products as $key => $product) {
6262
$expectedData[] = $giftMessage->getItems()[$key]->getData();
63-
$actualData[] = $orderView->getGiftItemsBlock()->getItemProduct($product)
63+
$actualData[] = $salesOrderView->getGiftItemsBlock()->getItemProduct($product)
6464
->getGiftMessageFormData($giftMessage);
6565
}
6666
}

‎dev/tests/functional/tests/app/Magento/GiftMessage/Test/Constraint/AssertGiftMessageInFrontendOrder.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
use Magento\Customer\Test\Page\CustomerAccountLogout;
1111
use Magento\GiftMessage\Test\Fixture\GiftMessage;
1212
use Magento\Sales\Test\Page\OrderHistory;
13-
use Magento\Sales\Test\Page\OrderView;
13+
use Magento\Sales\Test\Page\SalesOrderView;
1414
use Magento\Mtf\Constraint\AbstractConstraint;
1515

1616
/**
@@ -29,7 +29,7 @@ class AssertGiftMessageInFrontendOrder extends AbstractConstraint
2929
* @param GiftMessage $giftMessage
3030
* @param Customer $customer
3131
* @param OrderHistory $orderHistory
32-
* @param OrderView $orderView
32+
* @param SalesOrderView $salesOrderView
3333
* @param CustomerAccountLogout $customerAccountLogout
3434
* @param string $orderId
3535
* @return void
@@ -38,7 +38,7 @@ public function processAssert(
3838
GiftMessage $giftMessage,
3939
Customer $customer,
4040
OrderHistory $orderHistory,
41-
OrderView $orderView,
41+
SalesOrderView $salesOrderView,
4242
CustomerAccountLogout $customerAccountLogout,
4343
$orderId
4444
) {
@@ -57,7 +57,7 @@ public function processAssert(
5757

5858
\PHPUnit_Framework_Assert::assertEquals(
5959
$expectedData,
60-
$orderView->getGiftMessageForOrderBlock()->getGiftMessage(),
60+
$salesOrderView->getGiftMessageForOrderBlock()->getGiftMessage(),
6161
'Wrong gift message is displayed on order.'
6262
);
6363
$customerAccountLogout->open();

0 commit comments

Comments
 (0)