Merge remote-tracking branch 'origin/MAGETWO-63197' into PR_26042017

Author: Dmytro Vilchynskyi

dev/tests/functional/tests/app/Magento/Backend/Test/TestCase/ConfigureSecureUrlsTest.php

@@ -93,20 +93,14 @@ class ConfigureSecureUrlsTest extends Injectable
      *
      * @param FixtureFactory $fixtureFactory
      * @param SystemConfigEdit $configurationAdminPage
-     * @param Cache $cache
-     * @param StaticContent $staticContent
      * @return void
      */
     public function __inject(
         FixtureFactory $fixtureFactory,
-        SystemConfigEdit $configurationAdminPage,
-        Cache $cache,
-        StaticContent $staticContent
+        SystemConfigEdit $configurationAdminPage
     ) {
         $this->fixtureFactory = $fixtureFactory;
         $this->configurationAdminPage = $configurationAdminPage;
-        $this->cache = $cache;
-        $this->staticContent = $staticContent;
     }
 
     /**
@@ -138,7 +132,14 @@ public function test($configData)
         $this->configurationAdminPage->getPageActions()->save();
         $_ENV['app_backend_url'] = str_replace('http', 'https', $_ENV['app_backend_url']);
 
+        $this->configurationAdminPage = $this->objectManager->create(
+            \Magento\Backend\Test\Page\Adminhtml\SystemConfigEdit::class
+        );
+
+        $this->cache = $this->objectManager->create(\Magento\Mtf\Util\Command\Cli\Cache::class);
         $this->cache->flush(['config', 'full_page']);
+
+        $this->staticContent = $this->objectManager->create(\Magento\Mtf\Util\Command\Cli\StaticContent::class);
         $this->staticContent->deploy();
     }