Skip to content

Commit 4b2d235

Browse files
committed
MAGETWO-56529: Magento\Framework\Session\SaveHandlerTest test failed
1 parent def3906 commit 4b2d235

File tree

1 file changed

+28
-12
lines changed

1 file changed

+28
-12
lines changed

dev/tests/integration/testsuite/Magento/Framework/Session/SaveHandlerTest.php

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,7 @@ public function setUp()
2929
*/
3030
public function testSetSaveHandler($deploymentConfigHandler, $iniHandler)
3131
{
32-
// Set expected session.save_handler config
33-
if ($deploymentConfigHandler) {
34-
if ($deploymentConfigHandler !== 'files') {
35-
$expected = 'user';
36-
} else {
37-
$expected = $deploymentConfigHandler;
38-
}
39-
} else if ($iniHandler) {
40-
$expected = $iniHandler;
41-
} else {
42-
$expected = SaveHandlerInterface::DEFAULT_HANDLER;
43-
}
32+
$expected = $this->getExpectedSaveHandler($deploymentConfigHandler, $iniHandler);
4433

4534
// Set ini configuration
4635
if ($iniHandler) {
@@ -84,4 +73,31 @@ public function saveHandlerProvider()
8473
[false, false],
8574
];
8675
}
76+
77+
/**
78+
* Retrieve expected session.save_handler
79+
*
80+
* @param string $deploymentConfigHandler
81+
* @param string $iniHandler
82+
* @return string
83+
*/
84+
private function getExpectedSaveHandler($deploymentConfigHandler, $iniHandler)
85+
{
86+
// Set expected session.save_handler config
87+
if ($deploymentConfigHandler) {
88+
if ($deploymentConfigHandler !== 'files') {
89+
$expected = 'user';
90+
return $expected;
91+
} else {
92+
$expected = $deploymentConfigHandler;
93+
return $expected;
94+
}
95+
} elseif ($iniHandler) {
96+
$expected = $iniHandler;
97+
return $expected;
98+
} else {
99+
$expected = SaveHandlerInterface::DEFAULT_HANDLER;
100+
return $expected;
101+
}
102+
}
87103
}

0 commit comments

Comments
 (0)