-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1035 from magento-fearless-kiwis/MAGETWO-63116_JS…
…ON_ERROR MAGETWO-63116: [GitHub] Quotes in product name causes JSON error on product page MAP What's This Popup #8059
- Loading branch information
Showing
8 changed files
with
182 additions
and
40 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMapOnCategoryPage.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Msrp\Test\Constraint; | ||
|
|
||
| use Magento\Catalog\Test\Fixture\CatalogProductSimple; | ||
| use Magento\Cms\Test\Page\CmsIndex; | ||
| use Magento\Mtf\Constraint\AbstractConstraint; | ||
| use Magento\Mtf\Fixture\InjectableFixture; | ||
| use Magento\Catalog\Test\Page\Category\CatalogCategoryView; | ||
|
|
||
| /** | ||
| * Assert product MAP related data on category page. | ||
| */ | ||
| class AssertMapOnCategoryPage extends AbstractConstraint | ||
| { | ||
| /** | ||
| * Assert product MAP related data on category page. | ||
| * | ||
| * @param CmsIndex $cmsIndex | ||
| * @param CatalogCategoryView $catalogCategoryView | ||
| * @param InjectableFixture $product | ||
| * @return void | ||
| */ | ||
| public function processAssert( | ||
| CmsIndex $cmsIndex, | ||
| CatalogCategoryView $catalogCategoryView, | ||
| InjectableFixture $product | ||
| ) { | ||
| /** @var CatalogProductSimple $product */ | ||
| $cmsIndex->open(); | ||
| $cmsIndex->getTopmenu()->selectCategoryByName($product->getCategoryIds()[0]); | ||
|
|
||
| $productBlock = $catalogCategoryView->getMsrpListProductBlock()->getProductItem($product); | ||
| $productBlock->openMapBlock(); | ||
| $mapBlock = $productBlock->getMapBlock(); | ||
| \PHPUnit_Framework_Assert::assertEquals( | ||
| $product->getMsrp(), | ||
| $mapBlock->getOldPrice(), | ||
| 'Displayed on Category page MAP is incorrect.' | ||
| ); | ||
| $priceData = $product->getDataFieldConfig('price')['source']->getPriceData(); | ||
| $price = isset($priceData['category_price']) ? $priceData['category_price'] : $product->getPrice(); | ||
| \PHPUnit_Framework_Assert::assertEquals( | ||
| $price, | ||
| $mapBlock->getActualPrice(), | ||
| 'Displayed on Category page price is incorrect.' | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Return string representation of object. | ||
| * | ||
| * @return string | ||
| */ | ||
| public function toString() | ||
| { | ||
| return "Displayed Product MAP data on category page is correct."; | ||
| } | ||
| } |
67 changes: 67 additions & 0 deletions
67
dev/tests/functional/tests/app/Magento/Msrp/Test/Constraint/AssertMapOnProductView.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Msrp\Test\Constraint; | ||
|
|
||
| use Magento\Cms\Test\Page\CmsIndex; | ||
| use Magento\Catalog\Test\Page\Category\CatalogCategoryView; | ||
| use Magento\Mtf\Constraint\AbstractConstraint; | ||
| use Magento\Mtf\Fixture\InjectableFixture; | ||
| use Magento\Catalog\Test\Fixture\CatalogProductSimple; | ||
| use Magento\Catalog\Test\Page\Product\CatalogProductView; | ||
|
|
||
| /** | ||
| * Assert product MAP related data on product view page. | ||
| */ | ||
| class AssertMapOnProductView extends AbstractConstraint | ||
| { | ||
| /** | ||
| * Assert product MAP related data on product view page. | ||
| * | ||
| * @param CmsIndex $cmsIndex | ||
| * @param CatalogCategoryView $catalogCategoryView | ||
| * @param CatalogProductView $catalogProductView | ||
| * @param InjectableFixture $product | ||
| * @return void | ||
| */ | ||
| public function processAssert( | ||
| CmsIndex $cmsIndex, | ||
| CatalogCategoryView $catalogCategoryView, | ||
| CatalogProductView $catalogProductView, | ||
| InjectableFixture $product | ||
| ) { | ||
| /** @var CatalogProductSimple $product */ | ||
| $cmsIndex->open(); | ||
| $cmsIndex->getTopmenu()->selectCategoryByName($product->getCategoryIds()[0]); | ||
| $catalogCategoryView->getListProductBlock()->getProductItem($product)->open(); | ||
|
|
||
| $viewBlock = $catalogProductView->getMsrpViewBlock(); | ||
| $viewBlock->openMapBlock(); | ||
| $mapBlock = $viewBlock->getMapBlock(); | ||
| \PHPUnit_Framework_Assert::assertContains( | ||
| $product->getMsrp(), | ||
| $mapBlock->getOldPrice(), | ||
| 'Displayed on Product view page MAP is incorrect.' | ||
| ); | ||
| $priceData = $product->getDataFieldConfig('price')['source']->getPriceData(); | ||
| $price = isset($priceData['category_price']) ? $priceData['category_price'] : $product->getPrice(); | ||
| \PHPUnit_Framework_Assert::assertEquals( | ||
| $price, | ||
| $mapBlock->getActualPrice(), | ||
| 'Displayed on Product view page price is incorrect.' | ||
| ); | ||
| } | ||
|
|
||
| /** | ||
| * Return string representation of object. | ||
| * | ||
| * @return string | ||
| */ | ||
| public function toString() | ||
| { | ||
| return "Displayed Product MAP data on product view page is correct."; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters