Skip to content
This repository has been archived by the owner on Dec 19, 2019. It is now read-only.

Commit

Permalink
Merge pull request #4839 from magento-arcticfoxes/MC-18143
Browse files Browse the repository at this point in the history 
[arcticfoxes] MC-18143: Adapt WebAPI to elasticsearch on CI
  • Loading branch information
@rganin
rganin authored Oct 9, 2019
2 parents 81ab7c4 + cc6eccc commit 68c48d5
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 27 deletions.
1 change: 1 addition & 0 deletions ...tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryMultiCurrencyTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class ProductRepositoryMultiCurrencyTest extends WebapiAbstract
const WEBSITES_RESOURCE_PATH = '/V1/store/websites';

/**
* @magentoApiDataFixture Magento/Catalog/_files/category.php
* @magentoApiDataFixture Magento/Store/_files/second_website_with_second_currency.php
* @magentoApiDataFixture Magento/Catalog/_files/product_simple.php
*/
Expand Down
12 changes: 10 additions & 2 deletions dev/tests/api-functional/testsuite/Magento/Framework/Api/Search/SearchTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function testCatalogSearch()
]
]
],
'page_size' => 20000000000000,
'page_size' => 999,
'current_page' => 0,
],
];
Expand Down Expand Up @@ -66,7 +66,15 @@ public function testCatalogSearch()
$this->assertTrue(count($response['items']) > 0);

$this->assertNotNull($response['items'][0]['id']);
$this->assertEquals('score', $response['items'][0]['custom_attributes'][0]['attribute_code']);
$this->assertTrue(
in_array(
$response['items'][0]['custom_attributes'][0]['attribute_code'],
[
'score', // mysql
'_score' // elasticsearch score
]
)
);
$this->assertTrue($response['items'][0]['custom_attributes'][0]['value'] > 0);
}
}
71 changes: 61 additions & 10 deletions dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
use Magento\Catalog\Model\Category;
use Magento\Catalog\Model\CategoryLinkManagement;
use Magento\Eav\Model\Config;
use Magento\Indexer\Model\Indexer;
use Magento\TestFramework\ObjectManager;
use Magento\TestFramework\TestCase\GraphQlAbstract;
use Magento\Catalog\Model\Product;
Expand All @@ -28,13 +27,15 @@
* @SuppressWarnings(PHPMD.TooManyPublicMethods)
* @SuppressWarnings(PHPMD.ExcessiveClassLength)
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
* @SuppressWarnings(PHPMD.UnusedPrivateMethod)
*/
class ProductSearchTest extends GraphQlAbstract
{
/**
* Verify that layered navigation filters and aggregations are correct for product query
*
* Filter products by an array of skus
* @magentoApiDataFixture Magento/Catalog/_files/category.php
* @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
Expand Down Expand Up @@ -84,17 +85,37 @@ public function testFilterLn()
$response['products'],
'Filters are missing in product query result.'
);

$expectedFilters = $this->getExpectedFiltersDataSet();
$actualFilters = $response['products']['filters'];
// presort expected and actual results as different search engines have different orders
usort($expectedFilters, [$this, 'compareFilterNames']);
usort($actualFilters, [$this, 'compareFilterNames']);

$this->assertFilters(
$response,
$this->getExpectedFiltersDataSet(),
['products' => ['filters' => $actualFilters]],
$expectedFilters,
'Returned filters data set does not match the expected value'
);
}

/**
* Compare arrays by value in 'name' field.
*
* @param array $a
* @param array $b
* @return int
*/
private function compareFilterNames(array $a, array $b)
{
return strcmp($a['name'], $b['name']);
}

/**
* Layered navigation for Configurable products with out of stock options
* Two configurable products each having two variations and one of the child products of one Configurable set to OOS
*
* @magentoApiDataFixture Magento/Catalog/_files/category.php
* @magentoApiDataFixture Magento/Catalog/_files/configurable_products_with_custom_attribute_layered_navigation.php
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
Expand Down Expand Up @@ -305,15 +326,17 @@ public function testFilterProductsByDropDownCustomAttribute()

/**
* @return void
* @throws \Magento\Framework\Exception\LocalizedException
*/
private function reIndexAndCleanCache() : void
{
$objectManager = Bootstrap::getObjectManager();
$indexer = $objectManager->create(Indexer::class);
$indexer->load('catalogsearch_fulltext');
$indexer->reindexAll();
$appDir = dirname(Bootstrap::getInstance()->getAppTempDir());
$out = '';
// phpcs:ignore Magento2.Security.InsecureFunction
exec("php -f {$appDir}/bin/magento indexer:reindex", $out);
CacheCleaner::cleanAll();
}

/**
* Filter products using an array of multi select custom attributes
*
Expand Down Expand Up @@ -676,9 +699,12 @@ public function testFilterByCategoryIdAndCustomAttribute()
'value'=> '13'
],
];
// presort expected and actual results as different search engines have different orders
usort($expectedCategoryInAggregrations, [$this, 'compareLabels']);
usort($actualCategoriesFromResponse, [$this, 'compareLabels']);
$categoryInAggregations = array_map(null, $expectedCategoryInAggregrations, $actualCategoriesFromResponse);

//Validate the categories and sub-categories data in the filter layer
//Validate the categories and sub-categories data in the filter layer
foreach ($categoryInAggregations as $index => $categoryAggregationsData) {
$this->assertNotEmpty($categoryAggregationsData);
$this->assertEquals(
Expand All @@ -694,6 +720,18 @@ public function testFilterByCategoryIdAndCustomAttribute()
}
}

/**
* Compare arrays by value in 'label' field.
*
* @param array $a
* @param array $b
* @return int
*/
private function compareLabels(array $a, array $b)
{
return strcmp($a['label'], $b['label']);
}

/**
* Filter by exact match of product url key
*
Expand Down Expand Up @@ -982,6 +1020,7 @@ private function assertFilters($response, $expectedFilters, $message = '')
/**
* Verify product filtering using price range AND matching skus AND name sorted in DESC order
*
* @magentoApiDataFixture Magento/Catalog/_files/category.php
* @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
Expand Down Expand Up @@ -1052,13 +1091,14 @@ public function testFilterWithinSpecificPriceRangeSortedByNameDesc()
* expected - error is thrown
* Actual - empty array
*
* @magentoApiDataFixture Magento/Catalog/_files/category.php
* @magentoApiDataFixture Magento/Catalog/_files/multiple_products.php
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/

public function testSearchWithFilterWithPageSizeEqualTotalCount()
{

$this->reIndexAndCleanCache();
$query
= <<<QUERY
{
Expand Down Expand Up @@ -1114,6 +1154,7 @@ public function testSearchWithFilterWithPageSizeEqualTotalCount()
/**
* Filtering for products and sorting using multiple sort parameters
*
* @magentoApiDataFixture Magento/Catalog/_files/category.php
* @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
Expand Down Expand Up @@ -1486,18 +1527,24 @@ public function testSearchAndSortByRelevance()
$this->assertEquals(3, $response['products']['total_count']);
$this->assertNotEmpty($response['products']['filters'], 'Filters should have the Category layer');
$this->assertEquals('Colorful Category', $response['products']['filters'][0]['filter_items'][0]['label']);
$this->assertCount(2, $response['products']['aggregations']);
$productsInResponse = ['Blue briefs','Navy Blue Striped Shoes','Grey shorts'];
/** @var \Magento\Config\Model\Config $config */
$config = Bootstrap::getObjectManager()->get(\Magento\Config\Model\Config::class);
if (strpos($config->getConfigDataValue('catalog/search/engine'), 'elasticsearch') !== false) {
$this->markTestIncomplete('MC-20716');
}
$count = count($response['products']['items']);
for ($i = 0; $i < $count; $i++) {
$this->assertEquals($productsInResponse[$i], $response['products']['items'][$i]['name']);
}
$this->assertCount(2, $response['products']['aggregations']);
}

/**
* Filtering for product with sku "equals" a specific value
* If pageSize and current page are not requested, default values are returned
*
* @magentoApiDataFixture Magento/Catalog/_files/category.php
* @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
Expand Down Expand Up @@ -1748,6 +1795,7 @@ public function testFilterWithinASpecificPriceRangeSortedByPriceDESC()
/**
* No items are returned if the conditions are not met
*
* @magentoApiDataFixture Magento/Catalog/_files/category.php
* @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
Expand Down Expand Up @@ -1807,6 +1855,7 @@ public function testQueryFilterNoMatchingItems()
/**
* Asserts that exception is thrown when current page > totalCount of items returned
*
* @magentoApiDataFixture Magento/Catalog/_files/category.php
* @magentoApiDataFixture Magento/Catalog/_files/multiple_mixed_products_2.php
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
Expand Down Expand Up @@ -1953,6 +2002,7 @@ public function testFilterProductsThatAreOutOfStockWithConfigSettings()
/**
* Verify that invalid current page return an error
*
* @magentoApiDataFixture Magento/Catalog/_files/category.php
* @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
* @expectedException \Exception
* @expectedExceptionMessage currentPage value must be greater than 0
Expand Down Expand Up @@ -1982,6 +2032,7 @@ public function testInvalidCurrentPage()
/**
* Verify that invalid page size returns an error.
*
* @magentoApiDataFixture Magento/Catalog/_files/category.php
* @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attribute.php
* @expectedException \Exception
* @expectedExceptionMessage pageSize value must be greater than 0
Expand Down
36 changes: 21 additions & 15 deletions dev/tests/api-functional/testsuite/Magento/WebapiAsync/Model/AsyncScheduleMultiStoreTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Magento\WebapiAsync\Model;

use Magento\Catalog\Api\Data\ProductInterface;
use Magento\Catalog\Api\Data\ProductInterface as Product;
use Magento\TestFramework\MessageQueue\PreconditionFailedException;
use Magento\TestFramework\MessageQueue\PublisherConsumerController;
use Magento\TestFramework\MessageQueue\EnvironmentPreconditionException;
Expand All @@ -19,7 +19,6 @@
use Magento\Framework\Registry;
use Magento\Framework\Webapi\Exception;
use Magento\Catalog\Api\ProductRepositoryInterface;
use Magento\Catalog\Api\Data\ProductInterface as Product;
use Magento\Framework\ObjectManagerInterface;
use Magento\Store\Model\Store;
use Magento\Framework\Webapi\Rest\Request;
Expand Down Expand Up @@ -128,6 +127,13 @@ protected function setUp()
*/
public function testAsyncScheduleBulkMultistore($storeCode)
{
if ($storeCode === self::STORE_CODE_FROM_FIXTURE) {
/** @var \Magento\Config\Model\Config $config */
$config = Bootstrap::getObjectManager()->get(\Magento\Config\Model\Config::class);
if (strpos($config->getConfigDataValue('catalog/search/engine'), 'elasticsearch') !== false) {
$this->markTestSkipped('MC-20452');
}
}
$product = $this->getProductData();
$this->_markTestAsRestOnly();

Expand Down Expand Up @@ -277,9 +283,9 @@ public function getProductData()
'product' =>
$productBuilder(
[
ProductInterface::TYPE_ID => 'simple',
ProductInterface::SKU => 'multistore-sku-test-1',
ProductInterface::NAME => 'Test Name ',
Product::TYPE_ID => 'simple',
Product::SKU => 'multistore-sku-test-1',
Product::NAME => 'Test Name ',
]
),
];
Expand All @@ -303,16 +309,16 @@ public function storeProvider()
private function getSimpleProductData($productData = [])
{
return [
ProductInterface::SKU => isset($productData[ProductInterface::SKU])
? $productData[ProductInterface::SKU] : uniqid('sku-', true),
ProductInterface::NAME => isset($productData[ProductInterface::NAME])
? $productData[ProductInterface::NAME] : uniqid('sku-', true),
ProductInterface::VISIBILITY => 4,
ProductInterface::TYPE_ID => 'simple',
ProductInterface::PRICE => 3.62,
ProductInterface::STATUS => 1,
ProductInterface::TYPE_ID => 'simple',
ProductInterface::ATTRIBUTE_SET_ID => 4,
Product::SKU => isset($productData[Product::SKU])
? $productData[Product::SKU] : uniqid('sku-', true),
Product::NAME => isset($productData[Product::NAME])
? $productData[Product::NAME] : uniqid('sku-', true),
Product::VISIBILITY => 4,
Product::TYPE_ID => 'simple',
Product::PRICE => 3.62,
Product::STATUS => 1,
Product::TYPE_ID => 'simple',
Product::ATTRIBUTE_SET_ID => 4,
];
}

Expand Down

0 comments on commit 68c48d5

Please sign in to comment.