implements multiple needles in expect()->toContain()

This commit is contained in:
Fabio Ivona
2021-07-31 18:29:03 +02:00
parent 252f9a0e46
commit 675b0f1ec8
3 changed files with 46 additions and 9 deletions

View File

@ -266,14 +266,16 @@ final class Expectation
/** /**
* Asserts that $needle is an element of the value. * Asserts that $needle is an element of the value.
* *
* @param mixed $needle * @param mixed $needles
*/ */
public function toContain($needle): Expectation public function toContain(...$needles): Expectation
{ {
if (is_string($this->value)) { foreach ($needles as $needle) {
Assert::assertStringContainsString($needle, $this->value); if (is_string($this->value)) {
} else { Assert::assertStringContainsString($needle, $this->value);
Assert::assertContains($needle, $this->value); } else {
Assert::assertContains($needle, $this->value);
}
} }
return $this; return $this;

View File

@ -325,9 +325,16 @@
PASS Tests\Features\Expect\toContain PASS Tests\Features\Expect\toContain
✓ passes strings ✓ passes strings
✓ passes strings with multiple needles
✓ passes arrays ✓ passes arrays
✓ passes arrays with multiple needles
✓ passes with array needles
✓ failures ✓ failures
✓ failures with multiple needles (all failing)
✓ failures with multiple needles (some failing)
✓ not failures ✓ not failures
✓ not failures with multiple needles (all failing)
✓ not failures with multiple needles (some failing)
PASS Tests\Features\Expect\toEndWith PASS Tests\Features\Expect\toEndWith
✓ pass ✓ pass
@ -601,5 +608,5 @@
✓ it is a test ✓ it is a test
✓ it uses correct parent class ✓ it uses correct parent class
Tests: 4 incompleted, 9 skipped, 381 passed Tests: 4 incompleted, 9 skipped, 388 passed

View File

@ -3,17 +3,45 @@
use PHPUnit\Framework\ExpectationFailedException; use PHPUnit\Framework\ExpectationFailedException;
test('passes strings', function () { test('passes strings', function () {
expect([1, 2, 42])->toContain(42); expect('Nuno')->toContain('Nu');
});
test('passes strings with multiple needles', function () {
expect('Nuno')->toContain('Nu', 'no');
}); });
test('passes arrays', function () { test('passes arrays', function () {
expect('Nuno')->toContain('Nu'); expect([1, 2, 42])->toContain(42);
});
test('passes arrays with multiple needles', function () {
expect([1, 2, 42])->toContain(42, 2);
});
test('passes with array needles', function () {
expect([[1, 2, 3], 2, 42])->toContain(42, [1, 2, 3]);
}); });
test('failures', function () { test('failures', function () {
expect([1, 2, 42])->toContain(3); expect([1, 2, 42])->toContain(3);
})->throws(ExpectationFailedException::class); })->throws(ExpectationFailedException::class);
test('failures with multiple needles (all failing)', function () {
expect([1, 2, 42])->toContain(3, 4);
})->throws(ExpectationFailedException::class);
test('failures with multiple needles (some failing)', function () {
expect([1, 2, 42])->toContain(1, 3, 4);
})->throws(ExpectationFailedException::class);
test('not failures', function () { test('not failures', function () {
expect([1, 2, 42])->not->toContain(42); expect([1, 2, 42])->not->toContain(42);
})->throws(ExpectationFailedException::class); })->throws(ExpectationFailedException::class);
test('not failures with multiple needles (all failing)', function () {
expect([1, 2, 42])->not->toContain(42, 2);
})->throws(ExpectationFailedException::class);
test('not failures with multiple needles (some failing)', function () {
expect([1, 2, 42])->not->toContain(42, 1);
})->throws(ExpectationFailedException::class);