use existing inflections instead of custom helper (#4624)

* use existing inflections instead of custom helper

* use ActiveSupport versions

diff --git a/app/helpers/account_helper.rb b/app/helpers/account_helper.rb
deleted file mode 100644 (file)
index 00d4fc6..0000000
--- a/app/helpers/account_helper.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module AccountHelper
-  def protocol_for_display(protocol)
-    case protocol
-    when 'activitypub'
-      'ActivityPub'
-    when 'ostatus'
-      'OStatus'
-    else
-      protocol
-    end
-  end
-end

diff --git a/app/views/admin/accounts/_account.html.haml b/app/views/admin/accounts/_account.html.haml
index a7fca6b3ef4c85be48371b2681f12dd90142837a..5265d77f66c7ade73b795344e0efdf7ac59acaab 100644 (file)
--- a/app/views/admin/accounts/_account.html.haml
+++ b/app/views/admin/accounts/_account.html.haml
@@ -6,7 +6,7 @@
       = link_to account.domain, admin_accounts_path(by_domain: account.domain)
   %td.protocol
     - unless account.local?
-      = protocol_for_display(account.protocol)
+      = account.protocol.humanize
   %td.confirmed
     - if account.local?
       - if account.user_confirmed?

diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index f0e4e303c178145cae1cf4c042c016551c7f01aa..18bcd5e8edb748ed3541b791694a084eebf95cc4 100644 (file)
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -33,7 +33,7 @@
         %td= link_to @account.url, @account.url
       %tr
         %th= t('admin.accounts.protocol')
-        %td= protocol_for_display(@account.protocol)
+        %td= @account.protocol.humanize
 
       - if @account.ostatus?
         %tr

diff --git a/spec/helpers/account_helper_spec.rb b/spec/helpers/account_helper_spec.rb
deleted file mode 100644 (file)
index 63e7c78..0000000
--- a/spec/helpers/account_helper_spec.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-require 'rails_helper'
-
-# Specs in this file have access to a helper object that includes
-# the AccountHelper. For example:
-#
-# describe AccountHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       expect(helper.concat_strings("this","that")).to eq("this that")
-#     end
-#   end
-# end
-RSpec.describe AccountHelper, type: :helper do
-  describe '#protocol_for_display' do
-    it "returns OStatus when the protocol is 'ostatus'" do
-      protocol = 'ostatus'
-      expect(protocol_for_display(protocol)).to eq 'OStatus'
-    end
-
-    it "returns ActivityPub when the protocol is 'activitypub'" do
-      protocol = 'activitypub'
-      expect(protocol_for_display(protocol)).to eq 'ActivityPub'
-    end
-
-    it "returns the same string when the protocol is unknown" do
-      protocol = 'wave'
-      expect(protocol_for_display(protocol)).to eq protocol
-    end
-  end
-end