From 9566893cc973671f151ceabf266d260ebba57492 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Fri, 28 Apr 2017 09:12:37 -0400 Subject: 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 --- app/models/account.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'app/models') diff --git a/app/models/account.rb b/app/models/account.rb index b8927c51f..19f8ca365 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -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 -- cgit