Inline route helpers in tests

marcusmoore · marcusmoore · commit dc0b8c757283 · 2024-11-07T16:54:55.000-08:00
diff --git a/tests/Feature/ReportTemplates/DeleteReportTemplateTest.php b/tests/Feature/ReportTemplates/DeleteReportTemplateTest.php
@@ -16,7 +16,7 @@ public function testRequiresPermission()
         $reportTemplate = ReportTemplate::factory()->create();
 
         $this->actingAs(User::factory()->create())
-            ->post($this->getRoute($reportTemplate))
+            ->post(route('report-templates.destroy', $reportTemplate->id))
             ->assertNotFound();
 
         $this->assertModelExists($reportTemplate);
@@ -27,7 +27,7 @@ public function testCannotDeleteAnotherUsersReportTemplate()
         $reportTemplate = ReportTemplate::factory()->create();
 
         $this->actingAs(User::factory()->canViewReports()->create())
-            ->delete($this->getRoute($reportTemplate))
+            ->delete(route('report-templates.destroy', $reportTemplate->id))
             ->assertNotFound();
 
         $this->assertModelExists($reportTemplate);
@@ -39,14 +39,9 @@ public function testCanDeleteAReportTemplate()
         $reportTemplate = ReportTemplate::factory()->for($user, 'creator')->create();
 
         $this->actingAs($user)
-            ->delete($this->getRoute($reportTemplate))
+            ->delete(route('report-templates.destroy', $reportTemplate->id))
             ->assertRedirect(route('reports/custom'));
 
         $this->assertSoftDeleted($reportTemplate);
     }
-
-    private function getRoute(ReportTemplate $reportTemplate): string
-    {
-        return route('report-templates.destroy', $reportTemplate->id);
-    }
 }
diff --git a/tests/Feature/ReportTemplates/EditReportTemplateTest.php b/tests/Feature/ReportTemplates/EditReportTemplateTest.php
@@ -14,7 +14,7 @@ class EditReportTemplateTest extends TestCase implements TestsPermissionsRequire
     public function testRequiresPermission()
     {
         $this->actingAs(User::factory()->create())
-            ->get($this->getRoute(ReportTemplate::factory()->create()))
+            ->get(route('report-templates.edit', ReportTemplate::factory()->create()))
             ->assertNotFound();
     }
 
@@ -24,7 +24,7 @@ public function testCannotLoadEditPageForAnotherUsersReportTemplate()
         $reportTemplate = ReportTemplate::factory()->create();
 
         $this->actingAs($user)
-            ->get($this->getRoute($reportTemplate))
+            ->get(route('report-templates.edit', $reportTemplate))
             ->assertNotFound();
     }
 
@@ -34,12 +34,7 @@ public function testCanLoadEditReportTemplatePage()
         $reportTemplate = ReportTemplate::factory()->for($user, 'creator')->create();
 
         $this->actingAs($user)
-            ->get($this->getRoute($reportTemplate))
+            ->get(route('report-templates.edit', $reportTemplate))
             ->assertOk();
     }
-
-    private function getRoute(ReportTemplate $reportTemplate): string
-    {
-        return route('report-templates.edit', $reportTemplate);
-    }
 }
diff --git a/tests/Feature/ReportTemplates/ShowReportTemplateTest.php b/tests/Feature/ReportTemplates/ShowReportTemplateTest.php
@@ -14,7 +14,7 @@ class ShowReportTemplateTest extends TestCase implements TestsPermissionsRequire
     public function testRequiresPermission()
     {
         $this->actingAs(User::factory()->create())
-            ->get($this->getRoute(ReportTemplate::factory()->create()))
+            ->get(route('report-templates.show', ReportTemplate::factory()->create()))
             ->assertNotFound();
     }
 
@@ -25,7 +25,7 @@ public function testCanLoadASavedReportTemplate()
         $user->reportTemplates()->save($reportTemplate);
 
         $this->actingAs($user)
-            ->get($this->getRoute($reportTemplate))
+            ->get(route('report-templates.show', $reportTemplate))
             ->assertOk()
             ->assertViewHas(['template' => function (ReportTemplate $templatePassedToView) use ($reportTemplate) {
                 return $templatePassedToView->is($reportTemplate);
@@ -37,12 +37,7 @@ public function testCannotLoadAnotherUsersSavedReportTemplate()
         $reportTemplate = ReportTemplate::factory()->create();
 
         $this->actingAs(User::factory()->canViewReports()->create())
-            ->get($this->getRoute($reportTemplate))
+            ->get(route('report-templates.show', $reportTemplate))
             ->assertNotFound();
     }
-
-    private function getRoute(ReportTemplate $reportTemplate): string
-    {
-        return route('report-templates.show', $reportTemplate);
-    }
 }
diff --git a/tests/Feature/ReportTemplates/StoreReportTemplateTest.php b/tests/Feature/ReportTemplates/StoreReportTemplateTest.php
@@ -14,14 +14,14 @@ class StoreReportTemplateTest extends TestCase implements TestsPermissionsRequir
     public function testRequiresPermission()
     {
         $this->actingAs(User::factory()->create())
-            ->post($this->getRoute())
+            ->post(route('report-templates.store'))
             ->assertForbidden();
     }
 
     public function testSavingReportTemplateRequiresValidFields()
     {
         $this->actingAs(User::factory()->canViewReports()->create())
-            ->post($this->getRoute(), [
+            ->post(route('report-templates.store'), [
                 'name' => '',
             ])
             ->assertSessionHasErrors('name');
@@ -33,7 +33,7 @@ public function testRedirectingAfterValidationErrorRestoresInputs()
             // start on the custom report page
             ->from(route('reports/custom'))
             ->followingRedirects()
-            ->post($this->getRoute(), [
+            ->post(route('report-templates.store'), [
                 'name' => '',
                 // set some values to ensure they are still present
                 // when returning to the custom report page.
@@ -48,7 +48,7 @@ public function testCanSaveAReportTemplate()
         $user = User::factory()->canViewReports()->create();
 
         $this->actingAs($user)
-            ->post($this->getRoute(), [
+            ->post(route('report-templates.store'), [
                 'name' => 'My Awesome Template',
                 'company' => '1',
                 'by_company_id' => ['1', '2'],
@@ -63,9 +63,4 @@ public function testCanSaveAReportTemplate()
         $this->assertEquals('1', $template->options['company']);
         $this->assertEquals(['1', '2'], $template->options['by_company_id']);
     }
-
-    private function getRoute(): string
-    {
-        return route('report-templates.store');
-    }
 }
diff --git a/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php b/tests/Feature/ReportTemplates/UpdateReportTemplateTest.php
@@ -14,14 +14,14 @@ class UpdateReportTemplateTest extends TestCase implements TestsPermissionsRequi
     public function testRequiresPermission()
     {
         $this->actingAs(User::factory()->create())
-            ->post($this->getRoute(ReportTemplate::factory()->create()))
+            ->post(route('report-templates.update', ReportTemplate::factory()->create()))
             ->assertNotFound();
     }
 
     public function testCannotUpdateAnotherUsersReportTemplate()
     {
         $this->actingAs(User::factory()->canViewReports()->create())
-            ->post($this->getRoute(ReportTemplate::factory()->create()))
+            ->post(route('report-templates.update', ReportTemplate::factory()->create()))
             ->assertNotFound();
     }
 
@@ -32,7 +32,7 @@ public function testUpdatingReportTemplateRequiresValidFields()
         $reportTemplate = ReportTemplate::factory()->for($user, 'creator')->create();
 
         $this->actingAs($user)
-            ->post($this->getRoute($reportTemplate), [
+            ->post(route('report-templates.update', $reportTemplate), [
                 //
             ])
             ->assertSessionHasErrors([
@@ -56,7 +56,7 @@ public function testCanUpdateAReportTemplate()
         ]);
 
         $this->actingAs($user)
-            ->post($this->getRoute($reportTemplate), [
+            ->post(route('report-templates.update', $reportTemplate), [
                 'name' => 'Updated Name',
                 'id' => 1,
                 'company' => 1,
@@ -71,9 +71,4 @@ public function testCanUpdateAReportTemplate()
         $this->assertEquals(1, $reportTemplate->checkmarkValue('company'));
         $this->assertEquals([3], $reportTemplate->selectValues('by_company_id'));
     }
-
-    private function getRoute(ReportTemplate $reportTemplate): string
-    {
-        return route('report-templates.update', $reportTemplate);
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class EditReportTemplateTest extends TestCase implements TestsPermissionsRequire`
`14`	`14`	`public function testRequiresPermission()`
`15`	`15`	`{`
`16`	`16`	`$this->actingAs(User::factory()->create())`
`17`		`- ->get($this->getRoute(ReportTemplate::factory()->create()))`
	`17`	`+ ->get(route('report-templates.edit', ReportTemplate::factory()->create()))`
`18`	`18`	`->assertNotFound();`
`19`	`19`	`}`
`20`	`20`
`@@ -24,7 +24,7 @@ public function testCannotLoadEditPageForAnotherUsersReportTemplate()`
`24`	`24`	`$reportTemplate = ReportTemplate::factory()->create();`
`25`	`25`
`26`	`26`	`$this->actingAs($user)`
`27`		`- ->get($this->getRoute($reportTemplate))`
	`27`	`+ ->get(route('report-templates.edit', $reportTemplate))`
`28`	`28`	`->assertNotFound();`
`29`	`29`	`}`
`30`	`30`
`@@ -34,12 +34,7 @@ public function testCanLoadEditReportTemplatePage()`
`34`	`34`	`$reportTemplate = ReportTemplate::factory()->for($user, 'creator')->create();`
`35`	`35`
`36`	`36`	`$this->actingAs($user)`
`37`		`- ->get($this->getRoute($reportTemplate))`
	`37`	`+ ->get(route('report-templates.edit', $reportTemplate))`
`38`	`38`	`->assertOk();`
`39`	`39`	`}`
`40`		`-`
`41`		`- private function getRoute(ReportTemplate $reportTemplate): string`
`42`		`- {`
`43`		`- return route('report-templates.edit', $reportTemplate);`
`44`		`- }`
`45`	`40`	`}`