Skip to content

Commit d87e9ab

Browse files
author
Oleksandr Manchenko
committed
MTA-548: Re-factor Tests for Create Products
- Renamed product fixtures
1 parent 85476e7 commit d87e9ab

File tree

54 files changed

+151
-151
lines changed

Some content is hidden

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

54 files changed

+151
-151
lines changed

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnCreationTest/test.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"configurable";"catalogProductVirtual::default";"assertProductSaveMessage, assertProductInGrid"
66
"virtual";"catalogProductSimple::default";"assertProductSaveMessage, assertProductInGrid"
77
"virtual";"configurableProduct::not_virtual_for_type_switching";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately"
8-
"virtual";"downloadableProductInjectable::default";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock"
8+
"virtual";"downloadableProduct::default";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock"
99
"downloadable";"catalogProductSimple::default";"assertProductSaveMessage, assertProductInGrid"
1010
"downloadable";"configurableProduct::not_virtual_for_type_switching";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertConfigurableProductInCart, assertChildProductIsNotDisplayedSeparately"

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/ProductTypeSwitchingOnUpdateTest/test.csv

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"configurableProduct::default";"catalogProductVirtual::default";"deleteAttributes";"assertProductSaveMessage, assertProductInGrid"
66
"catalogProductVirtual::default";"catalogProductSimple::default";"-";"assertProductSaveMessage, assertProductInGrid"
77
"catalogProductVirtual::default";"configurableProduct::not_virtual_for_type_switching";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately"
8-
"catalogProductVirtual::default";"downloadableProductInjectable::default";"-";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock, assertDownloadableLinksData"
9-
"downloadableProductInjectable::default";"catalogProductSimple::default";"-";"assertProductSaveMessage, assertProductInGrid"
10-
"downloadableProductInjectable::default";"configurableProduct::not_virtual_for_type_switching";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately"
11-
"downloadableProductInjectable::default";"catalogProductVirtual::default";"clearDownloadableData";"assertProductSaveMessage, assertProductInGrid"
12-
"catalogProductSimple::default";"downloadableProductInjectable::default";"-";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock, assertDownloadableLinksData"
8+
"catalogProductVirtual::default";"downloadableProduct::default";"-";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock, assertDownloadableLinksData"
9+
"downloadableProduct::default";"catalogProductSimple::default";"-";"assertProductSaveMessage, assertProductInGrid"
10+
"downloadableProduct::default";"configurableProduct::not_virtual_for_type_switching";"-";"assertProductSaveMessage, assertProductInGrid, assertChildProductsInGrid, assertConfigurableProductForm, assertConfigurableProductPage, assertProductInStock, assertChildProductIsNotDisplayedSeparately"
11+
"downloadableProduct::default";"catalogProductVirtual::default";"clearDownloadableData";"assertProductSaveMessage, assertProductInGrid"
12+
"catalogProductSimple::default";"downloadableProduct::default";"-";"assertProductSaveMessage, assertProductInGrid, assertDownloadableProductForm, assertProductPage, assertProductInStock, assertDownloadableLinksData"

‎dev/tests/functional/tests/app/Magento/CatalogSearch/Test/TestCase/SearchEntityResultsTest/test.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"Search simple product";"catalogProductSimple::default::simple";"assertCatalogSearchResult";""
44
"Search virtual product";"catalogProductVirtual::default::virtual";"assertCatalogSearchResult";""
55
"Search configurable product";"configurableProduct::default::configurable";"assertCatalogSearchResult";""
6-
"Search downloadable product";"downloadableProductInjectable::default::downloadable";"assertCatalogSearchResult";""
7-
"Search grouped product";"groupedProductInjectable::default::grouped";"assertCatalogSearchResult";""
6+
"Search downloadable product";"downloadableProduct::default::downloadable";"assertCatalogSearchResult";""
7+
"Search grouped product";"groupedProduct::default::grouped";"assertCatalogSearchResult";""
88
"Search bundle dynamic product";"bundleProduct::bundle_dynamic_product::bundle";"assertCatalogSearchResult";""
99
"Search fixed product";"bundleProduct::bundle_fixed_product::bundle";"assertCatalogSearchResult";""

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest/test.csv

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"catalogProductSimple::with_two_custom_option";"340";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";""
55
"catalogProductVirtual::product_50_dollar";"50";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";""
66
"configurableProduct::default";"516";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";""
7-
"downloadableProductInjectable::with_two_separately_links";"46";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";"Bug: MAGETWO-24195"
8-
"groupedProductInjectable::three_simple_products";"1920";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";""
9-
"catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProductInjectable::with_two_separately_links, groupedProductInjectable::three_simple_products, configurableProduct::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product";"3249";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";"Bug: MAGETWO-24195"
7+
"downloadableProduct::with_two_separately_links";"46";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";"Bug: MAGETWO-24195"
8+
"groupedProduct::three_simple_products";"1920";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";""
9+
"catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProduct::with_two_separately_links, groupedProduct::three_simple_products, configurableProduct::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product";"3249";"assertPriceInShoppingCart, assertProductQtyInShoppingCart, assertSubtotalInShoppingCart, assertCartItemsOptions, assertGrandTotalInShoppingCart";"Bug: MAGETWO-24195"

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/DeleteProductsFromShoppingCartTest/test.csv

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
"catalogProductSimple::with_two_custom_option";"assertCartIsEmpty"
55
"catalogProductVirtual::product_50_dollar";"assertCartIsEmpty"
66
"configurableProduct::default";"assertCartIsEmpty"
7-
"downloadableProductInjectable::with_two_separately_links";"assertCartIsEmpty"
8-
"groupedProductInjectable::three_simple_products";"assertCartIsEmpty"
9-
"catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProductInjectable::with_two_separately_links, groupedProductInjectable::three_simple_products, configurableProduct::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product";"assertCartIsEmpty"
7+
"downloadableProduct::with_two_separately_links";"assertCartIsEmpty"
8+
"groupedProduct::three_simple_products";"assertCartIsEmpty"
9+
"catalogProductSimple::with_two_custom_option, catalogProductVirtual::product_50_dollar, downloadableProduct::with_two_separately_links, groupedProduct::three_simple_products, configurableProduct::default, bundleProduct::bundle_dynamic_product, bundleProduct::bundle_dynamic_product";"assertCartIsEmpty"

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/UpdateProductFromMiniShoppingCartEntityTest/test.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
"Update Simple";"catalogProductSimple::with_two_custom_option";"forUpdateMiniShoppingCart";"assertProductQtyInMiniShoppingCart, assertProductQtyInShoppingCart";""
33
"Update Configurable and verify previous product was updated to new one in shopping cart and mini shopping cart";"configurableProduct::default";"forUpdateMiniShoppingCart";"assertCartItemsOptions, assertProductQtyInMiniShoppingCart, assertProductQtyInShoppingCart, assertProductOptionsAbsentInShoppingCart";""
44
"Update Bundle and verify previous product was updated to new one in shopping cart and mini shopping cart";"bundleProduct::bundle_fixed_product";"forUpdateMiniShoppingCart";"assertCartItemsOptions, assertProductQtyInMiniShoppingCart, assertProductQtyInShoppingCart, assertProductOptionsAbsentInShoppingCart";""
5-
"Update Downloadable and check previous link was updated to new one in shopping cart and mini shopping cart";"downloadableProductInjectable::with_two_separately_links";"forUpdateMiniShoppingCart";"assertCartItemsOptions, assertProductQtyInMiniShoppingCart, assertProductQtyInShoppingCart, assertProductOptionsAbsentInShoppingCart";"Bug: MAGETWO-24195"
5+
"Update Downloadable and check previous link was updated to new one in shopping cart and mini shopping cart";"downloadableProduct::with_two_separately_links";"forUpdateMiniShoppingCart";"assertCartItemsOptions, assertProductQtyInMiniShoppingCart, assertProductQtyInShoppingCart, assertProductOptionsAbsentInShoppingCart";"Bug: MAGETWO-24195"

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

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

77
namespace Magento\Downloadable\Test\Block\Catalog\Product;
88

9-
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
9+
use Magento\Downloadable\Test\Fixture\DownloadableProduct;
1010
use Magento\Mtf\Client\Locator;
1111
use Magento\Mtf\Fixture\FixtureInterface;
1212

@@ -68,7 +68,7 @@ public function getDownloadableSamplesBlock()
6868
*/
6969
public function fillOptions(FixtureInterface $product)
7070
{
71-
/** @var DownloadableProductInjectable $product */
71+
/** @var DownloadableProduct $product */
7272
$productData = $product->getData();
7373
$downloadableLinks = isset($productData['downloadable_links']['downloadable']['link'])
7474
? $productData['downloadable_links']['downloadable']['link']

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Magento\Downloadable\Test\Constraint;
88

99
use Magento\Catalog\Test\Page\Product\CatalogProductView;
10-
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
10+
use Magento\Downloadable\Test\Fixture\DownloadableProduct;
1111
use Magento\Mtf\Client\BrowserInterface;
1212
use Magento\Mtf\Constraint\AbstractAssertForm;
1313

@@ -47,13 +47,13 @@ class AssertDownloadableLinksData extends AbstractAssertForm
4747
* Assert Link block for downloadable product on front-end
4848
*
4949
* @param CatalogProductView $catalogProductView
50-
* @param DownloadableProductInjectable $product
50+
* @param DownloadableProduct $product
5151
* @param BrowserInterface $browser
5252
* @return void
5353
*/
5454
public function processAssert(
5555
CatalogProductView $catalogProductView,
56-
DownloadableProductInjectable $product,
56+
DownloadableProduct $product,
5757
BrowserInterface $browser
5858
) {
5959
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
@@ -68,10 +68,10 @@ public function processAssert(
6868
/**
6969
* Prepare fixture data for verify
7070
*
71-
* @param DownloadableProductInjectable $product
71+
* @param DownloadableProduct $product
7272
* @return array
7373
*/
74-
protected function prepareFixtureData(DownloadableProductInjectable $product)
74+
protected function prepareFixtureData(DownloadableProduct $product)
7575
{
7676
$data = $this->sortDataByPath($product->getDownloadableLinks(), 'downloadable/link::sort_order');
7777

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

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

77
namespace Magento\Downloadable\Test\Constraint;
88

9-
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
9+
use Magento\Downloadable\Test\Fixture\DownloadableProduct;
1010
use Magento\Wishlist\Test\Constraint\AssertProductInCustomerWishlistOnBackendGrid;
1111
use Magento\Mtf\Fixture\FixtureInterface;
1212

@@ -24,7 +24,7 @@ class AssertDownloadableProductInCustomerWishlistOnBackendGrid extends AssertPro
2424
*/
2525
protected function prepareOptions(FixtureInterface $product)
2626
{
27-
/** @var DownloadableProductInjectable $product */
27+
/** @var DownloadableProduct $product */
2828
$productOptions = parent::prepareOptions($product);
2929
$checkoutData = $product->getCheckoutData()['options'];
3030
if (!empty($checkoutData['links'])) {

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Magento\Downloadable\Test\Constraint;
88

99
use Magento\Catalog\Test\Page\Product\CatalogProductView;
10-
use Magento\Downloadable\Test\Fixture\DownloadableProductInjectable;
10+
use Magento\Downloadable\Test\Fixture\DownloadableProduct;
1111
use Magento\Mtf\Client\BrowserInterface;
1212
use Magento\Mtf\Constraint\AbstractAssertForm;
1313

@@ -45,13 +45,13 @@ class AssertDownloadableSamplesData extends AbstractAssertForm
4545
* Assert Sample block for downloadable product on front-end
4646
*
4747
* @param CatalogProductView $productView
48-
* @param DownloadableProductInjectable $product
48+
* @param DownloadableProduct $product
4949
* @param BrowserInterface $browser
5050
* @return void
5151
*/
5252
public function processAssert(
5353
CatalogProductView $productView,
54-
DownloadableProductInjectable $product,
54+
DownloadableProduct $product,
5555
BrowserInterface $browser
5656
) {
5757
$browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
@@ -68,10 +68,10 @@ public function processAssert(
6868
/**
6969
* Prepare fixture data for verify
7070
*
71-
* @param DownloadableProductInjectable $product
71+
* @param DownloadableProduct $product
7272
* @return array
7373
*/
74-
protected function prepareFixtureData(DownloadableProductInjectable $product)
74+
protected function prepareFixtureData(DownloadableProduct $product)
7575
{
7676
$data = $this->sortDataByPath($product->getDownloadableSample(), 'downloadable/sample::sort_order');
7777

0 commit comments

Comments
 (0)