From a50c7b2d234c7365ca9fa5fea1c7c888c7465fdd Mon Sep 17 00:00:00 2001 From: tiagof Date: Mon, 29 Jul 2024 15:44:13 +0000 Subject: [PATCH] Fix styling --- src/Traits/HasWorkflows.php | 2 +- tests/Feature/MultipleWorkflowTest.php | 6 +++--- tests/Feature/WorkflowTest.php | 18 +++++++++--------- tests/Feature/WorkflowsPermissionsTest.php | 6 +++--- ...0_01_01_000000_create_permission_tables.php | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Traits/HasWorkflows.php b/src/Traits/HasWorkflows.php index 93302d3..ef9ca99 100644 --- a/src/Traits/HasWorkflows.php +++ b/src/Traits/HasWorkflows.php @@ -226,7 +226,7 @@ public function isInFinalStatus(): bool protected function createModelStatus(Workflow $workflow, WorkflowStatus $status): WorkflowModelStatus { $wmsClass = config('workflow.workflow_model_status_class'); - $modelStatus = new $wmsClass(); + $modelStatus = new $wmsClass; $modelStatus->model()->associate($this); $modelStatus->user()->associate(Auth::user()); $modelStatus->workflow()->associate($workflow); diff --git a/tests/Feature/MultipleWorkflowTest.php b/tests/Feature/MultipleWorkflowTest.php index 482de41..274a3e4 100644 --- a/tests/Feature/MultipleWorkflowTest.php +++ b/tests/Feature/MultipleWorkflowTest.php @@ -30,8 +30,8 @@ }); test('it supports multiple models', function () { - ($modelA = new WorkflowableModel())->setDefaultWorkflowName($this->workflowA->name)->save(); - ($modelB = new WorkflowableModel())->setDefaultWorkflowName($this->workflowB->name)->save(); + ($modelA = new WorkflowableModel)->setDefaultWorkflowName($this->workflowA->name)->save(); + ($modelB = new WorkflowableModel)->setDefaultWorkflowName($this->workflowB->name)->save(); expect($modelA->modelStatus->workflow)->id->toBe($this->workflowA->id); expect($modelB->modelStatus->workflow)->id->toEqual($this->workflowB->id); @@ -57,7 +57,7 @@ }); test('a model can have multiple workflows', function () { - ($modelA = new WorkflowableModel())->setDefaultWorkflowName($this->workflowA->name)->save(); + ($modelA = new WorkflowableModel)->setDefaultWorkflowName($this->workflowA->name)->save(); $modelA->transition($this->entryA_to_A1); expect($modelA->usingWorkflow($this->workflowB)->getCurrentWorkflow()) diff --git a/tests/Feature/WorkflowTest.php b/tests/Feature/WorkflowTest.php index 4f251e0..5d8967e 100644 --- a/tests/Feature/WorkflowTest.php +++ b/tests/Feature/WorkflowTest.php @@ -33,20 +33,20 @@ }); test('it creates the first status for a newly created model', function () { - (new WorkflowableModel())->save(); + (new WorkflowableModel)->save(); expect(WorkflowModelStatus::count())->toBe(0); - ($model = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save(); + ($model = new WorkflowableModel)->setDefaultWorkflowName($this->workflow->name)->save(); expect(WorkflowModelStatus::first()) ->count()->toBe(1) ->model->id->toBe($model->id); }); test('it gets the status(es) of a model', function () { - ($modelA = new WorkflowableModel())->save(); + ($modelA = new WorkflowableModel)->save(); expect($modelA->modelStatuses)->toHaveCount(0); - ($modelB = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save(); + ($modelB = new WorkflowableModel)->setDefaultWorkflowName($this->workflow->name)->save(); $status = $modelB->getDefaultWorkflow()->entryTransitions->first()->toStatus; expect($modelB->modelStatus->status)->toEqual($modelB->getStatus())->toEqual($status) @@ -55,7 +55,7 @@ }); test('it can transition a model', function () { - ($model = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save(); + ($model = new WorkflowableModel)->setDefaultWorkflowName($this->workflow->name)->save(); $transitions = $model->possibleTransitions(); expect($transitions)->toHaveCount(1); @@ -67,7 +67,7 @@ }); test('it fails transition if not valid', function () { - ($model = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save(); + ($model = new WorkflowableModel)->setDefaultWorkflowName($this->workflow->name)->save(); $transitions = $model->possibleTransitions(); expect(fn () => $model->transitionTo($transitions->first()->fromStatus)) @@ -75,14 +75,14 @@ }); test('it can filter model with specific status', function () { - (new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save(); + (new WorkflowableModel)->setDefaultWorkflowName($this->workflow->name)->save(); expect(WorkflowableModel::inStatus($this->entry->toStatus, $this->workflow)->get())->toHaveCount(1) ->and(WorkflowableModel::inStatus($this->mid1->toStatus->id, $this->workflow)->get())->toHaveCount(0); }); test('it checks if a transition is allowed', function () { - ($model = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save(); + ($model = new WorkflowableModel)->setDefaultWorkflowName($this->workflow->name)->save(); expect($model->isAllowed($this->mid1))->toBeTrue() ->and($model->isAllowed($this->entry->toStatus))->toBeFalse(); @@ -93,7 +93,7 @@ }); test('it has toString', function () { - ($model = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save(); + ($model = new WorkflowableModel)->setDefaultWorkflowName($this->workflow->name)->save(); expect($model->getCurrentWorkflow()?->__toString())->toBe($model->getCurrentWorkflow()->name); expect($model->possibleTransitions()->first()->__toString())->toContain($model->getCurrentWorkflow()?->__toString()); diff --git a/tests/Feature/WorkflowsPermissionsTest.php b/tests/Feature/WorkflowsPermissionsTest.php index 60f8815..9ee73a2 100644 --- a/tests/Feature/WorkflowsPermissionsTest.php +++ b/tests/Feature/WorkflowsPermissionsTest.php @@ -23,7 +23,7 @@ }); test('it can transition if no permissions are defined', function () { - ($model = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save(); + ($model = new WorkflowableModel)->setDefaultWorkflowName($this->workflow->name)->save(); /** @var \Squarebit\Workflows\Models\WorkflowTransition $transition */ $transition = $model->possibleTransitions()->first(); @@ -32,7 +32,7 @@ }); test('it cannot transition if user is missing necessary permissions', function () { - ($model = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save(); + ($model = new WorkflowableModel)->setDefaultWorkflowName($this->workflow->name)->save(); /** @var \Squarebit\Workflows\Models\WorkflowTransition $transition */ $transition = $model->possibleTransitions()->first(); @@ -42,7 +42,7 @@ }); test('it can transition when user has necessary permission', function () { - ($model = new WorkflowableModel())->setDefaultWorkflowName($this->workflow->name)->save(); + ($model = new WorkflowableModel)->setDefaultWorkflowName($this->workflow->name)->save(); /** @var \Squarebit\Workflows\Models\WorkflowTransition $transition */ $transition = $model->possibleTransitions()->first(); diff --git a/tests/Support/2000_01_01_000000_create_permission_tables.php b/tests/Support/2000_01_01_000000_create_permission_tables.php index 04c3278..fad5acf 100644 --- a/tests/Support/2000_01_01_000000_create_permission_tables.php +++ b/tests/Support/2000_01_01_000000_create_permission_tables.php @@ -1,8 +1,8 @@