From bb82d533a338e35406f2da4096935b6c7618fb4f Mon Sep 17 00:00:00 2001
From: rgarcia <voodoorai2000@gmail.com>
Date: Fri, 9 Feb 2018 20:42:40 +0100
Subject: [PATCH] Display valuators on valuator group's show

---
 app/views/admin/valuator_groups/show.html.erb |  9 ++++++++-
 spec/features/admin/valuator_groups_spec.rb   | 12 ++++++++++--
 spec/features/admin/valuators_spec.rb         |  4 ++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/valuator_groups/show.html.erb b/app/views/admin/valuator_groups/show.html.erb
index d8dd07843..2cd295a3f 100644
--- a/app/views/admin/valuator_groups/show.html.erb
+++ b/app/views/admin/valuator_groups/show.html.erb
@@ -2,4 +2,11 @@
 
 <h2><%= t("admin.valuator_groups.show.title", group: @group.name) %></h2>
 
-<!-- Pending add members list -->
+<ul id="valuators">
+  <% @group.valuators.each do |valuator| %>
+    <li>
+      <%= link_to valuator.description_or_email, 
+                  admin_valuator_path(valuator) %>
+    </li>
+  <% end %>
+</ul>
diff --git a/spec/features/admin/valuator_groups_spec.rb b/spec/features/admin/valuator_groups_spec.rb
index 9b888dfc8..29bd338d9 100644
--- a/spec/features/admin/valuator_groups_spec.rb
+++ b/spec/features/admin/valuator_groups_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-feature "Valuator groups", :focus do
+feature "Valuator groups" do
 
   let(:admin) { create(:administrator).user }
 
@@ -18,12 +18,20 @@ feature "Valuator groups", :focus do
     expect(page).to have_content group2.name
   end
 
-  scenario "Show" do
+  scenario "Show", :focus do
     group = create(:valuator_group)
+    valuator1 = create(:valuator, valuator_group: group)
+    valuator2 = create(:valuator, valuator_group: group)
+    valuator3 = create(:valuator, valuator_group: nil)
 
     visit admin_valuator_group_path(group)
 
     expect(page).to have_content group.name
+
+    within("#valuators") do
+      expect(page).to have_link(valuator1.email, href: admin_valuator_path(valuator1))
+      expect(page).to have_link(valuator2.email, href: admin_valuator_path(valuator2))
+    end
   end
 
   scenario "Create" do
diff --git a/spec/features/admin/valuators_spec.rb b/spec/features/admin/valuators_spec.rb
index 47ee1c255..df9b91abb 100644
--- a/spec/features/admin/valuators_spec.rb
+++ b/spec/features/admin/valuators_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-feature 'Admin valuators', :focus do
+feature 'Admin valuators' do
   background do
     @admin    = create(:administrator)
     @user     = create(:user, username: 'Jose Luis Balbin')
@@ -9,7 +9,7 @@ feature 'Admin valuators', :focus do
     visit admin_valuators_path
   end
 
-  scenario "Show", :focus do
+  scenario "Show" do
     visit admin_valuator_path(@valuator)
 
     expect(page).to have_content @valuator.name