From f8c52ef17c1e43c7cbee1bc1606919cbe2bee704 Mon Sep 17 00:00:00 2001
From: Daniel Renaud <drenaud@magento.com>
Date: Thu, 12 Jul 2018 08:48:22 -0500
Subject: [PATCH] MAGETWO-64854: Incorrect Refund Logic can allow for
 double-refunds

---
 .../Mftf/Section/AdminMessagesSection.xml     |   1 +
 .../EnableDisableBundleProductStatusTest.xml  |   9 +-
 .../Section/AdminCreditMemoTotalSection.xml   |   2 +-
 .../AdminOrderCreditMemosTabSection.xml       |   1 +
 .../Framework/Math/FloatComparator.php        |  59 +++++++++
 .../Math/Test/Unit/FloatComparatorTest.php    | 115 ++++++++++++++++++
 6 files changed, 184 insertions(+), 3 deletions(-)
 create mode 100644 lib/internal/Magento/Framework/Math/FloatComparator.php
 create mode 100644 lib/internal/Magento/Framework/Math/Test/Unit/FloatComparatorTest.php

diff --git a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
index cce21ea760c40..ff5e02397cbff 100644
--- a/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
+++ b/app/code/Magento/Backend/Test/Mftf/Section/AdminMessagesSection.xml
@@ -11,5 +11,6 @@
     <section name="AdminMessagesSection">
         <element name="success" type="text" selector="#messages div.message-success"/>
         <element name="nthSuccess" type="text" selector=".message.message-success.success:nth-of-type({{n}})>div" parameterized="true"/>
+        <element name="error" type="text" selector="#messages div.message-error"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
index d967143258918..e1434e22489ce 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/EnableDisableBundleProductStatusTest.xml
@@ -75,11 +75,16 @@
         <seeElement stepKey="LookingForNameOfProduct" selector="{{BundleStorefrontSection.bundleProductName}}"/>
 
         <!--Testing disabled view-->
-        <actionGroup ref="FindProductToEdit" stepKey="FindProductEditPage"/>
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="GoToProductCatalog"/>
+        <waitForPageLoad stepKey="WaitForCatalogProductPageToLoad"/>
+        <actionGroup ref="filterProductGridBySku" stepKey="FindProductEditPage">
+            <argument name="product" value="BundleProduct"/>
+        </actionGroup>
+        <click selector="{{AdminDataGridTableSection.rowViewAction('1')}}" stepKey="ClickProductInGrid"/>
         <click stepKey="ClickOnEnableDisableToggle" selector="{{AdminProductFormBundleSection.enableDisableToggle}}"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickSaveButtonAgain"/>
-        <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="messageYouSavedTheProductIsShown2"/>
         <waitForPageLoad stepKey="PauseForSave"/>
+        <see selector="{{AdminCategoryMessagesSection.SuccessMessage}}" userInput="You saved the product." stepKey="messageYouSavedTheProductIsShownAgain"/>
         <amOnPage url="{{BundleProduct.urlKey}}.html" stepKey="GoToProductPageAgain"/>
         <waitForPageLoad stepKey="WaitForProductPageToLoadToShowElement"/>
         <dontSeeElement stepKey="LookingForNameOfProductTwo" selector="{{BundleStorefrontSection.bundleProductName}}"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
index a49d06545df05..ca5e297b72ffb 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminCreditMemoTotalSection.xml
@@ -10,7 +10,7 @@
         xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminCreditMemoTotalSection">
         <element name="subtotalRow" type="text" selector=".order-subtotal-table tbody > tr:nth-of-type({{row}}) td span.price" parameterized="true"/>
-        <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td/span/span[contains(@class, 'price')]" parameterized="true"/>
+        <element name="total" type="text" selector="//table[contains(@class,'order-subtotal-table')]/tbody/tr/td[contains(text(), '{{total}}')]/following-sibling::td//span[contains(@class, 'price')]" parameterized="true"/>
         <element name="refundShipping" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[shipping_amount]']"/>
         <element name="adjustmentRefund" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[adjustment_positive]'"/>
         <element name="adjustmentFee" type="input" selector=".order-subtotal-table tbody input[name='creditmemo[adjustment_negative]']"/>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml
index f4835cf02b704..bb0e1618c66e3 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderCreditMemosTabSection.xml
@@ -12,5 +12,6 @@
         <element name="spinner" type="text" selector="[data-role='spinner'][data-component*='sales_order_view_creditmemo']"/>
         <element name="gridRow" type="text" selector="#sales_order_view_tabs_order_creditmemos_content .data-grid tbody > tr:nth-of-type({{row}})" parameterized="true"/>
         <element name="viewGridRow" type="button" selector="#sales_order_view_tabs_order_creditmemos_content .data-grid tbody > tr:nth-of-type({{row}}) a[href*='order_creditmemo/view']" parameterized="true"/>
+        <element name="gridRowCell" type="text" selector="//div[@id='sales_order_view_tabs_order_creditmemos_content']//tr[{{row}}]//td[count(//div[@id='sales_order_view_tabs_order_creditmemos_content']//tr//th[contains(., '{{column}}')][1]/preceding-sibling::th) +1 ]" parameterized="true"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/lib/internal/Magento/Framework/Math/FloatComparator.php b/lib/internal/Magento/Framework/Math/FloatComparator.php
new file mode 100644
index 0000000000000..4053404369956
--- /dev/null
+++ b/lib/internal/Magento/Framework/Math/FloatComparator.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Math;
+
+/**
+ * Contains methods to compare float digits.
+ *
+ * @api
+ */
+class FloatComparator
+{
+    /**
+     * Precision for floats comparing.
+     *
+     * @var float
+     */
+    private static $epsilon = 0.00001;
+
+    /**
+     * Compares two float digits.
+     *
+     * @param float $a
+     * @param float $b
+     * @return bool
+     */
+    public function equal(float $a, float $b): bool
+    {
+        return abs($a - $b) <= self::$epsilon;
+    }
+
+    /**
+     * Compares if the first argument greater than the second argument.
+     *
+     * @param float $a
+     * @param float $b
+     * @return bool
+     */
+    public function greaterThan(float $a, float $b): bool
+    {
+        return ($a - $b) > self::$epsilon;
+    }
+
+    /**
+     * Compares if the first argument greater or equal to the second.
+     *
+     * @param float $a
+     * @param float $b
+     * @return bool
+     */
+    public function greaterThanOrEqual(float $a, float $b): bool
+    {
+        return $this->equal($a, $b) || $this->greaterThan($a, $b);
+    }
+}
diff --git a/lib/internal/Magento/Framework/Math/Test/Unit/FloatComparatorTest.php b/lib/internal/Magento/Framework/Math/Test/Unit/FloatComparatorTest.php
new file mode 100644
index 0000000000000..c9e5143ee789e
--- /dev/null
+++ b/lib/internal/Magento/Framework/Math/Test/Unit/FloatComparatorTest.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Framework\Math\Test\Unit;
+
+use Magento\Framework\Math\FloatComparator;
+use PHPUnit\Framework\TestCase;
+
+class FloatComparatorTest extends TestCase
+{
+    /**
+     * @var FloatComparator
+     */
+    private $comparator;
+
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
+    {
+        $this->comparator = new FloatComparator();
+    }
+
+    /**
+     * Checks a case when `a` and `b` are equal.
+     *
+     * @param float $a
+     * @param float $b
+     * @param bool $expected
+     * @dataProvider eqDataProvider
+     */
+    public function testEq(float $a, float $b, bool $expected)
+    {
+        self::assertEquals($expected, $this->comparator->equal($a, $b));
+    }
+
+    /**
+     * Gets list of variations to compare equal float.
+     *
+     * @return array
+     */
+    public function eqDataProvider(): array
+    {
+        return [
+            [10, 10.00001, true],
+            [10, 10.000001, true],
+            [10.0000099, 10.00001, true],
+            [1, 1.0001, false],
+            [1, -1.00001, false],
+        ];
+    }
+
+    /**
+     * Checks a case when `a` > `b`.
+     *
+     * @param float $a
+     * @param float $b
+     * @param bool $expected
+     * @dataProvider gtDataProvider
+     */
+    public function testGt(float $a, float $b, bool $expected)
+    {
+        self::assertEquals($expected, $this->comparator->greaterThan($a, $b));
+    }
+
+    /**
+     * Gets list of variations to compare if `a` > `b`.
+     *
+     * @return array
+     */
+    public function gtDataProvider(): array
+    {
+        return [
+            [10, 10.00001, false],
+            [10, 10.000001, false],
+            [10.0000099, 10.00001, false],
+            [1.0001, 1, true],
+            [1, -1.00001, true],
+        ];
+    }
+
+    /**
+     * Checks a case when `a` >= `b`.
+     *
+     * @param float $a
+     * @param float $b
+     * @param bool $expected
+     * @dataProvider gteDataProvider
+     */
+    public function testGte(float $a, float $b, bool $expected)
+    {
+        self::assertEquals($expected, $this->comparator->greaterThanOrEqual($a, $b));
+    }
+
+    /**
+     * Gets list of variations to compare if `a` >= `b`.
+     *
+     * @return array
+     */
+    public function gteDataProvider(): array
+    {
+        return [
+            [10, 10.00001, true],
+            [10, 10.000001, true],
+            [10.0000099, 10.00001, true],
+            [1.0001, 1, true],
+            [1, -1.00001, true],
+            [1.0001, 1.001, false],
+        ];
+    }
+}