Skip to content

Commit 0495378

Browse files
committed
moved status message switching logic in separate function
1 parent aee9ad4 commit 0495378

File tree

2 files changed

+23
-10
lines changed

2 files changed

+23
-10
lines changed

tests/acceptance/features/bootstrap/OCSContext.php

+23-10
Original file line numberDiff line numberDiff line change
@@ -706,16 +706,7 @@ public function theOcsStatusCodeShouldBeOr($statusCode1, $statusCode2) {
706706
* @return void
707707
*/
708708
public function theOCSStatusMessageShouldBe($statusMessage, $language=null) {
709-
if ($language !== null) {
710-
$multiLingualMessage = \json_decode(
711-
\file_get_contents("./tests/acceptance/multiLanguageErrors.json"),
712-
true
713-
);
714-
715-
if (isset($multiLingualMessage[$statusMessage][$language])) {
716-
$statusMessage = $multiLingualMessage[$statusMessage][$language];
717-
}
718-
}
709+
$statusMessage = $this->getActualStatusMessage($statusMessage, $language);
719710

720711
Assert::assertEquals(
721712
$statusMessage,
@@ -817,6 +808,28 @@ public function getOCSResponseStatusMessage($response) {
817808
return (string) $this->featureContext->getResponseXml($response, __METHOD__)->meta[0]->message;
818809
}
819810

811+
/**
812+
* convert status message in the desired language
813+
*
814+
* @param $statusMessage
815+
* @param $language
816+
*
817+
* @return string
818+
*/
819+
public function getActualStatusMessage($statusMessage, $language) {
820+
if ($language !== null) {
821+
$multiLingualMessage = \json_decode(
822+
\file_get_contents("./tests/acceptance/fixtures/multiLanguageErrors.json"),
823+
true
824+
);
825+
826+
if (isset($multiLingualMessage[$statusMessage][$language])) {
827+
$statusMessage = $multiLingualMessage[$statusMessage][$language];
828+
}
829+
}
830+
return $statusMessage;
831+
}
832+
820833
/**
821834
* check if the HTTP status code and the OCS status code indicate that the request was successful
822835
* this function is aware of the currently used OCS version

0 commit comments

Comments
 (0)