From bb20ca6d92656fcc0c4f00ba9f7dedfe68a12e63 Mon Sep 17 00:00:00 2001
From: Ryan Lue <hello@ryanlue.com>
Date: Wed, 6 Mar 2019 22:27:44 +0800
Subject: [PATCH] Knowledge Base Prep: Prevent potential conflict from HTML
 elements with identical IDs

---
 app/assets/javascripts/app/views/generic/table_row.jst.eco | 6 +++---
 test/browser/admin_channel_email_test.rb                   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/app/views/generic/table_row.jst.eco b/app/assets/javascripts/app/views/generic/table_row.jst.eco
index 61689925d..0bd8a12ac 100644
--- a/app/assets/javascripts/app/views/generic/table_row.jst.eco
+++ b/app/assets/javascripts/app/views/generic/table_row.jst.eco
@@ -39,10 +39,10 @@
     <% else if header.name is 'action': %>
       <% if @actions.length > 1: %>
         <div class="dropdown dropdown--actions">
-          <div class="btn btn--table btn--text btn--secondary js-action" id="tableActions" data-toggle="dropdown">
+          <div class="btn btn--table btn--text btn--secondary js-action" data-toggle="dropdown">
             <%- @Icon('overflow-button') %>
           </div>
-          <ul class="dropdown-menu dropdown-menu-right js-table-action-menu" role="menu" aria-labelledby="tableActions">
+          <ul class="dropdown-menu dropdown-menu-right js-table-action-menu" role="menu">
             <% for action in @actions: %>
             <li role="presentation" class="<%= action.class %>" data-table-action="<%= action.name %>">
               <a role="menuitem" tabindex="-1">
@@ -76,4 +76,4 @@
     <% end %>
   </td>
 <% end %>
-</tr>
\ No newline at end of file
+</tr>
diff --git a/test/browser/admin_channel_email_test.rb b/test/browser/admin_channel_email_test.rb
index 89bf13ad6..9ebd00ef2 100644
--- a/test/browser/admin_channel_email_test.rb
+++ b/test/browser/admin_channel_email_test.rb
@@ -162,7 +162,7 @@ class AdminChannelEmailTest < TestCase
     )
 
     # now clone filter that we just created
-    click(css: '.content.active .table #tableActions')
+    click(css: '.content.active .table .dropdown .btn--table')
     click(css: '.content.active .table .dropdown .js-clone')
 
     modal_ready()