Skip to content

Commit bb5fb57

Browse files
author
Dmytro Aponasenko
committed
Merge branch 'MTA-548' of https://github.corp.ebay.com/magento-qmt/magento2ce into develop
2 parents d35959a + e6e6f38 commit bb5fb57

File tree

157 files changed

+915
-4489
lines changed

Some content is hidden

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

157 files changed

+915
-4489
lines changed

‎dev/tests/functional/.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
**/var
12
/composer.lock
2-
/vendor
3-
/generated
4-
/var
53
/config/*
4+
/generated
5+
/lib/Magento/Mtf/Util/Generate/testcase.xml
6+
/vendor
67
!/config/application.yml.dist
78
!/config/handler.yml.dist
89
!/config/isolation.yml.dist
910
!/config/server.yml.dist
1011
phpunit.xml
1112
credentials.xml
12-
/lib/Magento/Mtf/Util/Generate/testcase.xml

‎dev/tests/functional/lib/Magento/Mtf/Client/Element/SuggestElement.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ public function setValue($value)
5858
$this->eventManager->dispatchEvent(['set_value'], [__METHOD__, $this->getAbsoluteSelector()]);
5959

6060
$this->clear();
61+
62+
if ($value == '') {
63+
return;
64+
}
6165
foreach (str_split($value) as $symbol) {
6266
$input = $this->find($this->suggest);
6367
$input->click();

‎dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Block.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected function addBlockToFactory(array $item)
4444
$params = "\$element, \$driver = null, \$config = []";
4545

4646
$this->factoryContent .= "\n /**\n";
47-
$this->factoryContent .= " * @return \\{$item['class']}\n";
47+
$this->factoryContent .= " * @return {$item['class']}\n";
4848
$this->factoryContent .= " */\n";
4949
$this->factoryContent .= " public function get{$methodNameSuffix}({$params})\n";
5050
$this->factoryContent .= " {";

‎dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Fixture.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ protected function addFixtureToFactory($item)
4343

4444
$this->factoryContent .= "\n";
4545
$this->factoryContent .= " /**\n";
46-
$this->factoryContent .= " * @return \\{$item['class']}\n";
46+
$this->factoryContent .= " * @return {$item['class']}\n";
4747
$this->factoryContent .= " */\n";
4848
$this->factoryContent .= " public function get{$methodNameSuffix}(array \$placeholders = [])\n";
4949
$this->factoryContent .= " {";

‎dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Page.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected function _addPageToFactory($item)
4444
$fallbackComment = $this->_buildFallbackComment($item);
4545

4646
$this->factoryContent .= "\n /**\n";
47-
$this->factoryContent .= " * @return \\{$item['class']}\n";
47+
$this->factoryContent .= " * @return {$item['class']}\n";
4848
$this->factoryContent .= " */\n";
4949
$this->factoryContent .= " public function get{$methodNameSuffix}()\n";
5050
$this->factoryContent .= " {";

‎dev/tests/functional/lib/Magento/Mtf/Util/Generate/Factory/Repository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected function _addToFactory($item)
4444
$fallbackComment = $this->_buildFallbackComment($item);
4545

4646
$this->factoryContent .= "\n /**\n";
47-
$this->factoryContent .= " * @return \\{$item['class']}\n";
47+
$this->factoryContent .= " * @return {$item['class']}\n";
4848
$this->factoryContent .= " */\n";
4949
$this->factoryContent .= " public function get{$methodNameSuffix}(array \$defaultConfig = [], "
5050
. "array \$defaultData = [])\n";

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

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -103,17 +103,12 @@ public function getOptions(FixtureInterface $product = null)
103103
*/
104104
public function fillOptions(FixtureInterface $product)
105105
{
106-
if ($product instanceof InjectableFixture) {
107-
/** @var \Magento\Bundle\Test\Fixture\BundleProduct $product */
108-
$checkoutData = $product->getCheckoutData();
109-
$bundleCheckoutData = isset($checkoutData['options']['bundle_options'])
110-
? $checkoutData['options']['bundle_options']
111-
: [];
112-
} else {
113-
// TODO: Removed after refactoring(removed) old product fixture.
114-
/** @var \Magento\Bundle\Test\Fixture\BundleFixed $product */
115-
$bundleCheckoutData = $product->getSelectionData();
116-
}
106+
/** @var \Magento\Bundle\Test\Fixture\BundleProduct $product */
107+
$checkoutData = $product->getCheckoutData();
108+
$bundleCheckoutData = isset($checkoutData['options']['bundle_options'])
109+
? $checkoutData['options']['bundle_options']
110+
: [];
111+
117112
if (!$this->getBundleBlock()->isVisible()) {
118113
$this->clickCustomize();
119114
}

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

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

77
namespace Magento\Bundle\Test\Block\Catalog\Product\View\Type;
88

9-
use Magento\Bundle\Test\Fixture\Bundle as BundleDataFixture;
109
use Magento\Bundle\Test\Fixture\BundleProduct;
1110
use Magento\Catalog\Test\Page\Product\CatalogProductView;
1211
use Magento\Bundle\Test\Block\Catalog\Product\View\Type\Option;
@@ -93,15 +92,9 @@ public function addToCart(BundleProduct $product, CatalogProductView $catalogPro
9392
*/
9493
public function getOptions(FixtureInterface $product)
9594
{
96-
if ($product instanceof InjectableFixture) {
97-
/** @var BundleProduct $product */
98-
$bundleSelections = $product->getBundleSelections();
99-
$bundleOptions = isset($bundleSelections['bundle_options']) ? $bundleSelections['bundle_options'] : [];
100-
} else {
101-
// TODO: Removed after refactoring(removed) old product fixture.
102-
/** @var BundleDataFixture $product */
103-
$bundleOptions = $product->getBundleOptions();
104-
}
95+
/** @var BundleProduct $product */
96+
$bundleSelections = $product->getBundleSelections();
97+
$bundleOptions = isset($bundleSelections['bundle_options']) ? $bundleSelections['bundle_options'] : [];
10598

10699
$listFormOptions = $this->getListOptions();
107100
$formOptions = [];

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/Bundle.php

Lines changed: 0 additions & 143 deletions
This file was deleted.

‎dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleDynamic.php

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)