mirror of https://github.com/Siphonay/mastodon
use existing inflections instead of custom helper (#4624)
* use existing inflections instead of custom helper * use ActiveSupport versions
This commit is contained in:
parent
116b8a6363
commit
efec02f153
|
@ -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
|
|
@ -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?
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
Loading…
Reference in New Issue