Skip to content

Commit 392608f

Browse files
committed
MAGETWO-58533: [Backport] - Loading of order page with a lot of items in admin. - for 2.1
1 parent 2fe239c commit 392608f

File tree

12 files changed

+35
-65
lines changed

12 files changed

+35
-65
lines changed

app/code/Magento/GiftMessage/Model/OrderItemRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ protected function getItemById($orderId, $orderItemId)
154154
$this->orders[$orderId] = $this->orderFactory->create()->load($orderId);
155155
}
156156

157-
/** @var \Magento\Sales\Api\Data\OrderInterface $item */
157+
/** @var \Magento\Sales\Api\Data\OrderInterface $order */
158158
$order = $this->orders[$orderId];
159159
/** @var \Magento\Sales\Api\Data\OrderItemInterface $item */
160160
$item = $order->getItemById($orderItemId);

app/code/Magento/Sales/Test/Unit/Model/OrderTest.php

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,21 @@ protected function setUp()
7777
{
7878
$helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
7979
$this->paymentCollectionFactoryMock = $this->getMock(
80-
'Magento\Sales\Model\ResourceModel\Order\Payment\CollectionFactory',
80+
\Magento\Sales\Model\ResourceModel\Order\Payment\CollectionFactory::class,
8181
['create'],
8282
[],
8383
'',
8484
false
8585
);
8686
$this->orderItemCollectionFactoryMock = $this->getMock(
87-
'Magento\Sales\Model\ResourceModel\Order\Item\CollectionFactory',
87+
\Magento\Sales\Model\ResourceModel\Order\Item\CollectionFactory::class,
8888
['create'],
8989
[],
9090
'',
9191
false
9292
);
9393
$this->historyCollectionFactoryMock = $this->getMock(
94-
'Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory',
94+
\Magento\Sales\Model\ResourceModel\Order\Status\History\CollectionFactory::class,
9595
['create'],
9696
[],
9797
'',
@@ -143,7 +143,7 @@ protected function setUp()
143143
$this->orderItemCollectionFactoryMock->expects($this->any())->method('create')->willReturn($collection);
144144

145145
$this->priceCurrency = $this->getMockForAbstractClass(
146-
'Magento\Framework\Pricing\PriceCurrencyInterface',
146+
\Magento\Framework\Pricing\PriceCurrencyInterface::class,
147147
[],
148148
'',
149149
false,
@@ -158,7 +158,7 @@ protected function setUp()
158158
$context->expects($this->any())->method('getEventDispatcher')->willReturn($this->eventManager);
159159

160160
$this->order = $helper->getObject(
161-
'Magento\Sales\Model\Order',
161+
\Magento\Sales\Model\Order::class,
162162
[
163163
'paymentCollectionFactory' => $this->paymentCollectionFactoryMock,
164164
'orderItemCollectionFactory' => $this->orderItemCollectionFactoryMock,
@@ -178,7 +178,7 @@ public function testGetItemById()
178178
$fakeOrderItemId = 2;
179179

180180
$orderItem = $this->getMock(
181-
'Magento\Sales\Model\Order\Item',
181+
\Magento\Sales\Model\Order\Item::class,
182182
[],
183183
[],
184184
'',
@@ -378,7 +378,7 @@ public function testCanNotCreditMemoWithForced()
378378

379379
public function testCanEditIfHasInvoices()
380380
{
381-
$invoiceCollection = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Invoice\Collection')
381+
$invoiceCollection = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Invoice\Collection::class)
382382
->disableOriginalConstructor()
383383
->setMethods(['count'])
384384
->getMock();
@@ -559,7 +559,7 @@ public function testCanReorderProductNotSalable()
559559

560560
public function testCanCancelCanReviewPayment()
561561
{
562-
$paymentMock = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Payment')
562+
$paymentMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Payment::class)
563563
->disableOriginalConstructor()
564564
->setMethods(['isDeleted', 'canReviewPayment', 'canFetchTransactionInfo', '__wakeUp'])
565565
->getMock();
@@ -577,7 +577,7 @@ public function testCanCancelCanReviewPayment()
577577

578578
public function testCanCancelAllInvoiced()
579579
{
580-
$paymentMock = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Payment')
580+
$paymentMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Payment::class)
581581
->disableOriginalConstructor()
582582
->setMethods(['isDeleted', 'canReviewPayment', 'canFetchTransactionInfo', '__wakeUp'])
583583
->getMock();
@@ -588,7 +588,7 @@ public function testCanCancelAllInvoiced()
588588
->method('canFetchTransactionInfo')
589589
->will($this->returnValue(false));
590590
$collectionMock = $this->getMock(
591-
'Magento\Sales\Model\ResourceModel\Order\Item\Collection',
591+
\Magento\Sales\Model\ResourceModel\Order\Item\Collection::class,
592592
['getItems', 'setOrderFilter'],
593593
[],
594594
'',
@@ -619,7 +619,7 @@ public function testCanCancelAllInvoiced()
619619

620620
public function testCanCancelState()
621621
{
622-
$paymentMock = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Payment')
622+
$paymentMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Payment::class)
623623
->disableOriginalConstructor()
624624
->setMethods(['isDeleted', 'canReviewPayment', 'canFetchTransactionInfo', '__wakeUp'])
625625
->getMock();
@@ -644,7 +644,7 @@ public function testCanCancelState()
644644
*/
645645
public function testCanCancelActionFlag($cancelActionFlag)
646646
{
647-
$paymentMock = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Payment')
647+
$paymentMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Payment::class)
648648
->disableOriginalConstructor()
649649
->setMethods(['isDeleted', 'canReviewPayment', 'canFetchTransactionInfo', '__wakeUp'])
650650
->getMock();
@@ -687,7 +687,7 @@ public function testCanVoidPayment($actionFlags, $orderState)
687687
{
688688
$helper = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
689689
/** @var Order $order */
690-
$order = $helper->getObject('Magento\Sales\Model\Order');
690+
$order = $helper->getObject(\Magento\Sales\Model\Order::class);
691691
foreach ($actionFlags as $action => $flag) {
692692
$order->setActionFlag($action, $flag);
693693
}
@@ -732,7 +732,7 @@ protected function preparePaymentMock($paymentMock)
732732
{
733733
$iterator = new \ArrayIterator([$paymentMock]);
734734

735-
$collectionMock = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Payment\Collection')
735+
$collectionMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Payment\Collection::class)
736736
->disableOriginalConstructor()
737737
->setMethods(['setOrderFilter', 'getIterator'])
738738
->getMock();
@@ -757,7 +757,7 @@ protected function preparePaymentMock($paymentMock)
757757
*/
758758
protected function _prepareOrderPayment($order, $mockedMethods = [])
759759
{
760-
$payment = $this->getMockBuilder('Magento\Sales\Model\Order\Payment')->disableOriginalConstructor()->getMock();
760+
$payment = $this->getMockBuilder(\Magento\Sales\Model\Order\Payment::class)->disableOriginalConstructor()->getMock();
761761
foreach ($mockedMethods as $method => $value) {
762762
$payment->expects($this->any())->method($method)->will($this->returnValue($value));
763763
}
@@ -810,7 +810,7 @@ protected function _getOrderStatuses()
810810
*/
811811
protected function prepareItemMock($qtyInvoiced)
812812
{
813-
$itemMock = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Item')
813+
$itemMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Item::class)
814814
->disableOriginalConstructor()
815815
->setMethods(['isDeleted', 'filterByTypes', 'filterByParent', 'getQtyToInvoice', '__wakeUp'])
816816
->getMock();
@@ -821,7 +821,7 @@ protected function prepareItemMock($qtyInvoiced)
821821

822822
$iterator = new \ArrayIterator([$itemMock]);
823823

824-
$itemCollectionMock = $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\Item\Collection')
824+
$itemCollectionMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\Item\Collection::class)
825825
->disableOriginalConstructor()
826826
->setMethods(['setOrderFilter', 'getIterator', 'getItems'])
827827
->getMock();
@@ -877,20 +877,20 @@ public function testGetEntityType()
877877
public function testGetStatusHistories()
878878
{
879879
$itemMock = $this->getMockForAbstractClass(
880-
'Magento\Sales\Api\Data\OrderStatusHistoryInterface',
880+
\Magento\Sales\Api\Data\OrderStatusHistoryInterface::class,
881881
[],
882882
'',
883883
false,
884884
true,
885885
true,
886886
['setOrder']
887887
);
888-
$dbMock = $this->getMockBuilder('Magento\Framework\Data\Collection\AbstractDb')
888+
$dbMock = $this->getMockBuilder(\Magento\Framework\Data\Collection\AbstractDb::class)
889889
->setMethods(['setOrder'])
890890
->disableOriginalConstructor()
891891
->getMockForAbstractClass();
892892
$collectionMock = $this->getMock(
893-
'Magento\Sales\Model\ResourceModel\Order\Status\History\Collection',
893+
\Magento\Sales\Model\ResourceModel\Order\Status\History\Collection::class,
894894
[
895895
'setOrderFilter',
896896
'setOrder',

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/Sidebar.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public function getCartItem(FixtureInterface $product)
253253
Locator::SELECTOR_XPATH
254254
);
255255
$cartItem = $this->blockFactory->create(
256-
'Magento\Checkout\Test\Block\Cart\Sidebar\Item',
256+
\Magento\Checkout\Test\Block\Cart\Sidebar\Item::class,
257257
['element' => $cartItemBlock]
258258
);
259259
}

dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersPresentInShoppingCart.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ class AssertPagersPresentInShoppingCart extends AbstractConstraint
1818
* Verify that pagers are visible on the shopping cart page.
1919
*
2020
* @param CheckoutCart $checkoutCart
21+
* @return void
2122
*/
2223
public function processAssert(CheckoutCart $checkoutCart)
2324
{

dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertPagersSummaryText.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class AssertPagersSummaryText extends AbstractConstraint
2424
* @param CheckoutCart $checkoutCart
2525
* @param \Magento\Checkout\Test\Fixture\Cart $cart
2626
* @param ConfigData $config
27+
* @return void
2728
*/
2829
public function processAssert(CheckoutCart $checkoutCart, Cart $cart, ConfigData $config)
2930
{

dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyInCheckoutSummaryBlock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
class AssertVisibleItemsQtyInCheckoutSummaryBlock extends AbstractConstraint
1818
{
1919
/**
20-
* Assert that visible cart items count is the same as configuration value
20+
* Assert that visible cart items count is the same as configuration value.
2121
*
2222
* @param CheckoutOnepage $checkoutPage
2323
* @param Cart $cart

dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyInMiniShoppingCart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function processAssert(CmsIndex $cmsIndex, Cart $cart, $minicartMaxVisibl
3434
$products = $sourceProducts->getProducts();
3535

3636
$presentItems = 0;
37-
/** @var Item $item */
37+
3838
foreach (array_keys($cart->getItems()) as $key) {
3939
/** @var CatalogProductSimple $product */
4040
$product = $products[$key];

dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyMessageInMiniShoppingCart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public function processAssert(CmsIndex $cmsIndex, $minicartMaxVisibleCartItemsCo
5050
\PHPUnit_Framework_Assert::assertEquals(
5151
$counterMessage,
5252
$sidebar->getVisibleItemsCounter(),
53-
'Wrong counter text of visible Cart items in mini shopping cart'
53+
'Wrong quantity value of visible Cart items in mini shopping cart'
5454
);
5555
}
5656

dev/tests/functional/tests/app/Magento/Checkout/Test/Constraint/AssertVisibleItemsQtyMessageOnCheckoutSummaryBlock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function processAssert(
6161
\PHPUnit_Framework_Assert::assertEquals(
6262
$counterMessage,
6363
$count,
64-
'Wrong counter text of visible Cart items in mini shopping cart'
64+
'Visible cart items quantity has wrong value in mini shopping cart'
6565
);
6666
}
6767

dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/AddProductsToShoppingCartEntityTest.xml

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -87,27 +87,7 @@
8787
<constraint name="Magento\Checkout\Test\Constraint\AssertGrandTotalInShoppingCart" />
8888
<constraint name="Magento\Checkout\Test\Constraint\AssertSubtotalInMiniShoppingCart" />
8989
</variation>
90-
<variation name="VariationWithCartItemsDisplayDefaultLimitation" summary="Minicart products list is trimmed if qty of products exceeds display limit" ticketId="MAGETWO-70089">
91-
<data name="tag" xsi:type="string">severity:S2</data>
92-
<data name="productsData/0" xsi:type="string">catalogProductSimple::default</data>
93-
<data name="productsData/1" xsi:type="string">catalogProductSimple::default</data>
94-
<data name="productsData/2" xsi:type="string">catalogProductSimple::default</data>
95-
<data name="productsData/3" xsi:type="string">catalogProductSimple::default</data>
96-
<data name="productsData/4" xsi:type="string">catalogProductSimple::default</data>
97-
<data name="productsData/5" xsi:type="string">catalogProductSimple::default</data>
98-
<data name="productsData/6" xsi:type="string">catalogProductSimple::default</data>
99-
<data name="productsData/7" xsi:type="string">catalogProductSimple::default</data>
100-
<data name="productsData/8" xsi:type="string">catalogProductSimple::default</data>
101-
<data name="productsData/9" xsi:type="string">catalogProductSimple::default</data>
102-
<data name="productsData/10" xsi:type="string">catalogProductSimple::default</data>
103-
<data name="minicartMaxVisibleCartItemsCount" xsi:type="number">10</data>
104-
<data name="totalItemsCountInShoppingCart" xsi:type="number">11</data>
105-
<data name="cart/data/subtotal" xsi:type="string">6160.00</data>
106-
<constraint name="Magento\Checkout\Test\Constraint\AssertItemsCounterInMiniShoppingCart" />
107-
<constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyMessageInMiniShoppingCart" />
108-
<constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyInMiniShoppingCart" />
109-
</variation>
110-
<variation name="VariationWithCartItemsDisplayDefaultLimitationAndDefaultTotalQty" summary="Products in minicart are NOT trimmed if qty of products less than default display limit" ticketId="MAGETWO-70090">
90+
<variation name="VariationWithCartItemsDisplayDefaultLimitationOnCheckoutAndDefaultTotalQty" summary="Products list in checkout order summary block is NOT trimmed if qty less than display limit" ticketId="MAGETWO-70091">
11191
<data name="tag" xsi:type="string">severity:S2</data>
11292
<data name="productsData/0" xsi:type="string">catalogProductSimple::default</data>
11393
<data name="productsData/1" xsi:type="string">catalogProductSimple::default</data>
@@ -120,28 +100,12 @@
120100
<data name="productsData/8" xsi:type="string">catalogProductSimple::default</data>
121101
<data name="productsData/9" xsi:type="string">catalogProductSimple::default</data>
122102
<data name="minicartMaxVisibleCartItemsCount" xsi:type="number">10</data>
103+
<data name="checkoutSummaryMaxVisibleCartItemsCount" xsi:type="number">10</data>
123104
<data name="totalItemsCountInShoppingCart" xsi:type="number">10</data>
124105
<data name="cart/data/subtotal" xsi:type="string">6160.00</data>
125106
<constraint name="Magento\Checkout\Test\Constraint\AssertItemsCounterInMiniShoppingCart" />
126107
<constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyMessageInMiniShoppingCart" />
127108
<constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyInMiniShoppingCart" />
128-
</variation>
129-
<variation name="VariationWithCartItemsDisplayDefaultLimitationOnCheckoutAndDefaultTotalQty" summary="Products list in checkout order summary block is NOT trimmed if qty less than display limit" ticketId="MAGETWO-70091">
130-
<data name="tag" xsi:type="string">severity:S2</data>
131-
<data name="productsData/0" xsi:type="string">catalogProductSimple::default</data>
132-
<data name="productsData/1" xsi:type="string">catalogProductSimple::default</data>
133-
<data name="productsData/2" xsi:type="string">catalogProductSimple::default</data>
134-
<data name="productsData/3" xsi:type="string">catalogProductSimple::default</data>
135-
<data name="productsData/4" xsi:type="string">catalogProductSimple::default</data>
136-
<data name="productsData/5" xsi:type="string">catalogProductSimple::default</data>
137-
<data name="productsData/6" xsi:type="string">catalogProductSimple::default</data>
138-
<data name="productsData/7" xsi:type="string">catalogProductSimple::default</data>
139-
<data name="productsData/8" xsi:type="string">catalogProductSimple::default</data>
140-
<data name="productsData/9" xsi:type="string">catalogProductSimple::default</data>
141-
<data name="checkoutSummaryMaxVisibleCartItemsCount" xsi:type="number">10</data>
142-
<data name="totalItemsCountInShoppingCart" xsi:type="number">10</data>
143-
<data name="cart/data/subtotal" xsi:type="string">6160.00</data>
144-
<constraint name="Magento\Checkout\Test\Constraint\AssertItemsCounterInMiniShoppingCart" />
145109
<constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyMessageOnCheckoutSummaryBlock" />
146110
<constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyInCheckoutSummaryBlock" />
147111
<constraint name="Magento\Checkout\Test\Constraint\AssertLinkGoToCartNotPresentInSummaryBlock" />
@@ -159,10 +123,13 @@
159123
<data name="productsData/8" xsi:type="string">catalogProductSimple::default</data>
160124
<data name="productsData/9" xsi:type="string">catalogProductSimple::default</data>
161125
<data name="productsData/10" xsi:type="string">catalogProductSimple::default</data>
126+
<data name="minicartMaxVisibleCartItemsCount" xsi:type="number">10</data>
162127
<data name="checkoutSummaryMaxVisibleCartItemsCount" xsi:type="number">10</data>
163128
<data name="totalItemsCountInShoppingCart" xsi:type="number">11</data>
164129
<data name="cart/data/subtotal" xsi:type="string">6160.00</data>
165130
<constraint name="Magento\Checkout\Test\Constraint\AssertItemsCounterInMiniShoppingCart" />
131+
<constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyMessageInMiniShoppingCart" />
132+
<constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyInMiniShoppingCart" />
166133
<constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyMessageOnCheckoutSummaryBlock" />
167134
<constraint name="Magento\Checkout\Test\Constraint\AssertVisibleItemsQtyInCheckoutSummaryBlock" />
168135
<constraint name="Magento\Checkout\Test\Constraint\AssertLinkGoToCartPresentInSummaryBlock" />

0 commit comments

Comments
 (0)