MAGETWO-33053: MTF Configuration pull request

Michael Logvin · Michael Logvin · commit ae5ab155a47b · 2015-01-28T12:04:29.000+02:00
diff --git a/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php b/dev/tests/functional/lib/Magento/Mtf/Util/Protocol/CurlTransport/BackendDecorator.php
@@ -65,7 +65,7 @@ public function __construct(CurlTransport $transport, Config $configuration)
      */
     protected function authorize()
     {
-        $url = $this->configuration->getParameter('application/appBackendUrl') .
+        $url = $_ENV['app_backend_url'] .
             $this->configuration->getParameter('application/backendLoginUrl');
         $data = [
             'login[username]' => $this->configuration->getParameter('application/backendLogin'),
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/Curl/CreateBundle.php b/dev/tests/functional/tests/app/Magento/Bundle/Test/Handler/Curl/CreateBundle.php
@@ -158,8 +158,7 @@ protected function _getUrl(array $config)
         foreach ($requestParams as $key => $value) {
             $params .= $key . '/' . $value . '/';
         }
-        $backendUrl = $this->_configuration->get('application', 'appBackendUrl');
-        return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';
+        return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
@@ -437,7 +437,6 @@ protected function getUrl(array $config)
         foreach ($requestParams as $key => $value) {
             $params .= $key . '/' . $value . '/';
         }
-        $backendUrl = $this->_configuration->get('application', 'appBackendUrl');
-        return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';
+        return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProduct.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/Curl/CreateProduct.php
@@ -74,8 +74,7 @@ protected function _getUrl(array $config)
         foreach ($requestParams as $key => $value) {
             $params .= $key . '/' . $value . '/';
         }
-        $backendUrl = $this->_configuration->get('application', 'appBackendUrl');
-        return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';
+        return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';
     }
 
     /**
diff --git a/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php b/dev/tests/functional/tests/app/Magento/Core/Test/Handler/ConfigData/Curl.php
@@ -97,7 +97,7 @@ protected function applyConfigSettings(array $data, $section)
      */
     protected function getUrl($section)
     {
-        return $this->_configuration->getParameter('application/appBackendUrl') .
+        return $_ENV['app_backend_url'] .
         'admin/system_config/save/section/' . $section;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/Curl/CreateDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Handler/Curl/CreateDownloadable.php
@@ -100,8 +100,7 @@ protected function getUrl(array $config)
         foreach ($requestParams as $key => $value) {
             $params .= $key . '/' . $value . '/';
         }
-        $backendUrl = $this->_configuration->get('application', 'appBackendUrl');
-        return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';
+        return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function __construct(CurlTransport $transport, Config $configuration)`
`65`	`65`	`*/`
`66`	`66`	`protected function authorize()`
`67`	`67`	`{`
`68`		`- $url = $this->configuration->getParameter('application/appBackendUrl') .`
	`68`	`+ $url = $_ENV['app_backend_url'] .`
`69`	`69`	`$this->configuration->getParameter('application/backendLoginUrl');`
`70`	`70`	`$data = [`
`71`	`71`	`'login[username]' => $this->configuration->getParameter('application/backendLogin'),`
Original file line number	Diff line number	Diff line change
`@@ -158,8 +158,7 @@ protected function _getUrl(array $config)`
`158`	`158`	`foreach ($requestParams as $key => $value) {`
`159`	`159`	`$params .= $key . '/' . $value . '/';`
`160`	`160`	`}`
`161`		`- $backendUrl = $this->_configuration->get('application', 'appBackendUrl');`
`162`		`- return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
	`161`	`+ return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
`163`	`162`	`}`
`164`	`163`
`165`	`164`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,6 @@ protected function getUrl(array $config)`
`437`	`437`	`foreach ($requestParams as $key => $value) {`
`438`	`438`	`$params .= $key . '/' . $value . '/';`
`439`	`439`	`}`
`440`		`- $backendUrl = $this->_configuration->get('application', 'appBackendUrl');`
`441`		`- return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
	`440`	`+ return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
`442`	`441`	`}`
`443`	`442`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,7 @@ protected function _getUrl(array $config)`
`74`	`74`	`foreach ($requestParams as $key => $value) {`
`75`	`75`	`$params .= $key . '/' . $value . '/';`
`76`	`76`	`}`
`77`		`- $backendUrl = $this->_configuration->get('application', 'appBackendUrl');`
`78`		`- return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
	`77`	`+ return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
`79`	`78`	`}`
`80`	`79`
`81`	`80`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ protected function applyConfigSettings(array $data, $section)`
`97`	`97`	`*/`
`98`	`98`	`protected function getUrl($section)`
`99`	`99`	`{`
`100`		`- return $this->_configuration->getParameter('application/appBackendUrl') .`
	`100`	`+ return $_ENV['app_backend_url'] .`
`101`	`101`	`'admin/system_config/save/section/' . $section;`
`102`	`102`	`}`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,7 @@ protected function getUrl(array $config)`
`100`	`100`	`foreach ($requestParams as $key => $value) {`
`101`	`101`	`$params .= $key . '/' . $value . '/';`
`102`	`102`	`}`
`103`		`- $backendUrl = $this->_configuration->get('application', 'appBackendUrl');`
`104`		`- return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
	`103`	`+ return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
`105`	`104`	`}`
`106`	`105`
`107`	`106`	`/**`