Skip to content

Commit 9c98f61

Browse files
okolesnykokolesnyk
authored
Merge pull request #1388 from magento-qmt/Mavericks-PR
[Mavericks] Functional test fixes and grouping - MQE-191: [FT] AddCompareProductsTest test on variation AddCompareProductsTestVariation1 always failed on Bamboo - MQE-192: [FT] Magento\Catalog\Test\TestCase\ProductAttribute\CreateAttributeSetEntityTest fails - MQE-193: [FT] Does not wait for update totals in shopping cart - MQE-194: [FT] Magento\Cms\Test\TestCase\UpdateCmsPageEntityTest fails - MQE-209: [FT] Magento\Sales\Test\TestCase\CreateCreditMemoEntityTest fails randomly on Jenkins - MQE-221: [FT] Magento\SalesRule\Test\TestCase\CreateSalesRuleEntityTest fails on CI - MQE-130: [MTF1.0] Modify test grouping so that tests run around 10 minutes - MAGETWO-71259: [FT] Broken functional test Magento\ImportExport\Test\TestCase\ImportDataNegativeTest in 2.2
2 parents a716c96 + e8194fd commit 9c98f61

32 files changed

+1873
-1328
lines changed

‎dev/tests/functional/tests/app/Magento/AdvancedPricingImportExport/Test/TestCase/ImportDataNegativeTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</item>
3535
</data>
3636
<constraint name="Magento\ImportExport\Test\Constraint\AssertImportCheckDataErrorMessage" />
37-
<constraint name="Magento\AdvancedPricingImportExport\Test\Constraint\AssertImportCheckDataErrorMessagesList" />
37+
<constraint name="Magento\ImportExport\Test\Constraint\AssertImportCheckDataErrorMessagesList" />
3838
<constraint name="Magento\Catalog\Test\Constraint\AssertAdvancedPriceAbsentOnProductForm" />
3939
</variation>
4040
</testCase>

‎dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleDynamicProductEntityTest.php

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Bundle\Test\TestCase;
8+
9+
/**
10+
* Test Flow:
11+
* 1. Login as admin
12+
* 2. Navigate to the Products>Inventory>Catalog
13+
* 3. Click on "+" dropdown and select Bundle Product type
14+
* 4. Fill in all data according to data set
15+
* 5. Save product
16+
* 6. Verify created product
17+
*
18+
* @group Bundle_Product
19+
* @ZephyrId MAGETWO-24118
20+
*/
21+
class CreateBundleDynamicProductEntityTest extends CreateBundleProductEntityTest
22+
{
23+
/* tags */
24+
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
25+
const MVP = 'yes';
26+
/* end tags */
27+
28+
// This blank class is created only to run long variation as a separate test in parallel environment
29+
}

‎dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleDynamicProductEntityTest.xml

Lines changed: 275 additions & 0 deletions
Large diffs are not rendered by default.

‎dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml

Lines changed: 0 additions & 264 deletions
Large diffs are not rendered by default.

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateCategoryEntityFlatDataTest.xml

Lines changed: 2 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -22,49 +22,7 @@
2222
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryInNavigationMenu" />
2323
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
2424
</variation>
25-
<variation name="UpdateCategoryEntityFlatDataTestVariation2" summary="Inactive category and check that category is absent on frontend">
26-
<data name="initialCategory/dataset" xsi:type="string">default</data>
27-
<data name="category/data/is_active" xsi:type="string">No</data>
28-
<data name="indexers/0" xsi:type="string">Category Flat Data</data>
29-
<data name="indexersMode/0/indexer" xsi:type="string">category_flat_data</data>
30-
<data name="indexersMode/0/mode" xsi:type="string">schedule</data>
31-
<data name="firstStore/dataset" xsi:type="string">custom</data>
32-
<data name="secondStore/dataset" xsi:type="string">custom</data>
33-
<data name="configData" xsi:type="string">category_flat</data>
34-
<constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />
35-
<constraint name="Magento\Indexer\Test\Constraint\AssertIndexerStatus" />
36-
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryInNavigationMenu" />
37-
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryAbsenceOnFrontend" />
38-
</variation>
39-
<variation name="UpdateCategoryEntityFlatDataTestVariation3" summary="Inactive category and check that category is not active on frontend">
40-
<data name="initialCategory/dataset" xsi:type="string">default</data>
41-
<data name="initialCategory/data/is_active" xsi:type="string">No</data>
42-
<data name="category/data/is_active" xsi:type="string">No</data>
43-
<data name="indexers/0" xsi:type="string">Category Flat Data</data>
44-
<data name="indexersMode/0/indexer" xsi:type="string">category_flat_data</data>
45-
<data name="indexersMode/0/mode" xsi:type="string">schedule</data>
46-
<data name="firstStore/dataset" xsi:type="string">custom</data>
47-
<data name="secondStore/dataset" xsi:type="string">custom</data>
48-
<data name="configData" xsi:type="string">category_flat</data>
49-
<constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />
50-
<constraint name="Magento\Indexer\Test\Constraint\AssertIndexerStatus" />
51-
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryIsNotActive" />
52-
</variation>
53-
<variation name="UpdateCategoryEntityFlatDataTestVariation4" summary="Exclude category from navigation menu">
54-
<data name="initialCategory/dataset" xsi:type="string">default</data>
55-
<data name="category/data/include_in_menu" xsi:type="string">No</data>
56-
<data name="indexers/0" xsi:type="string">Category Flat Data</data>
57-
<data name="indexersMode/0/indexer" xsi:type="string">category_flat_data</data>
58-
<data name="indexersMode/0/mode" xsi:type="string">schedule</data>
59-
<data name="firstStore/dataset" xsi:type="string">custom</data>
60-
<data name="secondStore/dataset" xsi:type="string">custom</data>
61-
<data name="configData" xsi:type="string">category_flat</data>
62-
<constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />
63-
<constraint name="Magento\Indexer\Test\Constraint\AssertIndexerStatus" />
64-
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryInNavigationMenu" />
65-
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
66-
</variation>
67-
<variation name="UpdateCategoryEntityFlatDataTestVariation5" summary="Include category to navigation menu">
25+
<variation name="UpdateCategoryEntityFlatDataTestVariation2" summary="Include category to navigation menu">
6826
<data name="initialCategory/dataset" xsi:type="string">default</data>
6927
<data name="initialCategory/data/include_in_menu" xsi:type="string">No</data>
7028
<data name="category/data/include_in_menu" xsi:type="string">Yes</data>
@@ -78,7 +36,7 @@
7836
<constraint name="Magento\Indexer\Test\Constraint\AssertIndexerStatus" />
7937
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryInNavigationMenu" />
8038
</variation>
81-
<variation name="UpdateCategoryEntityFlatDataTestVariation6" summary="Update category and assert assigned products">
39+
<variation name="UpdateCategoryEntityFlatDataTestVariation3" summary="Update category and assert assigned products">
8240
<data name="initialCategory/dataset" xsi:type="string">default</data>
8341
<data name="category/data/category_products/dataset" xsi:type="string">catalogProductSimple::default</data>
8442
<data name="indexers/0" xsi:type="string">Category Flat Data</data>

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateInactiveCategoryEntityFlatDataTest.php

Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Catalog\Test\TestCase\Category;
8+
9+
use Magento\Catalog\Test\Fixture\Category;
10+
use Magento\Mtf\TestStep\TestStepFactory;
11+
use Magento\Mtf\Util\Command\Cli\Cron;
12+
use Magento\Mtf\Util\Command\Cli\Indexer;
13+
use Magento\Store\Test\Fixture\Store;
14+
15+
/**
16+
* Test Flow:
17+
* Preconditions:
18+
* 1. Create category.
19+
* 2. Create two stores.
20+
* 3. Set configuration settings.
21+
* 4. Run cron twice.
22+
* 5. Perform full reindex: "bin/magento indexer:reindex".
23+
*
24+
* Steps:
25+
* 1. Login as admin.
26+
* 2. Navigate Products->Categories.
27+
* 3. Open category created in preconditions.
28+
* 4. Update data according to data set.
29+
* 5. Save.
30+
* 6. Perform asserts.
31+
*
32+
* @group Category_Management
33+
* @ZephyrId MAGETWO-20169
34+
*/
35+
class UpdateInactiveCategoryEntityFlatDataTest extends UpdateCategoryEntityTest
36+
{
37+
/**
38+
* Factory for Test Steps.
39+
*
40+
* @var TestStepFactory
41+
*/
42+
private $stepFactory;
43+
44+
/**
45+
* Perform bin/magento commands for reindex indexers.
46+
*
47+
* @var Indexer
48+
*/
49+
private $indexer;
50+
51+
/**
52+
* Handle cron for tests executions.
53+
*
54+
* @var Cron
55+
*/
56+
private $cron;
57+
58+
/**
59+
* Configuration data.
60+
*
61+
* @var string
62+
*/
63+
private $configData;
64+
65+
/**
66+
* Prepare test data.
67+
*
68+
* @param Cron $cron
69+
* @param Indexer $indexer
70+
* @param TestStepFactory $stepFactory
71+
* @return void
72+
*/
73+
public function __prepare(Cron $cron, Indexer $indexer, TestStepFactory $stepFactory)
74+
{
75+
$this->cron = $cron;
76+
$this->indexer = $indexer;
77+
$this->stepFactory = $stepFactory;
78+
}
79+
80+
/**
81+
* Test for update category if use category flat.
82+
*
83+
* @param Category $category
84+
* @param Category $initialCategory
85+
* @param Store|null $firstStore
86+
* @param Store|null $secondStore
87+
* @param array|null $indexersMode
88+
* @param string|null $configData
89+
* @return array
90+
*/
91+
public function test(
92+
Category $category,
93+
Category $initialCategory,
94+
Store $firstStore = null,
95+
Store $secondStore = null,
96+
$indexersMode = null,
97+
$configData = null
98+
) {
99+
$this->configData = $configData;
100+
101+
//Preconditions
102+
$firstStore->persist();
103+
$secondStore->persist();
104+
$this->cron->run();
105+
$this->cron->run();
106+
107+
$this->stepFactory->create(
108+
\Magento\Config\Test\TestStep\SetupConfigurationStep::class,
109+
['configData' => $this->configData, 'flushCache' => true]
110+
)->run();
111+
112+
$this->indexer->setMode($indexersMode);
113+
$this->indexer->reindex();
114+
115+
return parent::test($category, $initialCategory);
116+
}
117+
118+
/**
119+
* Set default configuration.
120+
*
121+
* @return void
122+
*/
123+
public function tearDown()
124+
{
125+
$this->stepFactory->create(
126+
\Magento\Config\Test\TestStep\SetupConfigurationStep::class,
127+
['configData' => $this->configData, 'rollback' => true, 'flushCache' => true]
128+
)->run();
129+
$this->indexer->reindex();
130+
}
131+
}

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Category/UpdateInactiveCategoryEntityFlatDataTest.xml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. 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="../../../../../../../vendor/magento/mtf/etc/variations.xsd">
9+
<testCase name="Magento\Catalog\Test\TestCase\Category\UpdateInactiveCategoryEntityFlatDataTest" summary="Update Category if Use Category Flat (Cron is ON, 'Update on Save' Mode)" ticketId="MAGETWO-20169">
10+
<variation name="UpdateInactiveCategoryEntityFlatDataTestVariation1" summary="Inactive category and check that category is absent on frontend">
11+
<data name="initialCategory/dataset" xsi:type="string">default</data>
12+
<data name="category/data/is_active" xsi:type="string">No</data>
13+
<data name="indexers/0" xsi:type="string">Category Flat Data</data>
14+
<data name="indexersMode/0/indexer" xsi:type="string">category_flat_data</data>
15+
<data name="indexersMode/0/mode" xsi:type="string">schedule</data>
16+
<data name="firstStore/dataset" xsi:type="string">custom</data>
17+
<data name="secondStore/dataset" xsi:type="string">custom</data>
18+
<data name="configData" xsi:type="string">category_flat</data>
19+
<constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />
20+
<constraint name="Magento\Indexer\Test\Constraint\AssertIndexerStatus" />
21+
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryInNavigationMenu" />
22+
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryAbsenceOnFrontend" />
23+
</variation>
24+
<variation name="UpdateInactiveCategoryEntityFlatDataTestVariation2" summary="Inactive category and check that category is not active on frontend">
25+
<data name="initialCategory/dataset" xsi:type="string">default</data>
26+
<data name="initialCategory/data/is_active" xsi:type="string">No</data>
27+
<data name="category/data/is_active" xsi:type="string">No</data>
28+
<data name="indexers/0" xsi:type="string">Category Flat Data</data>
29+
<data name="indexersMode/0/indexer" xsi:type="string">category_flat_data</data>
30+
<data name="indexersMode/0/mode" xsi:type="string">schedule</data>
31+
<data name="firstStore/dataset" xsi:type="string">custom</data>
32+
<data name="secondStore/dataset" xsi:type="string">custom</data>
33+
<data name="configData" xsi:type="string">category_flat</data>
34+
<constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />
35+
<constraint name="Magento\Indexer\Test\Constraint\AssertIndexerStatus" />
36+
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryIsNotActive" />
37+
</variation>
38+
<variation name="UpdateInactiveCategoryEntityFlatDataTestVariation3" summary="Exclude category from navigation menu">
39+
<data name="initialCategory/dataset" xsi:type="string">default</data>
40+
<data name="category/data/include_in_menu" xsi:type="string">No</data>
41+
<data name="indexers/0" xsi:type="string">Category Flat Data</data>
42+
<data name="indexersMode/0/indexer" xsi:type="string">category_flat_data</data>
43+
<data name="indexersMode/0/mode" xsi:type="string">schedule</data>
44+
<data name="firstStore/dataset" xsi:type="string">custom</data>
45+
<data name="secondStore/dataset" xsi:type="string">custom</data>
46+
<data name="configData" xsi:type="string">category_flat</data>
47+
<constraint name="Magento\Catalog\Test\Constraint\AssertCategorySaveMessage" />
48+
<constraint name="Magento\Indexer\Test\Constraint\AssertIndexerStatus" />
49+
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryInNavigationMenu" />
50+
<constraint name="Magento\Catalog\Test\Constraint\AssertCategoryPage" />
51+
</variation>
52+
</testCase>
53+
</config>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
<variation name="AddCompareProductsTestVariation1">
1111
<data name="products" xsi:type="string">catalogProductSimple::simple_for_composite_products</data>
1212
<data name="isCustomerLoggedIn" xsi:type="string">No</data>
13-
<data name="tag" xsi:type="string">to_maintain:yes</data>
1413
<constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareItemsLink" />
1514
<constraint name="Magento\Catalog\Test\Constraint\AssertProductComparePage" />
1615
<constraint name="Magento\Catalog\Test\Constraint\AssertProductCompareBlockOnCmsPage" />

‎dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/CreateSimpleProductEntityPartOneTest.php

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Catalog\Test\TestCase\Product;
8+
9+
use Magento\Catalog\Test\Fixture\Category;
10+
use Magento\Catalog\Test\Fixture\CatalogProductSimple;
11+
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex;
12+
use Magento\Catalog\Test\Page\Adminhtml\CatalogProductNew;
13+
use Magento\Mtf\TestCase\Injectable;
14+
15+
/**
16+
* Steps:
17+
* 1. Login to the backend.
18+
* 2. Navigate to Products > Catalog.
19+
* 3. Start to create simple product.
20+
* 4. Fill in data according to data set.
21+
* 5. Save Product.
22+
* 6. Perform appropriate assertions.
23+
*
24+
* @group Products
25+
* @ZephyrId MAGETWO-23414, MAGETWO-17475, MAGETWO-43376
26+
*/
27+
class CreateSimpleProductEntityPartOneTest extends CreateSimpleProductEntityTest
28+
{
29+
/* tags */
30+
const TEST_TYPE = 'acceptance_test, extended_acceptance_test';
31+
const MVP = 'yes';
32+
/* end tags */
33+
34+
// This blank class is created only to run long variation as a separate test in parallel environment
35+
}

0 commit comments

Comments
 (0)