ENGCOM-1050: Moved Google Analytics block code to head tag #8837 #14293

(cherry picked from commit 152ae09)

Author: Stanislav Idolov

app/code/Magento/GoogleAnalytics/etc/adminhtml/system.xml

@@ -23,11 +23,10 @@
                         <field id="*/*/active">1</field>
                     </depends>
                 </field>
-
-		<field id="anonymize" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="anonymize" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Anonymize IP</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
-		    <depends>
+                    <depends>
                         <field id="*/*/active">1</field>
                     </depends>
                 </field>

dev/tests/integration/testsuite/Magento/GoogleAnalytics/Block/GaTest.php

@@ -6,7 +6,6 @@
 
 namespace Magento\GoogleAnalytics\Block;
 
-use Magento\Framework\App\ObjectManager;
 use Magento\TestFramework\TestCase\AbstractController;
 
 class GaTest extends AbstractController
@@ -25,9 +24,7 @@ protected function setUp()
     {
         parent::setUp();
         $this->dispatch('/');
-        $this->layout = ObjectManager::getInstance()->get(
-            \Magento\Framework\View\LayoutInterface::class
-        );
+        $this->layout = $this->_objectManager->get(\Magento\Framework\View\LayoutInterface::class);
     }
 
     /**
@@ -90,6 +87,12 @@ public function testBlockOutputExistsWhenGaIsEnabled()
      */
     private function getGaBlockFromNode($nodeName = 'head.additional')
     {
-        return $this->layout->getChildBlock($nodeName, 'google_analytics');
+        $childBlocks = $this->layout->getChildBlocks($nodeName);
+        foreach ($childBlocks as $block) {
+            if (strpos($block->getNameInLayout(), 'google_analytics') !== false) {
+                return $block;
+            }
+        }
+        return false;
     }
 }