Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ trait BasicActionRunnerTests extends ActionProxyContainerTestUtils {
initCode should be(200)
val (runCode, out) = c.run(JsObject.empty)
runCode should not be (200)
out should be(Some(JsObject("error" -> JsString("The action did not return a dictionary or array."))))

out should (be(Some(JsObject("error" -> JsString("The action did not return a dictionary or array.")))) or be(
Some(JsObject("error" -> JsString("The action did not return a dictionary.")))))
}

checkStreams(out, err, {
Expand Down