Skip to content

Commit 4ffac6f

Browse files
authored
[10.x] Small test fixes (#47369)
* Fix test name typos * Fix test names and remove unused variables * Remove unused method and import
1 parent ec4b3a7 commit 4ffac6f

File tree

4 files changed

+15
-21
lines changed

4 files changed

+15
-21
lines changed

tests/Validation/ValidationEnumRuleTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
class ValidationEnumRuleTest extends TestCase
1717
{
18-
public function testvalidationPassesWhenPassingCorrectEnum()
18+
public function testValidationPassesWhenPassingCorrectEnum()
1919
{
2020
$v = new Validator(
2121
resolve('translator'),
@@ -32,7 +32,7 @@ public function testvalidationPassesWhenPassingCorrectEnum()
3232
$this->assertFalse($v->fails());
3333
}
3434

35-
public function testvalidationPassesWhenPassingInstanceOfEnum()
35+
public function testValidationPassesWhenPassingInstanceOfEnum()
3636
{
3737
$v = new Validator(
3838
resolve('translator'),
@@ -47,7 +47,7 @@ public function testvalidationPassesWhenPassingInstanceOfEnum()
4747
$this->assertFalse($v->fails());
4848
}
4949

50-
public function testvalidationPassesWhenPassingInstanceOfPureEnum()
50+
public function testValidationPassesWhenPassingInstanceOfPureEnum()
5151
{
5252
$v = new Validator(
5353
resolve('translator'),

tests/Validation/ValidationExcludeIfTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
class ValidationExcludeIfTest extends TestCase
1212
{
13-
public function testItClousureReturnsFormatsAStringVersionOfTheRule()
13+
public function testItReturnsStringVersionOfRuleWhenCast()
1414
{
1515
$rule = new ExcludeIf(function () {
1616
return true;
@@ -33,7 +33,7 @@ public function testItClousureReturnsFormatsAStringVersionOfTheRule()
3333
$this->assertSame('', (string) $rule);
3434
}
3535

36-
public function testItOnlyCallableAndBooleanAreAcceptableArgumentsOfTheRule()
36+
public function testItValidatesCallableAndBooleanAreAcceptableArguments()
3737
{
3838
new ExcludeIf(false);
3939
new ExcludeIf(true);
@@ -49,11 +49,11 @@ public function testItOnlyCallableAndBooleanAreAcceptableArgumentsOfTheRule()
4949
}
5050
}
5151

52-
public function testItReturnedRuleIsNotSerializable()
52+
public function testItThrowsExceptionIfRuleIsNotSerializable()
5353
{
5454
$this->expectException(Exception::class);
5555

56-
$rule = serialize(new ExcludeIf(function () {
56+
serialize(new ExcludeIf(function () {
5757
return true;
5858
}));
5959
}

tests/Validation/ValidationForEachTest.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
use Illuminate\Translation\Translator;
77
use Illuminate\Validation\Rule;
88
use Illuminate\Validation\Validator;
9-
use Mockery as m;
109
use PHPUnit\Framework\TestCase;
1110

1211
class ValidationForEachTest extends TestCase
@@ -320,11 +319,6 @@ public function testConditionalRulesCanBeAddedToForEachWithObject()
320319
], $v->getMessageBag()->toArray());
321320
}
322321

323-
protected function getTranslator()
324-
{
325-
return m::mock(TranslatorContract::class);
326-
}
327-
328322
public function getIlluminateArrayTranslator()
329323
{
330324
return new Translator(

tests/Validation/ValidationProhibitedIfTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
class ValidationProhibitedIfTest extends TestCase
1212
{
13-
public function testItClousureReturnsFormatsAStringVersionOfTheRule()
13+
public function testItReturnsStringVersionOfRuleWhenCast()
1414
{
1515
$rule = new ProhibitedIf(function () {
1616
return true;
@@ -33,27 +33,27 @@ public function testItClousureReturnsFormatsAStringVersionOfTheRule()
3333
$this->assertSame('', (string) $rule);
3434
}
3535

36-
public function testItOnlyCallableAndBooleanAreAcceptableArgumentsOfTheRule()
36+
public function testItValidatesCallableAndBooleanAreAcceptableArguments()
3737
{
38-
$rule = new ProhibitedIf(false);
39-
40-
$rule = new ProhibitedIf(true);
38+
new ProhibitedIf(false);
39+
new ProhibitedIf(true);
40+
new ProhibitedIf(fn () => true);
4141

4242
foreach ([1, 1.1, 'phpinfo', new stdClass] as $condition) {
4343
try {
44-
$rule = new ProhibitedIf($condition);
44+
new ProhibitedIf($condition);
4545
$this->fail('The ProhibitedIf constructor must not accept '.gettype($condition));
4646
} catch (InvalidArgumentException $exception) {
4747
$this->assertEquals('The provided condition must be a callable or boolean.', $exception->getMessage());
4848
}
4949
}
5050
}
5151

52-
public function testItReturnedRuleIsNotSerializable()
52+
public function testItThrowsExceptionIfRuleIsNotSerializable()
5353
{
5454
$this->expectException(Exception::class);
5555

56-
$rule = serialize(new ProhibitedIf(function () {
56+
serialize(new ProhibitedIf(function () {
5757
return true;
5858
}));
5959
}

0 commit comments

Comments
 (0)