Change 'Admin and Collaborator' to 'Account owner'

bitzesty · Jul 9, 2024 · b347466 · b347466
1 parent 4960b38
commit b347466
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/app/decorators/user_decorator.rb b/app/decorators/user_decorator.rb
@@ -34,13 +34,17 @@ def role
   end
 
   def role_name
-    case object.role.to_s.humanize
-    when "Account admin"
-      "Admin and collaborator"
-    when "Regular"
-      "Collaborator only"
+    if account.owner == self
+      "Account owner"
     else
-      object.role.to_s.humanize
+      case role.to_s.humanize
+      when "Account admin"
+        "Admin and collaborator"
+      when "Regular"
+        "Collaborator only"
+      else
+        role.to_s.humanize
+      end
     end
   end
 

diff --git a/app/views/account/collaborators/_item.html.slim b/app/views/account/collaborators/_item.html.slim
@@ -1,4 +1,4 @@
-li.list-group-item id=dom_id(collaborator) aria-label="#{role = collaborator == account_owner ? "Account owner" : collaborator.role_name} summary"
+li.list-group-item id=dom_id(collaborator) aria-label="#{role = collaborator.role_name} summary"
   h3.collaborator__name.govuk-heading-s
     = collaborator.full_name_with_status
   p.collaborator__jobtitle.govuk-body

diff --git a/spec/decorators/user_decorator_spec.rb b/spec/decorators/user_decorator_spec.rb
@@ -95,6 +95,13 @@
   end
 
   describe "#role_name" do
+    context "when user is account owner" do
+      it "returns Account owner" do
+        user.account.owner = user
+        expect(subject.role_name).to eq("Account owner")
+      end
+    end
+
     context "when user is account_admin" do
       it "returns Admin and collaborator" do
         user.role = "account_admin"