From 8616847793a191ac5a22cbb045da961cd6ac72bf Mon Sep 17 00:00:00 2001
From: cyrillefr <cyrille.vasseur@gmail.com>
Date: Mon, 17 Jun 2024 16:29:36 +0200
Subject: [PATCH] Update button should change status on modified white label

- swap position between users & white label so that user's inner form
- does not interfere with white_label own position in outer form
- modified spec so that lowermost user is clickable
---
 app/helpers/admin/enterprises_helper.rb       | 2 +-
 spec/helpers/admin/enterprises_helper_spec.rb | 2 +-
 spec/system/admin/enterprise_roles_spec.rb    | 2 ++
 spec/system/admin/enterprises_spec.rb         | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/helpers/admin/enterprises_helper.rb b/app/helpers/admin/enterprises_helper.rb
index e9d337c7c0..1aa61f2a5b 100644
--- a/app/helpers/admin/enterprises_helper.rb
+++ b/app/helpers/admin/enterprises_helper.rb
@@ -66,8 +66,8 @@ module Admin
         { name: 'inventory_settings', icon_class: "icon-list-ol", show: is_shop },
         { name: 'tag_rules', icon_class: "icon-random", show: is_shop },
         { name: 'shop_preferences', icon_class: "icon-shopping-cart", show: is_shop },
-        { name: 'users', icon_class: "icon-user", show: true },
         { name: 'white_label', icon_class: "icon-leaf", show: true },
+        { name: 'users', icon_class: "icon-user", show: true },
         { name: 'connected_apps', icon_class: "icon-puzzle-piece", show: show_connected_apps },
       ]
     end
diff --git a/spec/helpers/admin/enterprises_helper_spec.rb b/spec/helpers/admin/enterprises_helper_spec.rb
index 58131fdf06..2c9a0ac531 100644
--- a/spec/helpers/admin/enterprises_helper_spec.rb
+++ b/spec/helpers/admin/enterprises_helper_spec.rb
@@ -23,7 +23,7 @@ RSpec.describe Admin::EnterprisesHelper, type: :helper do
       expect(visible_items.pluck(:name)).to eq %w[
         primary_details address contact social about business_details images
         vouchers enterprise_permissions inventory_settings tag_rules
-        shop_preferences users white_label
+        shop_preferences white_label users
       ]
     end
 
diff --git a/spec/system/admin/enterprise_roles_spec.rb b/spec/system/admin/enterprise_roles_spec.rb
index e3be5b5862..43b08b17f6 100644
--- a/spec/system/admin/enterprise_roles_spec.rb
+++ b/spec/system/admin/enterprise_roles_spec.rb
@@ -23,6 +23,7 @@ create(:enterprise)
       create(:enterprise_role, user: u2, enterprise: e4)
 
       # When I go to the roles page
+      scroll_to(:bottom)
       click_link 'Users'
       click_link 'Roles'
 
@@ -179,6 +180,7 @@ create(:enterprise)
   private
 
   def navigate_to_enterprise_users
+    scroll_to(:bottom)
     within ".side_menu" do
       click_link "Users"
     end
diff --git a/spec/system/admin/enterprises_spec.rb b/spec/system/admin/enterprises_spec.rb
index caabb4a006..c351530226 100644
--- a/spec/system/admin/enterprises_spec.rb
+++ b/spec/system/admin/enterprises_spec.rb
@@ -569,6 +569,7 @@ RSpec.describe '
       before do
         login_as_admin
         visit edit_admin_enterprise_path(distributor1)
+        scroll_to(:bottom)
         within ".side_menu" do
           click_link 'Users'
         end