Skip to content

Commit 6d7c860

Browse files
authored
Consolidate repetitive model instantiations across tests (#3416)
1 parent 61a3b77 commit 6d7c860

File tree

1 file changed

+25
-35
lines changed

1 file changed

+25
-35
lines changed

tests/ModelTest.php

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,14 @@
4949

5050
class ModelTest extends TestCase
5151
{
52-
public function tearDown(): void
52+
protected function setUp(): void
53+
{
54+
parent::setUp();
55+
56+
Carbon::setTestNow();
57+
}
58+
59+
protected function tearDown(): void
5360
{
5461
Carbon::setTestNow();
5562
DB::connection('mongodb')->getCollection('users')->drop();
@@ -83,15 +90,22 @@ public function testQualifyColumn(): void
8390
$this->assertEquals('users.name', $sqlUser->qualifyColumn('name'));
8491
}
8592

86-
public function testInsert(): void
93+
private function makeUser(): User
8794
{
88-
$user = new User();
95+
$user = new User();
8996
$user->name = 'John Doe';
9097
$user->title = 'admin';
9198
$user->age = 35;
9299

93100
$user->save();
94101

102+
return $user;
103+
}
104+
105+
public function testInsert(): void
106+
{
107+
$user = $this->makeUser();
108+
95109
$this->assertTrue($user->exists);
96110
$this->assertEquals(1, User::count());
97111

@@ -130,11 +144,7 @@ public function testInsertNonIncrementable(): void
130144

131145
public function testUpdate(): void
132146
{
133-
$user = new User();
134-
$user->name = 'John Doe';
135-
$user->title = 'admin';
136-
$user->age = 35;
137-
$user->save();
147+
$user = $this->makeUser();
138148

139149
$raw = $user->getAttributes();
140150
$this->assertInstanceOf(ObjectID::class, $raw['id']);
@@ -264,11 +274,7 @@ public function testManualIntId(): void
264274

265275
public function testDelete(): void
266276
{
267-
$user = new User();
268-
$user->name = 'John Doe';
269-
$user->title = 'admin';
270-
$user->age = 35;
271-
$user->save();
277+
$user = $this->makeUser();
272278

273279
$this->assertTrue($user->exists);
274280
$this->assertEquals(1, User::count());
@@ -280,11 +286,7 @@ public function testDelete(): void
280286

281287
public function testAll(): void
282288
{
283-
$user = new User();
284-
$user->name = 'John Doe';
285-
$user->title = 'admin';
286-
$user->age = 35;
287-
$user->save();
289+
$user = $this->makeUser();
288290

289291
$user = new User();
290292
$user->name = 'Jane Doe';
@@ -301,11 +303,7 @@ public function testAll(): void
301303

302304
public function testFind(): void
303305
{
304-
$user = new User();
305-
$user->name = 'John Doe';
306-
$user->title = 'admin';
307-
$user->age = 35;
308-
$user->save();
306+
$user = $this->makeUser();
309307

310308
$check = User::find($user->id);
311309
$this->assertInstanceOf(User::class, $check);
@@ -384,11 +382,7 @@ public function testCreate(): void
384382

385383
public function testDestroy(): void
386384
{
387-
$user = new User();
388-
$user->name = 'John Doe';
389-
$user->title = 'admin';
390-
$user->age = 35;
391-
$user->save();
385+
$user = $this->makeUser();
392386

393387
User::destroy((string) $user->id);
394388

@@ -397,11 +391,7 @@ public function testDestroy(): void
397391

398392
public function testTouch(): void
399393
{
400-
$user = new User();
401-
$user->name = 'John Doe';
402-
$user->title = 'admin';
403-
$user->age = 35;
404-
$user->save();
394+
$user = $this->makeUser();
405395

406396
$old = $user->updated_at;
407397
sleep(1);
@@ -1089,7 +1079,7 @@ public function testChunkById(): void
10891079
$this->assertEquals(['fork', 'spork', 'spoon'], $names);
10901080
}
10911081

1092-
public function testTruncateModel()
1082+
public function testTruncateModel(): void
10931083
{
10941084
User::create(['name' => 'John Doe']);
10951085

@@ -1098,7 +1088,7 @@ public function testTruncateModel()
10981088
$this->assertEquals(0, User::count());
10991089
}
11001090

1101-
public function testGuardedModel()
1091+
public function testGuardedModel(): void
11021092
{
11031093
$model = new Guarded();
11041094

0 commit comments

Comments
 (0)