MAGETWO-33053: MTF Configuration pull request

Michael Logvin · Michael Logvin · commit 19115a6cfc98 · 2015-01-28T11:32:44.000+02:00
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,7 +158,8 @@ protected function _getUrl(array $config)
         foreach ($requestParams as $key => $value) {
             $params .= $key . '/' . $value . '/';
         }
-        return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';
+        $backendUrl = $this->_configuration->get('application', 'appBackendUrl');
+        return $backendUrl . '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,7 @@ protected function getUrl(array $config)
         foreach ($requestParams as $key => $value) {
             $params .= $key . '/' . $value . '/';
         }
-
-        return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';
+        $backendUrl = $this->_configuration->get('application', 'appBackendUrl');
+        return $backendUrl . '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,7 +74,8 @@ protected function _getUrl(array $config)
         foreach ($requestParams as $key => $value) {
             $params .= $key . '/' . $value . '/';
         }
-        return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';
+        $backendUrl = $this->_configuration->get('application', 'appBackendUrl');
+        return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';
     }
 
     /**
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,7 +100,8 @@ protected function getUrl(array $config)
         foreach ($requestParams as $key => $value) {
             $params .= $key . '/' . $value . '/';
         }
-        return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';
+        $backendUrl = $this->_configuration->get('application', 'appBackendUrl');
+        return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,8 @@ protected function _getUrl(array $config)`
`158`	`158`	`foreach ($requestParams as $key => $value) {`
`159`	`159`	`$params .= $key . '/' . $value . '/';`
`160`	`160`	`}`
`161`		`- return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
	`161`	`+ $backendUrl = $this->_configuration->get('application', 'appBackendUrl');`
	`162`	`+ return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -437,7 +437,7 @@ protected function getUrl(array $config)`
`437`	`437`	`foreach ($requestParams as $key => $value) {`
`438`	`438`	`$params .= $key . '/' . $value . '/';`
`439`	`439`	`}`
`440`		`-`
`441`		`- return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
	`440`	`+ $backendUrl = $this->_configuration->get('application', 'appBackendUrl');`
	`441`	`+ return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
`442`	`442`	`}`
`443`	`443`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,8 @@ protected function _getUrl(array $config)`
`74`	`74`	`foreach ($requestParams as $key => $value) {`
`75`	`75`	`$params .= $key . '/' . $value . '/';`
`76`	`76`	`}`
`77`		`- return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
	`77`	`+ $backendUrl = $this->_configuration->get('application', 'appBackendUrl');`
	`78`	`+ return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,8 @@ protected function getUrl(array $config)`
`100`	`100`	`foreach ($requestParams as $key => $value) {`
`101`	`101`	`$params .= $key . '/' . $value . '/';`
`102`	`102`	`}`
`103`		`- return $_ENV['app_backend_url'] . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
	`103`	`+ $backendUrl = $this->_configuration->get('application', 'appBackendUrl');`
	`104`	`+ return $backendUrl . 'catalog/product/save/' . $params . 'popup/1/back/edit';`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`/**`