From 6b937dc720beeb42bbaf2efcd3836ffb41feb912 Mon Sep 17 00:00:00 2001
From: Leslie Seeberger <40617327+leslie-seeberger@users.noreply.github.com>
Date: Wed, 2 Oct 2024 23:15:26 -0500
Subject: [PATCH 1/3] Change button from 'Promote to Admin' to 'Edit User'

---
 app/views/users/_organization_user.html.erb    |  9 ++++-----
 spec/system/admin/organizations_system_spec.rb | 12 ++++++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/views/users/_organization_user.html.erb b/app/views/users/_organization_user.html.erb
index 9e882b4e4b..29a3d786b0 100644
--- a/app/views/users/_organization_user.html.erb
+++ b/app/views/users/_organization_user.html.erb
@@ -17,11 +17,10 @@
         <ul class="dropdown-menu">
           <li>
             <%=
-              edit_button_to(
-                promote_to_org_admin_organization_path(user_id: user.id),
-                {text: 'Promote to Admin'},
-                {method: :post, rel: "nofollow", data: {confirm: 'This will promote the user to admin status. Are you sure that you want to submit this?', size: 'xs'}}
-              )
+            edit_button_to(
+              edit_admin_user_path(user),
+              {text: 'Edit User'}
+            )
             %>
           </li>
           <li>
diff --git a/spec/system/admin/organizations_system_spec.rb b/spec/system/admin/organizations_system_spec.rb
index aa94b8a792..01d86009e6 100644
--- a/spec/system/admin/organizations_system_spec.rb
+++ b/spec/system/admin/organizations_system_spec.rb
@@ -1,4 +1,6 @@
 RSpec.describe "Admin Organization Management", type: :system, js: true, seed_items: false do
+  include ActionView::RecordIdentifier
+
   around do |ex|
     Kaminari.config.default_per_page = 3
     ex.run
@@ -151,5 +153,15 @@
       expect(page).to have_content("Default email text")
       expect(page).to have_content("Users")
     end
+
+    it "can edit a user within an organization" do
+      user = create(:user, name: "User to be edited", organization: foo_org)
+      visit admin_organization_path({id: foo_org.id})
+
+      click_button dom_id(user, "dropdownMenu")
+      click_link "Edit User"
+
+      expect(page).to have_content("Editing User #{user.name}")
+    end
   end
 end

From 8becfc5c0e0bfc76eea84d9cd819c04a683c8139 Mon Sep 17 00:00:00 2001
From: Leslie Seeberger <40617327+leslie-seeberger@users.noreply.github.com>
Date: Mon, 7 Oct 2024 11:41:38 -0500
Subject: [PATCH 2/3] Replace system spec with request spec for link for
 editing user

---
 spec/requests/admin/organizations_requests_spec.rb | 11 +++++++++++
 spec/system/admin/organizations_system_spec.rb     | 10 ----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/spec/requests/admin/organizations_requests_spec.rb b/spec/requests/admin/organizations_requests_spec.rb
index 3a69dfda91..9b0410eb2e 100644
--- a/spec/requests/admin/organizations_requests_spec.rb
+++ b/spec/requests/admin/organizations_requests_spec.rb
@@ -157,6 +157,17 @@
         get admin_organization_path({ id: organization.id })
         expect(response).to be_successful
       end
+
+      context "with an organization user" do
+        let!(:user) { create(:user, organization: organization) }
+
+        it "provides links to edit the user" do
+          get admin_organization_path({ id: organization.id })
+
+          expect(response.body).to include("Edit User")
+          expect(response.body).to include(edit_admin_user_path(user.id))
+        end
+      end
     end
 
     describe "PUT #update" do
diff --git a/spec/system/admin/organizations_system_spec.rb b/spec/system/admin/organizations_system_spec.rb
index 01d86009e6..a49e290309 100644
--- a/spec/system/admin/organizations_system_spec.rb
+++ b/spec/system/admin/organizations_system_spec.rb
@@ -153,15 +153,5 @@
       expect(page).to have_content("Default email text")
       expect(page).to have_content("Users")
     end
-
-    it "can edit a user within an organization" do
-      user = create(:user, name: "User to be edited", organization: foo_org)
-      visit admin_organization_path({id: foo_org.id})
-
-      click_button dom_id(user, "dropdownMenu")
-      click_link "Edit User"
-
-      expect(page).to have_content("Editing User #{user.name}")
-    end
   end
 end

From ee9f26abff04bea0149df940fd943ec9f4d254e0 Mon Sep 17 00:00:00 2001
From: Leslie Seeberger <40617327+leslie-seeberger@users.noreply.github.com>
Date: Mon, 7 Oct 2024 11:41:38 -0500
Subject: [PATCH 3/3] Replace system spec with request spec for link for
 editing user

---
 spec/system/admin/organizations_system_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/system/admin/organizations_system_spec.rb b/spec/system/admin/organizations_system_spec.rb
index a49e290309..aa94b8a792 100644
--- a/spec/system/admin/organizations_system_spec.rb
+++ b/spec/system/admin/organizations_system_spec.rb
@@ -1,6 +1,4 @@
 RSpec.describe "Admin Organization Management", type: :system, js: true, seed_items: false do
-  include ActionView::RecordIdentifier
-
   around do |ex|
     Kaminari.config.default_per_page = 3
     ex.run