Skip to content

Commit fc2acee

Browse files
MortenDHansenMortenDHansen
committed
Removed 7.x support, and thus no need for handling the differend assert locations
1 parent f49ab23 commit fc2acee

File tree

4 files changed

+31
-42
lines changed

4 files changed

+31
-42
lines changed

‎tests/AuditingTestCase.php

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,4 @@ protected function getPackageProviders($app)
6464
AuditingServiceProvider::class,
6565
];
6666
}
67-
68-
/**
69-
* Locate the Illuminate testing class. It changed namespace with v7
70-
* @see https://readouble.com/laravel/7.x/en/upgrade.html
71-
* @return string
72-
*/
73-
public static function Assert()
74-
{
75-
if (class_exists('Illuminate\Foundation\Testing\Assert')) {
76-
return '\Illuminate\Foundation\Testing\Assert';
77-
}
78-
return '\Illuminate\Testing\Assert';
79-
}
8067
}

‎tests/Functional/AuditingTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
namespace OwenIt\Auditing\Tests\Functional;
44

55
use Carbon\Carbon;
6-
use Illuminate\Foundation\Testing\Assert;
76
use Illuminate\Foundation\Testing\WithFaker;
87
use Illuminate\Support\Facades\App;
98
use Illuminate\Support\Facades\Event;
9+
use Illuminate\Testing\Assert;
1010
use InvalidArgumentException;
1111
use OwenIt\Auditing\Events\AuditCustom;
1212
use OwenIt\Auditing\Events\Auditing;
@@ -150,7 +150,7 @@ public function itWillAuditTheCreatedEvent()
150150

151151
$this->assertEmpty($audit->old_values);
152152

153-
self::Assert()::assertArraySubset([
153+
Assert::assertArraySubset([
154154
'title' => 'How To Audit Eloquent Models',
155155
'content' => 'N/A',
156156
'published_at' => null,
@@ -185,13 +185,13 @@ public function itWillAuditTheUpdatedEvent()
185185

186186
$audit = Audit::first();
187187

188-
self::Assert()::assertArraySubset([
188+
Assert::assertArraySubset([
189189
'content' => 'N/A',
190190
'published_at' => null,
191191
'reviewed' => 0,
192192
], $audit->old_values, true);
193193

194-
self::Assert()::assertArraySubset([
194+
Assert::assertArraySubset([
195195
'content' => 'First step: install the laravel-auditing package.',
196196
'published_at' => $now->toDateTimeString(),
197197
'reviewed' => 1,
@@ -218,7 +218,7 @@ public function itWillAuditTheDeletedEvent()
218218

219219
$audit = Audit::first();
220220

221-
self::Assert()::assertArraySubset([
221+
Assert::assertArraySubset([
222222
'title' => 'How To Audit Eloquent Models',
223223
'content' => 'N/A',
224224
'published_at' => null,
@@ -252,7 +252,7 @@ public function itWillAuditTheRestoredEvent()
252252

253253
$this->assertEmpty($audit->old_values);
254254

255-
self::Assert()::assertArraySubset([
255+
Assert::assertArraySubset([
256256
'title' => 'How To Audit Eloquent Models',
257257
'content' => 'N/A',
258258
'published_at' => null,
@@ -352,7 +352,7 @@ public function itWillAuditUsingTheDefaultDriver()
352352

353353
$this->assertEmpty($audit->old_values);
354354

355-
self::Assert()::assertArraySubset([
355+
Assert::assertArraySubset([
356356
'title' => 'How To Audit Using The Fallback Driver',
357357
'content' => 'N/A',
358358
'published_at' => null,

‎tests/Unit/AuditTest.php

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Carbon\Carbon;
66
use DateTimeInterface;
7+
use Illuminate\Testing\Assert;
78
use OwenIt\Auditing\Encoders\Base64Encoder;
89
use OwenIt\Auditing\Redactors\LeftRedactor;
910
use OwenIt\Auditing\Tests\AuditingTestCase;
@@ -33,7 +34,7 @@ public function itResolvesAuditData()
3334
$resolvedData = $audit->resolveData();
3435
$this->assertCount(15, $resolvedData);
3536

36-
self::Assert()::assertArraySubset([
37+
Assert::assertArraySubset([
3738
'audit_id' => 1,
3839
'audit_event' => 'created',
3940
'audit_url' => 'console',
@@ -80,7 +81,7 @@ public function itResolvesAuditDataIncludingUserAttributes()
8081

8182
$this->assertCount(21, $resolvedData = $audit->resolveData());
8283

83-
self::Assert()::assertArraySubset([
84+
Assert::assertArraySubset([
8485
'audit_id' => 2,
8586
'audit_event' => 'created',
8687
'audit_url' => 'console',
@@ -159,7 +160,7 @@ public function itReturnsAuditMetadataAsArray()
159160

160161
$this->assertCount(10, $metadata = $audit->getMetadata());
161162

162-
self::Assert()::assertArraySubset([
163+
Assert::assertArraySubset([
163164
'audit_id' => 1,
164165
'audit_event' => 'created',
165166
'audit_url' => 'console',
@@ -193,7 +194,7 @@ public function itReturnsAuditMetadataIncludingUserAttributesAsArray()
193194

194195
$this->assertCount(16, $metadata = $audit->getMetadata());
195196

196-
self::Assert()::assertArraySubset([
197+
Assert::assertArraySubset([
197198
'audit_id' => 2,
198199
'audit_event' => 'created',
199200
'audit_url' => 'console',
@@ -303,7 +304,7 @@ public function itReturnsAuditableModifiedAttributesAsArray()
303304

304305
$this->assertCount(5, $modified = $audit->getModified());
305306

306-
self::Assert()::assertArraySubset([
307+
Assert::assertArraySubset([
307308
'title' => [
308309
'new' => 'HOW TO AUDIT ELOQUENT MODELS',
309310
],
@@ -394,7 +395,7 @@ public function itReturnsDecodedAuditableAttributes()
394395

395396
$this->assertCount(3, $modified = $audit->getModified());
396397

397-
self::Assert()::assertArraySubset([
398+
Assert::assertArraySubset([
398399
'title' => [
399400
'new' => 'HOW TO AUDIT ELOQUENT MODELS',
400401
'old' => 'HOW TO AUDIT MODELS',
@@ -421,7 +422,7 @@ public function itReturnsTags()
421422
]);
422423

423424
$this->assertIsArray($audit->getTags());
424-
self::Assert()::assertArraySubset([
425+
Assert::assertArraySubset([
425426
'foo',
426427
'bar',
427428
'baz',

‎tests/Unit/AuditableTest.php

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Illuminate\Foundation\Testing\WithFaker;
88
use Illuminate\Support\Facades\App;
99
use Illuminate\Support\Str;
10+
use Illuminate\Testing\Assert;
1011
use OwenIt\Auditing\Contracts\Auditable;
1112
use OwenIt\Auditing\Encoders\Base64Encoder;
1213
use OwenIt\Auditing\Exceptions\AuditableTransitionException;
@@ -121,7 +122,7 @@ public function itReturnsTheDefaultAuditEvents()
121122
{
122123
$model = new Article();
123124

124-
self::Assert()::assertArraySubset([
125+
Assert::assertArraySubset([
125126
'created',
126127
'updated',
127128
'deleted',
@@ -142,7 +143,7 @@ public function itReturnsTheCustomAuditEventsFromAttribute()
142143
'archived',
143144
];
144145

145-
self::Assert()::assertArraySubset([
146+
Assert::assertArraySubset([
146147
'published' => 'getPublishedEventAttributes',
147148
'archived',
148149
], $model->getAuditEvents(), true);
@@ -161,7 +162,7 @@ public function itReturnsTheCustomAuditEventsFromConfig()
161162

162163
$model = new Article();
163164

164-
self::Assert()::assertArraySubset([
165+
Assert::assertArraySubset([
165166
'published' => 'getPublishedEventAttributes',
166167
'archived',
167168
], $model->getAuditEvents(), true);
@@ -406,7 +407,7 @@ public function itReturnsTheAuditData()
406407
$this->assertCount(11, $auditData = $model->toAudit());
407408

408409
$morphPrefix = config('audit.user.morph_prefix', 'user');
409-
self::Assert()::assertArraySubset([
410+
Assert::assertArraySubset([
410411
'old_values' => [],
411412
'new_values' => [
412413
'title' => 'How To Audit Eloquent Models',
@@ -466,7 +467,7 @@ public function itReturnsTheAuditDataIncludingUserAttributes(
466467
$this->assertCount(11, $auditData = $model->toAudit());
467468

468469
$morphPrefix = config('audit.user.morph_prefix', 'user');
469-
self::Assert()::assertArraySubset([
470+
Assert::assertArraySubset([
470471
'old_values' => [],
471472
'new_values' => [
472473
'title' => 'How To Audit Eloquent Models',
@@ -549,7 +550,7 @@ public function itExcludesAttributesFromTheAuditDataWhenInStrictMode()
549550
$this->assertCount(11, $auditData = $model->toAudit());
550551

551552
$morphPrefix = config('audit.user.morph_prefix', 'user');
552-
self::Assert()::assertArraySubset([
553+
Assert::assertArraySubset([
553554
'old_values' => [],
554555
'new_values' => [
555556
'title' => 'How To Audit Eloquent Models',
@@ -619,7 +620,7 @@ public function itModifiesTheAuditAttributesSuccessfully()
619620
'reviewed' => Base64Encoder::class,
620621
];
621622

622-
self::Assert()::assertArraySubset([
623+
Assert::assertArraySubset([
623624
'old_values' => [
624625
'title' => 'Ho#################',
625626
'content' => '##A',
@@ -663,7 +664,7 @@ public function transformAudit(array $data): array
663664

664665
$this->assertCount(11, $auditData = $model->toAudit());
665666

666-
self::Assert()::assertArraySubset([
667+
Assert::assertArraySubset([
667668
'new_values' => [
668669
'title' => 'How To Audit Eloquent Models',
669670
'content' => 'First step: install the laravel-auditing package.',
@@ -682,7 +683,7 @@ public function itReturnsTheDefaultAttributesToBeIncludedInTheAudit()
682683
{
683684
$model = new Article();
684685

685-
self::Assert()::assertArraySubset([], $model->getAuditInclude(), true);
686+
Assert::assertArraySubset([], $model->getAuditInclude(), true);
686687
}
687688

688689
/**
@@ -698,7 +699,7 @@ public function itReturnsTheCustomAttributesToBeIncludedInTheAudit()
698699
'content',
699700
];
700701

701-
self::Assert()::assertArraySubset([
702+
Assert::assertArraySubset([
702703
'title',
703704
'content',
704705
], $model->getAuditInclude(), true);
@@ -712,7 +713,7 @@ public function itReturnsTheDefaultAttributesToBeExcludedFromTheAudit()
712713
{
713714
$model = new Article();
714715

715-
self::Assert()::assertArraySubset([], $model->getAuditExclude(), true);
716+
Assert::assertArraySubset([], $model->getAuditExclude(), true);
716717
}
717718

718719
/**
@@ -727,7 +728,7 @@ public function itReturnsTheCustomAttributesToBeExcludedFromTheAudit()
727728
'published_at',
728729
];
729730

730-
self::Assert()::assertArraySubset([
731+
Assert::assertArraySubset([
731732
'published_at',
732733
], $model->getAuditExclude(), true);
733734
}
@@ -906,7 +907,7 @@ public function itReturnsTheDefaultGeneratedAuditTags()
906907
{
907908
$model = new Article();
908909

909-
self::Assert()::assertArraySubset([], $model->generateTags(), true);
910+
Assert::assertArraySubset([], $model->generateTags(), true);
910911
}
911912

912913
/**
@@ -925,7 +926,7 @@ public function generateTags(): array
925926
}
926927
};
927928

928-
self::Assert()::assertArraySubset([
929+
Assert::assertArraySubset([
929930
'foo',
930931
'bar',
931932
], $model->generateTags(), true);
@@ -1124,7 +1125,7 @@ public function itFailsToTransitionWhenTheAuditableAttributeCompatibilityIsNotMe
11241125
$e->getMessage()
11251126
);
11261127

1127-
self::Assert()::assertArraySubset([
1128+
Assert::assertArraySubset([
11281129
'subject',
11291130
'text',
11301131
], $e->getIncompatibilities(), true);

0 commit comments

Comments
 (0)