From 367622cea8f09ec75f53620a48d16c3a02433f8c Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Sat, 12 Dec 2020 00:01:40 +0000
Subject: [PATCH] Capybara v3 is not cleaning up the html into text so the
 permissions that are inside html li elements are not matched with the matcher
 have_table_row when there are multiple permissions. So, in this case, we need
 to do the work ourselves: looking up the correct row and then asserting the
 permissions are the ones required

---
 .../admin/enterprise_relationships_spec.rb    | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/spec/features/admin/enterprise_relationships_spec.rb b/spec/features/admin/enterprise_relationships_spec.rb
index b99341fb46..3dd2c24f99 100644
--- a/spec/features/admin/enterprise_relationships_spec.rb
+++ b/spec/features/admin/enterprise_relationships_spec.rb
@@ -26,10 +26,9 @@ feature '
 
       # Then I should see the relationships
       within('table#enterprise-relationships') do
-        expect(page).to have_relationship e1, e2, ['to add to order cycle']
-        expect(page).to have_relationship e2, e3, ['to manage products']
-        expect(page).to have_relationship e3, e4,
-                                          ['to add to order cycle', 'to manage products']
+        expect(page).to have_relationship e1, e2, 'to add to order cycle'
+        expect(page).to have_relationship e2, e3, 'to manage products'
+        expect_relationship_with_permissions e3, e4, ['to add to order cycle', 'to manage products']
       end
     end
 
@@ -50,7 +49,7 @@ feature '
 
       # Wait for row to appear since have_relationship doesn't wait
       expect(page).to have_selector 'tr', count: 2
-      expect(page).to have_relationship e1, e2, ['to add to order cycle', 'to add products to inventory', 'to edit profile']
+      expect_relationship_with_permissions e1, e2, ['to add to order cycle', 'to add products to inventory', 'to edit profile']
       er = EnterpriseRelationship.where(parent_id: e1, child_id: e2).first
       expect(er).to be_present
       expect(er.permissions.map(&:name)).to match_array ['add_to_order_cycle', 'edit_profile', 'create_variant_overrides']
@@ -79,7 +78,7 @@ feature '
       er = create(:enterprise_relationship, parent: e1, child: e2, permissions_list: [:add_to_order_cycle])
 
       visit admin_enterprise_relationships_path
-      expect(page).to have_relationship e1, e2, ['to add to order cycle']
+      expect(page).to have_relationship e1, e2, 'to add to order cycle'
 
       accept_alert do
         first("a.delete-enterprise-relationship").click
@@ -119,9 +118,24 @@ feature '
 
   private
 
-  def have_relationship(parent, child, perms = [])
-    perms = perms.join(' ')
+  def have_relationship(parent, child, permission = "")
+    have_table_row [parent.name, 'permits', child.name, permission, '']
+  end
 
-    have_table_row [parent.name, 'permits', child.name, perms, '']
+  def expect_relationship_with_permissions(parent, child, permissions = [])
+    tr = find_relationship(parent, child)
+    td = tr.find('td:nth-child(4)')
+    permissions.each_with_index do |permission, index|
+      expect(td.find("li:nth-child(#{index + 1})").text).to eq permission
+    end
+  end
+
+  def find_relationship(parent, child)
+    page.all('tr').each do |tr|
+      return tr if tr.find('td:first-child').text == parent.name &&
+                   tr.find('td:nth-child(2)').text == "permits" &&
+                   tr.find('td:nth-child(3)').text == child.name
+    end
+    raise "relationship not found"
   end
 end