Merge pull request #13434 from marcusmoore/chore/improve-test-stability

Improved test stability and messaging
This commit is contained in:
snipe 2023-08-10 09:57:26 +01:00 committed by GitHub
commit a599f0c923
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -24,7 +24,10 @@ trait CustomTestMacros
function (Model $model, string $property = 'name') use ($guardAgainstNullProperty) { function (Model $model, string $property = 'name') use ($guardAgainstNullProperty) {
$guardAgainstNullProperty($model, $property); $guardAgainstNullProperty($model, $property);
Assert::assertTrue(collect($this['rows'])->pluck($property)->contains($model->{$property})); Assert::assertTrue(
collect($this['rows'])->pluck($property)->contains(e($model->{$property})),
"Response did not contain the expected value: {$model->{$property}}"
);
return $this; return $this;
} }
@ -35,7 +38,10 @@ trait CustomTestMacros
function (Model $model, string $property = 'name') use ($guardAgainstNullProperty) { function (Model $model, string $property = 'name') use ($guardAgainstNullProperty) {
$guardAgainstNullProperty($model, $property); $guardAgainstNullProperty($model, $property);
Assert::assertFalse(collect($this['rows'])->pluck($property)->contains($model->{$property})); Assert::assertFalse(
collect($this['rows'])->pluck($property)->contains(e($model->{$property})),
"Response contained unexpected value: {$model->{$property}}"
);
return $this; return $this;
} }
@ -46,7 +52,10 @@ trait CustomTestMacros
function (Model $model, string $property = 'id') use ($guardAgainstNullProperty) { function (Model $model, string $property = 'id') use ($guardAgainstNullProperty) {
$guardAgainstNullProperty($model, $property); $guardAgainstNullProperty($model, $property);
Assert::assertTrue(collect($this->json('results'))->pluck('id')->contains($model->{$property})); Assert::assertTrue(
collect($this->json('results'))->pluck('id')->contains(e($model->{$property})),
"Response did not contain the expected value: {$model->{$property}}"
);
return $this; return $this;
} }
@ -57,7 +66,10 @@ trait CustomTestMacros
function (Model $model, string $property = 'id') use ($guardAgainstNullProperty) { function (Model $model, string $property = 'id') use ($guardAgainstNullProperty) {
$guardAgainstNullProperty($model, $property); $guardAgainstNullProperty($model, $property);
Assert::assertFalse(collect($this->json('results'))->pluck('id')->contains($model->{$property})); Assert::assertFalse(
collect($this->json('results'))->pluck('id')->contains(e($model->{$property})),
"Response contained unexpected value: {$model->{$property}}"
);
return $this; return $this;
} }