Merge branch 'MAGETWO-39010' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into MAGETWO-39010

Author: Dmytro Voskoboinikov

dev/tests/api-functional/testsuite/Magento/Quote/Api/CouponManagementTest.php

@@ -121,9 +121,10 @@ public function testSetCouponSuccess()
         $quote = $this->objectManager->create('Magento\Quote\Model\Quote');
         $quote->load('test01', 'reserved_order_id');
         $cartId = $quote->getId();
+        /** @var \Magento\SalesRule\Model\Rule $salesRule */
         $salesRule = $this->objectManager->create('Magento\SalesRule\Model\Rule');
         $salesRule->load('Test Coupon', 'name');
-        $couponCode = $salesRule->getCouponCode();
+        $couponCode = $salesRule->getPrimaryCoupon()->getCode();
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . $couponCode,
@@ -264,7 +265,7 @@ public function testSetMyCouponSuccess()
         $cartId = $quote->getId();
         $salesRule = $this->objectManager->create('Magento\SalesRule\Model\Rule');
         $salesRule->load('Test Coupon for General', 'name');
-        $couponCode = $salesRule->getCouponCode();
+        $couponCode = $salesRule->getPrimaryCoupon()->getCode();;
 
         /* Since this isn't a full quote fixture, need to assign it to the right customer */
         $cartManagementService = $this->objectManager->create(

dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCouponManagementTest.php

@@ -148,7 +148,7 @@ public function testSetCouponSuccess()
         $cartId = $this->getQuoteMaskedId($quote->getId());
         $salesRule = $this->objectManager->create('Magento\SalesRule\Model\Rule');
         $salesRule->load('Test Coupon', 'name');
-        $couponCode = $salesRule->getCouponCode();
+        $couponCode = $salesRule->getPrimaryCoupon()->getCode();
         $serviceInfo = [
             'rest' => [
                 'resourcePath' => self::RESOURCE_PATH . $cartId . '/coupons/' . $couponCode,

dev/tests/api-functional/testsuite/Magento/SalesRule/Api/RuleRepositoryTest.php

@@ -41,8 +41,8 @@ protected function getSalesRuleData()
                 'conditions' => [
                     [
                         'condition_type' => 'Magento\SalesRule\Model\Rule\Condition\Address',
-                        'attribute_name' => 'base_subtotal',
                         'operator' => '>',
+                        'attribute_name' => 'base_subtotal',
                         'value' => 800
                     ]
                 ],
@@ -76,7 +76,7 @@ protected function getSalesRuleData()
             'is_rss' => true,
             'coupon_type' => \Magento\SalesRule\Api\Data\RuleInterface::COUPON_TYPE_SPECIFIC_COUPON,
             'use_auto_generation' => false,
-            'uses_per_coupon' => null,
+            'uses_per_coupon' => 0,
             'simple_free_shipping' => 0,
         ];
         return $data;
@@ -88,22 +88,27 @@ public function testCrud()
         $inputData = $this->getSalesRuleData();
         $result = $this->createRule($inputData);
         $ruleId = $result['rule_id'];
-        $inputData['rule_id'] = $ruleId;
+        $this->assertArrayHasKey('rule_id', $result);
+        $this->assertEquals($ruleId, $result['rule_id']);
+        unset($result['rule_id']);
         $this->assertEquals($inputData, $result);
 
         //test getList
         $result = $this->verifyGetList($ruleId);
+        unset($result['rule_id']);
         $this->assertEquals($inputData, $result);
 
         //test update
         $inputData['times_used'] = 2;
-        $inputData['customer_group_ids'] = [1, 3];
+        $inputData['customer_group_ids'] = [0, 1, 3];
         $inputData['discount_amount'] = 30;
         $result = $this->updateRule($ruleId, $inputData);
+        unset($result['rule_id']);
         $this->assertEquals($inputData, $result);
 
         //test get
         $result = $this->getRule($ruleId);
+        unset($result['rule_id']);
         $this->assertEquals($inputData, $result);
 
         //test delete
@@ -162,7 +167,7 @@ public function verifyGetList($ruleId)
      * Create Sales rule
      *
      * @param $rule
-     * @return int
+     * @return array
      */
     protected function createRule($rule)
     {

dev/tests/integration/testsuite/Magento/Checkout/_files/quote_with_coupon_saved.php

@@ -14,7 +14,7 @@
 
 $salesRule = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\SalesRule\Model\Rule');
 $salesRule->load('Test Coupon', 'name');
-$couponCode = $salesRule->getCouponCode();
+$couponCode = $salesRule->getPrimaryCoupon()->getCode();;
 
 $quote->setCouponCode(trim($couponCode));
 $quote->collectTotals()->save();