From 59ae29005d32d73aeb96d943ae5135581ffa8185 Mon Sep 17 00:00:00 2001
From: Natalie St Jean <49460529+nstjean@users.noreply.github.com>
Date: Tue, 29 Oct 2019 02:45:43 -0400
Subject: [PATCH] List map tags in view map page (new show page) (#1064)

* list map tags in view map page

* add tests for maps show page

* align center
---
 app/views/maps/show.html.erb             | 14 ++++++++++++--
 test/controllers/maps_controller_test.rb |  5 +++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/views/maps/show.html.erb b/app/views/maps/show.html.erb
index 926901b88..cb758d7f4 100644
--- a/app/views/maps/show.html.erb
+++ b/app/views/maps/show.html.erb
@@ -7,13 +7,23 @@
 <div class= "row" id="knitter-map-pane" style="height: 450px; width: 100%;  margin-bottom: 1%; z-index: 5; float: none; max-width: none;"> </div>
 <div class="container-fluid">
     <div class="row">
-        <div class="col-md-6">
+        <div class="col-md-4">
             <button type="button" class="btn btn-outline-info btn-sm" onClick="$('.share-link').toggle()" style="margin-left: 1%;">Embed code</button>
             <div class="share-link" style="display:none;">
                 <%= render :partial => 'maps/share' %>
             </div>
         </div>
-        <div class="col-md-6">
+        <div class="col-md-3 offset-md-1">
+            <% @map.tags.each do |tag| %>
+                <span id="tag_<%= tag.id %>" class="badge badge-light">
+                    <a href="/tags/<%= tag.name %>" id="tag_<%= tag.id %>"><%= tag.name %></a>
+                    <%= link_to([@map, tag], :method => "delete") do %>
+                        <span>&times;</span>
+                    <% end %>
+                </span>
+            <% end %>
+        </div>
+        <div class="col-md-4">
         <% if !@map.anonymous? || (current_user == true && current_user.can_edit?(@map)) %>
             <a href="/maps/<%= @map.slug %>/edit">
                 <button class="btn btn-outline-info float-right">
diff --git a/test/controllers/maps_controller_test.rb b/test/controllers/maps_controller_test.rb
index 445f2f6bc..4a35f88ef 100644
--- a/test/controllers/maps_controller_test.rb
+++ b/test/controllers/maps_controller_test.rb
@@ -174,9 +174,14 @@ def teardown
   end
 
   test "should get show" do
+    @map = maps(:yaya)
+    map = maps(:nairobi)
     get(:show, params: { id: @map.slug })
     assert_response :success
     assert_not_nil assigns(:map)
+    assert assigns(:users)
+    assert assigns(:maps)
+    assert_includes assigns(:maps), map
   end
 
   test 'should archive map' do