Skip to content

Commit bfabb2d

Browse files
author
Eugene Tulika
committed
MAGETWO-38059: [TD] Create list of SOAP endpoints
- Fix tests
1 parent 1d3edea commit bfabb2d

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

app/code/Magento/Webapi/Controller/Soap.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ class Soap implements \Magento\Framework\App\FrontControllerInterface
7474
protected $rendererFactory;
7575

7676
/**
77-
* Initialize dependencies.
78-
*
7977
* @param Soap\Request $request
8078
* @param Response $response
8179
* @param \Magento\Webapi\Model\Soap\Wsdl\Generator $wsdlGenerator
@@ -84,7 +82,9 @@ class Soap implements \Magento\Framework\App\FrontControllerInterface
8482
* @param \Magento\Framework\App\State $appState
8583
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
8684
* @param PathProcessor $pathProcessor
85+
* @param \Magento\Framework\Webapi\Rest\Response\RendererFactory $rendererFactory
8786
* @param \Magento\Framework\App\AreaList $areaList
87+
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
8888
*/
8989
public function __construct(
9090
\Magento\Webapi\Controller\Soap\Request $request,
@@ -131,15 +131,14 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
131131
$this->_setResponseBody($responseBody);
132132
} else if ($this->_isWsdlListRequest()) {
133133
$servicesList = [];
134-
foreach ($this->_wsdlGenerator->getListOfServices() as $serviceName => $serviceData) {
134+
foreach (array_keys($this->_wsdlGenerator->getListOfServices()) as $serviceName) {
135135
$servicesList[$serviceName]['wsdl_endpoint'] = $this->_soapServer->getEndpointUri()
136136
. '?' . \Magento\Webapi\Model\Soap\Server::REQUEST_PARAM_WSDL . '&services=' . $serviceName;
137137
}
138138
$renderer = $this->rendererFactory->get();
139139
$this->_setResponseContentType($renderer->getMimeType());
140140
$this->_setResponseBody($renderer->render($servicesList));
141-
}
142-
else {
141+
} else {
143142
$this->_soapServer->handle();
144143
}
145144
} catch (\Exception $e) {

app/code/Magento/Webapi/Test/Unit/Controller/SoapTest.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ class SoapTest extends \PHPUnit_Framework_TestCase
4444
*/
4545
protected $_localeMock;
4646

47+
/**
48+
* @var \PHPUnit_Framework_MockObject_MockObject|\Magento\Framework\App\State
49+
*/
50+
protected $_appStateMock;
51+
4752
/**
4853
* Set up Controller object.
4954
*/
@@ -71,7 +76,8 @@ protected function setUp()
7176
->disableOriginalConstructor()
7277
->setMethods(['maskException'])
7378
->getMock();
74-
$this->_appStateMock = $this->getMock('\Magento\Framework\App\State', [], [], '', false);
79+
80+
$this->_appStateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false);
7581

7682
$localeResolverMock = $this->getMockBuilder(
7783
'Magento\Framework\Locale\Resolver'
@@ -93,6 +99,10 @@ protected function setUp()
9399
$areaListMock = $this->getMock('Magento\Framework\App\AreaList', [], [], '', false);
94100
$areaMock = $this->getMock('Magento\Framework\App\AreaInterface');
95101
$areaListMock->expects($this->any())->method('getArea')->will($this->returnValue($areaMock));
102+
103+
$rendererMock = $this->getMockBuilder('Magento\Framework\Webapi\Rest\Response\RendererFactory')
104+
->disableOriginalConstructor()
105+
->getMock();
96106
$this->_soapController = new \Magento\Webapi\Controller\Soap(
97107
$this->_requestMock,
98108
$this->_responseMock,
@@ -102,6 +112,7 @@ protected function setUp()
102112
$this->_appStateMock,
103113
$localeResolverMock,
104114
$pathProcessorMock,
115+
$rendererMock,
105116
$areaListMock
106117
);
107118
}

0 commit comments

Comments
 (0)