Skip to content

Commit 9e2cd51

Browse files
author
Yurii Torbyk
committed
MAGETWO-34993: Refactor controllers from the list (Part1)
1 parent 6b712c7 commit 9e2cd51

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

app/code/Magento/Customer/Test/Unit/Controller/Account/ConfirmTest.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,8 @@ public function testSuccessRedirect(
399399

400400
$this->scopeConfigMock->expects($this->once())
401401
->method('isSetFlag')
402-
->with(Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD,
402+
->with(
403+
Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD,
403404
ScopeInterface::SCOPE_STORE
404405
)
405406
->willReturn($isSetFlag);

app/code/Magento/Integration/Test/Unit/Controller/Adminhtml/Integration/DeleteTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ class DeleteTest extends \Magento\Integration\Test\Unit\Controller\Adminhtml\Int
1717
/**
1818
* @var \Magento\Integration\Controller\Adminhtml\Integration\Delete
1919
*/
20-
protected $integrationContr;
20+
protected $integrationController;
2121

2222
protected function setUp()
2323
{
2424
parent::setUp();
2525

26-
$this->integrationContr = $this->_createIntegrationController('Delete');
26+
$this->integrationController = $this->_createIntegrationController('Delete');
2727

2828
$resultRedirect = $this->getMockBuilder('Magento\Backend\Model\View\Result\Redirect')
2929
->disableOriginalConstructor()
@@ -59,7 +59,7 @@ public function testDeleteAction()
5959
->method('addSuccess')
6060
->with(__('The integration \'%1\' has been deleted.', $intData[Info::DATA_NAME]));
6161

62-
$this->integrationContr->execute();
62+
$this->integrationController->execute();
6363
}
6464

6565
public function testDeleteActionWithConsumer()
@@ -88,7 +88,7 @@ public function testDeleteActionWithConsumer()
8888
->method('addSuccess')
8989
->with(__('The integration \'%1\' has been deleted.', $intData[Info::DATA_NAME]));
9090

91-
$this->integrationContr->execute();
91+
$this->integrationController->execute();
9292
}
9393

9494
public function testDeleteActionConfigSetUp()
@@ -116,7 +116,7 @@ public function testDeleteActionConfigSetUp()
116116
// verify success message
117117
$this->_messageManager->expects($this->never())->method('addSuccess');
118118

119-
$this->integrationContr->execute();
119+
$this->integrationController->execute();
120120
}
121121

122122
public function testDeleteActionMissingId()
@@ -130,7 +130,7 @@ public function testDeleteActionMissingId()
130130
->method('addError')
131131
->with(__('Integration ID is not specified or is invalid.'));
132132

133-
$this->integrationContr->execute();
133+
$this->integrationController->execute();
134134
}
135135

136136
/**
@@ -156,7 +156,7 @@ public function testDeleteActionForServiceIntegrationException()
156156
->willThrowException($invalidIdException);
157157
$this->_messageManager->expects($this->never())->method('addError');
158158

159-
$this->integrationContr->execute();
159+
$this->integrationController->execute();
160160
}
161161

162162
/**
@@ -182,6 +182,6 @@ public function testDeleteActionForServiceGenericException()
182182
->willThrowException($invalidIdException);
183183
$this->_messageManager->expects($this->never())->method('addError');
184184

185-
$this->integrationContr->execute();
185+
$this->integrationController->execute();
186186
}
187187
}

0 commit comments

Comments
 (0)