#10558: Option to send currency in Google Adwords when using dynamic value

 - Fixes per failed tests

Author: ishakhsuvarov

app/code/Magento/GoogleAdwords/Observer/SetConversionValueObserver.php

@@ -58,12 +58,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
             return $this;
         }
         $this->_collection->addFieldToFilter('entity_id', ['in' => $orderIds]);
-        $conversionValue = 0;
-        /** @var $order \Magento\Sales\Model\Order */
 
+        $conversionValue = 0;
+        $conversionCurrency = false;
+        $orderHasSendCurrency = $this->_helper->hasSendCurrency();
         foreach ($this->_collection as $order) {
-            $conversionValue += ($this->_helper->hasSendCurrency()) ? $order->getGrandTotal() :  $order->getBaseGrandTotal();
-            $conversionCurrency = ($this->_helper->hasSendCurrency()) ? $order->getOrderCurrencyCode() : false;
+            /** @var $order \Magento\Sales\Model\Order */
+            $conversionValue += $orderHasSendCurrency ? $order->getGrandTotal() : $order->getBaseGrandTotal();
+            $conversionCurrency = $orderHasSendCurrency ? $order->getOrderCurrencyCode() : false;
         }
         $this->_registry->register(
             \Magento\GoogleAdwords\Helper\Data::CONVERSION_VALUE_CURRENCY_REGISTRY_NAME,

app/code/Magento/GoogleAdwords/Test/Unit/Helper/DataTest.php

@@ -172,7 +172,6 @@ public function dataProviderForTestStoreConfig()
             ['getConversionLabel', \Magento\GoogleAdwords\Helper\Data::XML_PATH_CONVERSION_LABEL, 'Label'],
             ['getConversionValueType', \Magento\GoogleAdwords\Helper\Data::XML_PATH_CONVERSION_VALUE_TYPE, '1'],
             ['getConversionValueConstant', \Magento\GoogleAdwords\Helper\Data::XML_PATH_CONVERSION_VALUE, '0'],
-            ['hasSendCurrency', \Magento\GoogleAdwords\Helper\Data::XML_PATH_SEND_CURRENCY, '1']
         ];
     }
 
@@ -197,10 +196,16 @@ public function testGetStoreConfigValue($method, $xmlPath, $returnValue)
         $this->assertEquals($returnValue, $this->_helper->{$method}());
     }
 
+    public function testHasSendCurrency()
+    {
+        $this->_scopeConfigMock->expects($this->once())->method('isSetFlag')->willReturn(true);
+
+        $this->assertTrue($this->_helper->hasSendCurrency());
+    }
+
     public function testGetConversionValueDynamic()
     {
         $returnValue = 4.1;
-        $returnValueCurrency = 'USD';
         $this->_scopeConfigMock->expects(
             $this->any()
         )->method(
@@ -219,6 +224,16 @@ public function testGetConversionValueDynamic()
         )->will(
             $this->returnValue($returnValue)
         );
+
+
+        $this->assertEquals($returnValue, $this->_helper->getConversionValue());
+
+    }
+
+    public function testGetConversionValueCurrency()
+    {
+        $returnValueCurrency = 'USD';
+        $this->_scopeConfigMock->expects($this->once())->method('isSetFlag')->willReturn(true);
         $this->_registryMock->expects(
             $this->once()
         )->method(
@@ -229,7 +244,6 @@ public function testGetConversionValueDynamic()
             $this->returnValue($returnValueCurrency)
         );
 
-        $this->assertEquals($returnValue, $this->_helper->getConversionValue());
         $this->assertEquals($returnValueCurrency, $this->_helper->getConversionValueCurrency());
     }
 

app/code/Magento/GoogleAdwords/Test/Unit/Observer/SetConversionValueObserverTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\GoogleAdwords\Test\Unit\Observer;
 
+use Magento\GoogleAdwords\Helper\Data;
+
 class SetConversionValueObserverTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -135,7 +137,10 @@ public function testSetConversionValueWhenAdwordsActiveWithOrdersIds()
             $this->returnValue($this->_eventMock)
         );
 
-        $iteratorMock = $this->createMock(\Iterator::class);
+        $orderMock = $this->createMock(\Magento\Sales\Api\Data\OrderInterface::class);
+        $orderMock->expects($this->once())->method('getOrderCurrencyCode')->willReturn($conversionCurrency);
+
+        $iteratorMock = new \ArrayIterator([$orderMock]);
         $this->_collectionMock->expects($this->any())->method('getIterator')->will($this->returnValue($iteratorMock));
         $this->_collectionMock->expects(
             $this->once()
@@ -146,20 +151,18 @@ public function testSetConversionValueWhenAdwordsActiveWithOrdersIds()
             ['in' => $ordersIds]
         );
         $this->_registryMock->expects(
-            $this->once()
+            $this->atLeastOnce()
         )->method(
             'register'
-        )->with(
-            \Magento\GoogleAdwords\Helper\Data::CONVERSION_VALUE_REGISTRY_NAME,
-            $conversionValue
-        );
-        $this->_registryMock->expects(
-            $this->once()
-        )->method(
-            'register'
-        )->with(
-            \Magento\GoogleAdwords\Helper\Data::CONVERSION_VALUE_CURRENCY_REGISTRY_NAME,
-            $conversionCurrency
+        )->withConsecutive(
+            [
+                Data::CONVERSION_VALUE_CURRENCY_REGISTRY_NAME,
+                $conversionCurrency
+            ],
+            [
+                Data::CONVERSION_VALUE_REGISTRY_NAME,
+                $conversionValue,
+            ]
         );
 
         $this->assertSame($this->_model, $this->_model->execute($this->_eventObserverMock));