From f2d99d6747027f3c12ff860ea0d1c82ea8f671eb Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Fri, 13 Oct 2017 18:39:13 +0200
Subject: [PATCH] searches for officers assigned to a poll

---
 .../poll/officer_assignments_controller.rb    |  4 +-
 .../poll/officer_assignments/index.html.erb   |  2 +-
 .../admin/poll/officer_assignments_spec.rb    | 68 +++++++++++++++++++
 3 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 spec/features/admin/poll/officer_assignments_spec.rb

diff --git a/app/controllers/admin/poll/officer_assignments_controller.rb b/app/controllers/admin/poll/officer_assignments_controller.rb
index fd62df8b3..7532362a7 100644
--- a/app/controllers/admin/poll/officer_assignments_controller.rb
+++ b/app/controllers/admin/poll/officer_assignments_controller.rb
@@ -25,7 +25,9 @@ class Admin::Poll::OfficerAssignmentsController < Admin::Poll::BaseController
 
   def search_officers
     load_search
-    @officers = User.joins(:poll_officer).search(@search).order(username: :asc)
+
+    poll_officers = User.where(id: @poll.officers.pluck(:user_id))
+    @officers = poll_officers.search(@search).order(username: :asc)
 
     respond_to do |format|
       format.js
diff --git a/app/views/admin/poll/officer_assignments/index.html.erb b/app/views/admin/poll/officer_assignments/index.html.erb
index f27f6b2ae..04e296980 100644
--- a/app/views/admin/poll/officer_assignments/index.html.erb
+++ b/app/views/admin/poll/officer_assignments/index.html.erb
@@ -11,7 +11,7 @@
       <%= t("admin.poll_officer_assignments.index.no_officers") %>
     </div>
   <% else %>
-    <table class="fixed margin">
+    <table class="fixed margin" id="officer_assignments">
       <thead>
         <th><%= t("admin.poll_officer_assignments.index.table_name") %></th>
         <th><%= t("admin.poll_officer_assignments.index.table_email") %></th>
diff --git a/spec/features/admin/poll/officer_assignments_spec.rb b/spec/features/admin/poll/officer_assignments_spec.rb
new file mode 100644
index 000000000..20be138b9
--- /dev/null
+++ b/spec/features/admin/poll/officer_assignments_spec.rb
@@ -0,0 +1,68 @@
+require 'rails_helper'
+
+feature 'Officer Assignments' do
+
+  background do
+    admin = create(:administrator)
+    login_as(admin.user)
+  end
+
+  scenario "Index" do
+    poll = create(:poll)
+    booth = create(:poll_booth)
+
+    officer1 = create(:poll_officer)
+    officer2 = create(:poll_officer)
+    officer3 = create(:poll_officer)
+
+    booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+    officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer1)
+
+    booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
+    officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer2)
+
+    visit admin_poll_path(poll)
+
+    click_link 'Officers (2)'
+
+    within('#officer_assignments') do
+      expect(page).to have_content officer1.name
+      expect(page).to have_content officer2.name
+      expect(page).to_not have_content officer3.name
+    end
+	end
+
+	scenario "Search", :js do
+    poll = create(:poll)
+    booth = create(:poll_booth)
+
+    user1 = create(:user, username: "John Snow")
+    user2 = create(:user, username: "John Silver")
+    user3 = create(:user, username: "John Edwards")
+
+    officer1 = create(:poll_officer, user: user1)
+    officer2 = create(:poll_officer, user: user2)
+    officer3 = create(:poll_officer, user: user3)
+
+    booth_assignment = create(:poll_booth_assignment, poll: poll, booth: booth)
+    officer_assignment = create(:poll_officer_assignment, booth_assignment: booth_assignment, officer: officer1)
+
+    booth_assignment_2 = create(:poll_booth_assignment, poll: poll)
+    officer_assignment_2 = create(:poll_officer_assignment, booth_assignment: booth_assignment_2, officer: officer2)
+
+    visit admin_poll_path(poll)
+
+    click_link 'Officers (2)'
+
+    fill_in "search-officers", with: "John"
+    click_button "Search"
+
+    within('#search-officers-results') do
+      expect(page).to have_content officer1.name
+      expect(page).to have_content officer2.name
+      expect(page).to_not have_content officer3.name
+    end
+	end
+
+
+end
\ No newline at end of file