From 61881197c42d95a1127416b4906a61940aa9d0b6 Mon Sep 17 00:00:00 2001
From: Nafies Luthfi <nafiesl@gmail.com>
Date: Mon, 20 Aug 2018 22:17:24 +0800
Subject: [PATCH] Redirect to job edit page after upgrade task to job

---
 app/Http/Controllers/Projects/TasksController.php | 4 ++--
 tests/Feature/ManageJobsTest.php                  | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Projects/TasksController.php b/app/Http/Controllers/Projects/TasksController.php
index 2dda44d..5cc86e9 100755
--- a/app/Http/Controllers/Projects/TasksController.php
+++ b/app/Http/Controllers/Projects/TasksController.php
@@ -91,8 +91,8 @@ class TasksController extends Controller
         $task->delete();
         DB::commit();
 
-        flash(__('task.upgraded_to_job'), 'success');
+        flash(__('task.upgraded_as_job'), 'success');
 
-        return redirect()->route('jobs.show', $job);
+        return redirect()->route('jobs.edit', $job);
     }
 }
diff --git a/tests/Feature/ManageJobsTest.php b/tests/Feature/ManageJobsTest.php
index 6ff9325..e3beefb 100644
--- a/tests/Feature/ManageJobsTest.php
+++ b/tests/Feature/ManageJobsTest.php
@@ -224,13 +224,17 @@ class ManageJobsTest extends TestCase
         $this->visitRoute('jobs.show', [$job, 'action' => 'task_edit', 'task_id' => $task->id]);
         $this->seeRouteIs('jobs.show', [$job, 'action' => 'task_edit', 'task_id' => $task->id]);
         $this->seeElement('button', ['id' => 'set-as-job-'.$task->id]);
+
         $this->press('set-as-job-'.$task->id);
 
+        $newJob = Job::where('name', 'This is a Task')->first();
+        $this->seeRouteIs('jobs.edit', $newJob);
+
         $this->seeInDatabase('jobs', [
+            'id'          => $newJob->id,
             'name'        => 'This is a Task',
             'description' => 'Task description.',
         ]);
-
         $this->dontSeeInDatabase('tasks', [
             'id' => $task->id,
         ]);