Merge branch 'MAGETWO-55775-Eliminate-in-Site-Related' into pr

Author: Igor Melnikov

app/code/Magento/Directory/Test/Unit/Block/CurrencyTest.php

@@ -3,7 +3,6 @@
  * Copyright © 2016 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 namespace Magento\Directory\Test\Unit\Block;
 
 class CurrencyTest extends \PHPUnit_Framework_TestCase
@@ -16,29 +15,31 @@ class CurrencyTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $postDataHelper;
+    protected $postDataHelperMock;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $urlBuilder;
+    protected $urlBuilderMock;
 
     protected function setUp()
     {
-        $this->urlBuilder = $this->getMock(
+        $this->urlBuilderMock = $this->getMock(
             \Magento\Framework\UrlInterface::class,
             [],
             [],
             '',
             false
         );
-        $this->urlBuilder->expects($this->any())->method('getUrl')->will($this->returnArgument(0));
+        $this->urlBuilderMock->expects($this->any())->method('getUrl')->will($this->returnArgument(0));
 
-        /** @var $context \Magento\Framework\View\Element\Template\Context|\PHPUnit_Framework_MockObject_MockObject */
-        $context = $this->getMockBuilder(\Magento\Framework\View\Element\Template\Context::class)
+        /**
+         * @var \Magento\Framework\View\Element\Template\Context|\PHPUnit_Framework_MockObject_MockObject $contextMock
+         */
+        $contextMock = $this->getMockBuilder(\Magento\Framework\View\Element\Template\Context::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $context->expects($this->any())->method('getUrlBuilder')->will($this->returnValue($this->urlBuilder));
+        $contextMock->expects($this->any())->method('getUrlBuilder')->will($this->returnValue($this->urlBuilderMock));
 
         $escaperMock = $this->getMockBuilder(\Magento\Framework\Escaper::class)
             ->disableOriginalConstructor()
@@ -49,22 +50,22 @@ function ($string) {
                     return 'escapeUrl' . $string;
                 }
             );
-        $context->expects($this->once())
+        $contextMock->expects($this->once())
             ->method('getEscaper')
             ->willReturn($escaperMock);
 
-        /** @var \Magento\Directory\Model\CurrencyFactory $currencyFactory */
-        $currencyFactory = $this->getMock(\Magento\Directory\Model\CurrencyFactory::class, [], [], '', false);
-        $this->postDataHelper = $this->getMock(\Magento\Framework\Data\Helper\PostHelper::class, [], [], '', false);
+        /** @var \Magento\Directory\Model\CurrencyFactory $currencyFactoryMock */
+        $currencyFactoryMock = $this->getMock(\Magento\Directory\Model\CurrencyFactory::class, [], [], '', false);
+        $this->postDataHelperMock = $this->getMock(\Magento\Framework\Data\Helper\PostHelper::class, [], [], '', false);
 
-        /** @var \Magento\Framework\Locale\ResolverInterface $localeResolver */
-        $localeResolver = $this->getMock(\Magento\Framework\Locale\ResolverInterface::class, [], [], '', false);
+        /** @var \Magento\Framework\Locale\ResolverInterface $localeResolverMock */
+        $localeResolverMock = $this->getMock(\Magento\Framework\Locale\ResolverInterface::class, [], [], '', false);
 
         $this->object = new \Magento\Directory\Block\Currency(
-            $context,
-            $currencyFactory,
-            $this->postDataHelper,
-            $localeResolver
+            $contextMock,
+            $currencyFactoryMock,
+            $this->postDataHelperMock,
+            $localeResolverMock
         );
     }
 
@@ -74,7 +75,7 @@ public function testGetSwitchCurrencyPostData()
         $expectedCurrencyCode = 'test';
         $switchUrl = 'escapeUrldirectory/currency/switch';
 
-        $this->postDataHelper->expects($this->once())
+        $this->postDataHelperMock->expects($this->once())
             ->method('getPostData')
             ->with($this->equalTo($switchUrl), $this->equalTo(['currency' => $expectedCurrencyCode]))
             ->will($this->returnValue($expectedResult));