Merge branch 'MAGETWO-69971' of github.com:magento-troll/magento2ce into PR_Troll

Author: slopukhov

dev/tests/integration/testsuite/Magento/SalesRule/Model/ResourceModel/Rule/CollectionTest.php

@@ -26,11 +26,19 @@ public function testSetValidationFilter($couponCode, $expectedItems)
         $items = array_values($collection->setValidationFilter(1, 0, $couponCode)->getItems());
 
         $ids = [];
+
+        $this->assertEquals(
+            count($expectedItems),
+            count($items),
+            'Invalid number of items in the result collection'
+        );
+
         foreach ($items as $key => $item) {
             $this->assertEquals($expectedItems[$key], $item->getName());
-            if (in_array($item->getId(), $ids)) {
-                $this->fail('Item should be unique in result collection');
-            }
+            $this->assertFalse(
+                in_array($item->getId(), $ids),
+                'Item should be unique in result collection'
+            );
             $ids[] = $item->getId();
         }
     }

dev/tests/integration/testsuite/Magento/SalesRule/_files/rules.php

@@ -22,7 +22,9 @@
     '1'
 )->setCustomerGroupIds(
     '0'
-)->setDiscountStep(0)
+)->setDiscountStep(
+    0
+)->setSortOrder(1)
     ->save();
 
 /** @var \Magento\SalesRule\Model\Rule $rule */
@@ -43,7 +45,9 @@
     '1'
 )->setCustomerGroupIds(
     '0'
-)->setDiscountStep(0)
+)->setDiscountStep(
+    0
+)->setSortOrder(2)
     ->save();
 
 /** @var \Magento\SalesRule\Model\Rule $rule */
@@ -64,7 +68,9 @@
     '1'
 )->setCustomerGroupIds(
     '0'
-)->setDiscountStep(0)
+)->setDiscountStep(
+    0
+)->setSortOrder(3)
     ->save();
 
 /** @var \Magento\SalesRule\Model\Rule $rule */
@@ -85,7 +91,9 @@
     '1'
 )->setCustomerGroupIds(
     '0'
-)->setDiscountStep(0)
+)->setDiscountStep(
+    0
+)->setSortOrder(4)
     ->save();
 
 /** @var \Magento\SalesRule\Model\Rule $rule */
@@ -106,5 +114,7 @@
     '1'
 )->setCustomerGroupIds(
     '0'
-)->setDiscountStep(0)
+)->setDiscountStep(
+    0
+)->setSortOrder(5)
     ->save();