Show what protocol is used for accounts in admin/accounts#index (#4622)
* Show what protocol used for in admin/accounts#index * Add frozen_string_literal
This commit is contained in:
		
					parent
					
						
							
								54a04e3658
							
						
					
				
			
			
				commit
				
					
						075d6a1e13
					
				
			
		
					 5 changed files with 49 additions and 1 deletions
				
			
		
							
								
								
									
										14
									
								
								app/helpers/account_helper.rb
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										14
									
								
								app/helpers/account_helper.rb
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,14 @@ | ||||||
|  | # frozen_string_literal: true | ||||||
|  | 
 | ||||||
|  | module AccountHelper | ||||||
|  |   def protocol_for_display(protocol) | ||||||
|  |     case protocol | ||||||
|  |     when 'activitypub' | ||||||
|  |       'ActivityPub' | ||||||
|  |     when 'ostatus' | ||||||
|  |       'OStatus' | ||||||
|  |     else | ||||||
|  |       protocol | ||||||
|  |     end | ||||||
|  |   end | ||||||
|  | end | ||||||
|  | @ -4,6 +4,9 @@ | ||||||
|   %td.domain |   %td.domain | ||||||
|     - unless account.local? |     - unless account.local? | ||||||
|       = link_to account.domain, admin_accounts_path(by_domain: account.domain) |       = link_to account.domain, admin_accounts_path(by_domain: account.domain) | ||||||
|  |   %td.protocol | ||||||
|  |     - unless account.local? | ||||||
|  |       = protocol_for_display(account.protocol) | ||||||
|   %td.confirmed |   %td.confirmed | ||||||
|     - if account.local? |     - if account.local? | ||||||
|       - if account.user_confirmed? |       - if account.user_confirmed? | ||||||
|  |  | ||||||
|  | @ -55,6 +55,7 @@ | ||||||
|     %tr |     %tr | ||||||
|       %th= t('admin.accounts.username') |       %th= t('admin.accounts.username') | ||||||
|       %th= t('admin.accounts.domain') |       %th= t('admin.accounts.domain') | ||||||
|  |       %th= t('admin.accounts.protocol') | ||||||
|       %th= t('admin.accounts.confirmed') |       %th= t('admin.accounts.confirmed') | ||||||
|       %th= fa_icon 'paper-plane-o' |       %th= fa_icon 'paper-plane-o' | ||||||
|       %th |       %th | ||||||
|  |  | ||||||
|  | @ -33,7 +33,7 @@ | ||||||
|         %td= link_to @account.url, @account.url |         %td= link_to @account.url, @account.url | ||||||
|       %tr |       %tr | ||||||
|         %th= t('admin.accounts.protocol') |         %th= t('admin.accounts.protocol') | ||||||
|         %td= @account.protocol |         %td= protocol_for_display(@account.protocol) | ||||||
| 
 | 
 | ||||||
|       - if @account.ostatus? |       - if @account.ostatus? | ||||||
|         %tr |         %tr | ||||||
|  |  | ||||||
							
								
								
									
										30
									
								
								spec/helpers/account_helper_spec.rb
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										30
									
								
								spec/helpers/account_helper_spec.rb
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,30 @@ | ||||||
|  | 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…
	
	Add table
		Add a link
		
	
		Reference in a new issue