More controller specs (#2561)

* Add render_views in more places

* Delegate methods from account to user with allow nil true, so that admin accounts show view renders when missing a user

* Use actual account instances in authorize follow controller spec
This commit is contained in:
Matt Jankowski 2017-04-28 09:12:37 -04:00 committed by Eugen Rochko
parent 0e2589867f
commit 9566893cc9
24 changed files with 53 additions and 7 deletions

View file

@ -74,6 +74,14 @@ class Account < ApplicationRecord
scope :alphabetic, -> { order(domain: :asc, username: :asc) }
scope :by_domain_accounts, -> { group(:domain).select(:domain, 'COUNT(*) AS accounts_count').order('accounts_count desc') }
delegate :email,
:current_sign_in_ip,
:current_sign_in_at,
:confirmed?,
to: :user,
prefix: true,
allow_nil: true
def follow!(other_account)
active_relationships.where(target_account: other_account).first_or_create!(target_account: other_account)
end

View file

@ -16,15 +16,15 @@
- if @account.local?
%tr
%th= t('admin.accounts.email')
%td= @account.user.email
%td= @account.user_email
%tr
%th= t('admin.accounts.most_recent_ip')
%td= @account.user.current_sign_in_ip
%td= @account.user_current_sign_in_ip
%tr
%th= t('admin.accounts.most_recent_activity')
%td
- if @account.user.current_sign_in_at
= l @account.user.current_sign_in_at
- if @account.user_current_sign_in_at
= l @account.user_current_sign_in_at
- else
Never
- else
@ -78,7 +78,7 @@
= link_to t('admin.accounts.silence'), admin_account_silence_path(@account.id), method: :post, class: 'button'
- if @account.local?
- unless @account.user.confirmed?
- unless @account.user_confirmed?
= link_to t('admin.accounts.confirm'), admin_account_confirmation_path(@account.id), method: :post, class: 'button'
- if @account.suspended?