From 727f71d6e3cb6053f3359fd1cbb61f9a6f4a2b55 Mon Sep 17 00:00:00 2001
From: bilal <bilal@saburly.com>
Date: Thu, 4 Jun 2020 10:02:14 +0200
Subject: [PATCH 1/2] add account and project name columns to the task requests
 table

---
 .../task_requests/_task_request.html.erb      |  6 +++
 app/views/admin/task_requests/index.html.erb  |  2 +
 .../admin_managing_task_requests_spec.rb      | 48 +++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 spec/features/admin_managing_task_requests_spec.rb

diff --git a/app/views/admin/task_requests/_task_request.html.erb b/app/views/admin/task_requests/_task_request.html.erb
index cdc777e..9a4c489 100644
--- a/app/views/admin/task_requests/_task_request.html.erb
+++ b/app/views/admin/task_requests/_task_request.html.erb
@@ -2,6 +2,12 @@
   <td>
     <%= task_request.id %>
   </td>
+  <td>
+    <%= task_request.project.account.name %>
+  </td>
+  <td>
+    <%= task_request.project.name %>
+  </td>
   <td>
     <%= task_request.created_at.strftime("%D") %>
   </td>
diff --git a/app/views/admin/task_requests/index.html.erb b/app/views/admin/task_requests/index.html.erb
index bc445da..c6c58dc 100644
--- a/app/views/admin/task_requests/index.html.erb
+++ b/app/views/admin/task_requests/index.html.erb
@@ -3,6 +3,8 @@
     <thead class="thead-light">
       <tr>
         <th>Task ID</th>
+        <th>Account Name</th>
+        <th>Project Name</th>
         <th>Created On</th>
         <th>Deadline</th>
         <th>Time Allowed</th>
diff --git a/spec/features/admin_managing_task_requests_spec.rb b/spec/features/admin_managing_task_requests_spec.rb
new file mode 100644
index 0000000..d305ff4
--- /dev/null
+++ b/spec/features/admin_managing_task_requests_spec.rb
@@ -0,0 +1,48 @@
+require "rails_helper"
+
+feature "Admin managing task requests" do
+  let(:current_user) { create(:user, admin: true, email: "user@test.com") }
+  let(:project) { create(:project, account: current_user.primary_account, name: "Test Project") }
+
+  before do
+    sign_in current_user
+  end
+
+  scenario "task requests table is visible" do
+    visit admin_task_requests_path
+
+    expect(page).to have_content "Task ID"
+    expect(page).to have_content "Account Name"
+    expect(page).to have_content "Project Name"
+    expect(page).to have_content "Created On"
+    expect(page).to have_content "Deadline"
+    expect(page).to have_content "Time Allowed"
+    expect(page).to have_content "Status"
+  end
+
+  scenario "sees list of task requests" do
+    visit admin_task_requests_path
+
+    expect(page).to have_content no_task_requests_label
+
+    task_request = create(:task_request)
+
+    visit admin_task_requests_path
+
+    expect(page).not_to have_content no_task_requests_label
+
+    expect(page).to have_content task_request.id
+    expect(page).to have_content task_request.project.account.name
+    expect(page).to have_content task_request.project.name
+    expect(page).to have_content task_request.created_at.try(:strftime, '%D')
+    expect(page).to have_content task_request.deadline.try(:strftime, '%D')
+    expect(page).to have_content task_request.time_allowed
+    expect(page).to have_content task_request.status.capitalize
+  end
+
+  private
+
+  def no_task_requests_label
+    "Task requests will appear here"
+  end
+end
-- 
2.47.3


From 295eccac771d35820d0f9e6039632f69b27ab1ad Mon Sep 17 00:00:00 2001
From: bilal <bilal@saburly.com>
Date: Sat, 6 Jun 2020 01:32:03 +0200
Subject: [PATCH 2/2] fix MR comment

---
 app/views/admin/task_requests/index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/task_requests/index.html.erb b/app/views/admin/task_requests/index.html.erb
index c6c58dc..8afe67f 100644
--- a/app/views/admin/task_requests/index.html.erb
+++ b/app/views/admin/task_requests/index.html.erb
@@ -17,7 +17,7 @@
         <%= render @task_requests %>
       <% else %>
         <tr>
-          <td colspan="6" class="py-4 text-center text-muted"><%= t(".empty") %></td>
+          <td colspan="20" class="py-4 text-center text-muted"><%= t(".empty") %></td>
         </tr>
       <% end %>
     </tbody>
-- 
2.47.3