From 9566893cc973671f151ceabf266d260ebba57492 Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Fri, 28 Apr 2017 09:12:37 -0400
Subject: [PATCH] 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 ++++++++
 app/views/admin/accounts/show.html.haml                | 10 +++++-----
 spec/controllers/account_follow_controller_spec.rb     |  1 +
 spec/controllers/account_unfollow_controller_spec.rb   |  1 +
 spec/controllers/admin/accounts_controller_spec.rb     |  2 ++
 .../controllers/admin/domain_blocks_controller_spec.rb |  2 ++
 spec/controllers/admin/instances_controller_spec.rb    |  2 ++
 spec/controllers/admin/pubsubhubbub_controller_spec.rb |  2 ++
 .../admin/reported_statuses_controller_spec.rb         |  2 ++
 spec/controllers/admin/resets_controller_spec.rb       |  2 ++
 spec/controllers/admin/silences_controller_spec.rb     |  2 ++
 spec/controllers/admin/suspensions_controller_spec.rb  |  2 ++
 spec/controllers/authorize_follows_controller_spec.rb  |  6 ++++--
 spec/controllers/follower_accounts_controller_spec.rb  |  1 +
 spec/controllers/following_accounts_controller_spec.rb |  1 +
 spec/controllers/media_controller_spec.rb              |  2 ++
 .../oauth/authorizations_controller_spec.rb            |  2 ++
 .../exports/blocked_accounts_controller_spec.rb        |  2 ++
 .../exports/following_accounts_controller_spec.rb      |  2 ++
 .../settings/exports/muted_accounts_controller_spec.rb |  2 ++
 .../settings/follower_domains_controller_spec.rb       |  2 ++
 spec/controllers/settings/imports_controller_spec.rb   |  1 +
 .../settings/preferences_controller_spec.rb            |  2 ++
 spec/controllers/settings/profiles_controller_spec.rb  |  1 +
 24 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/app/models/account.rb b/app/models/account.rb
index b8927c51f2..19f8ca365a 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
diff --git a/app/views/admin/accounts/show.html.haml b/app/views/admin/accounts/show.html.haml
index 898f43c0be..0b3348960b 100644
--- a/app/views/admin/accounts/show.html.haml
+++ b/app/views/admin/accounts/show.html.haml
@@ -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?
diff --git a/spec/controllers/account_follow_controller_spec.rb b/spec/controllers/account_follow_controller_spec.rb
index 479101c67d..b0e646c1fb 100644
--- a/spec/controllers/account_follow_controller_spec.rb
+++ b/spec/controllers/account_follow_controller_spec.rb
@@ -2,6 +2,7 @@ require 'rails_helper'
 
 describe AccountFollowController do
   render_views
+
   let(:user) { Fabricate(:user) }
   let(:alice) { Fabricate(:account, username: 'alice') }
 
diff --git a/spec/controllers/account_unfollow_controller_spec.rb b/spec/controllers/account_unfollow_controller_spec.rb
index 1f28bf4ab8..a6c86d4b9b 100644
--- a/spec/controllers/account_unfollow_controller_spec.rb
+++ b/spec/controllers/account_unfollow_controller_spec.rb
@@ -2,6 +2,7 @@ require 'rails_helper'
 
 describe AccountUnfollowController do
   render_views
+
   let(:user) { Fabricate(:user) }
   let(:alice) { Fabricate(:account, username: 'alice') }
 
diff --git a/spec/controllers/admin/accounts_controller_spec.rb b/spec/controllers/admin/accounts_controller_spec.rb
index 47b1267e8f..305260475a 100644
--- a/spec/controllers/admin/accounts_controller_spec.rb
+++ b/spec/controllers/admin/accounts_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe Admin::AccountsController, type: :controller do
+  render_views
+
   before do
     sign_in Fabricate(:user, admin: true), scope: :user
   end
diff --git a/spec/controllers/admin/domain_blocks_controller_spec.rb b/spec/controllers/admin/domain_blocks_controller_spec.rb
index 9d8735ef24..4578efb02d 100644
--- a/spec/controllers/admin/domain_blocks_controller_spec.rb
+++ b/spec/controllers/admin/domain_blocks_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe Admin::DomainBlocksController, type: :controller do
+  render_views
+
   before do
     sign_in Fabricate(:user, admin: true), scope: :user
   end
diff --git a/spec/controllers/admin/instances_controller_spec.rb b/spec/controllers/admin/instances_controller_spec.rb
index c50ea352f7..37fa8dd9a0 100644
--- a/spec/controllers/admin/instances_controller_spec.rb
+++ b/spec/controllers/admin/instances_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 RSpec.describe Admin::InstancesController, type: :controller do
+  render_views
+
   before do
     sign_in Fabricate(:user, admin: true), scope: :user
   end
diff --git a/spec/controllers/admin/pubsubhubbub_controller_spec.rb b/spec/controllers/admin/pubsubhubbub_controller_spec.rb
index 068bd09a66..c2bab5daca 100644
--- a/spec/controllers/admin/pubsubhubbub_controller_spec.rb
+++ b/spec/controllers/admin/pubsubhubbub_controller_spec.rb
@@ -2,6 +2,8 @@
 require 'rails_helper'
 
 RSpec.describe Admin::PubsubhubbubController, type: :controller do
+  render_views
+
   describe 'GET #index' do
     before do
       sign_in Fabricate(:user, admin: true), scope: :user
diff --git a/spec/controllers/admin/reported_statuses_controller_spec.rb b/spec/controllers/admin/reported_statuses_controller_spec.rb
index 4d6926e1af..dea5ea55d3 100644
--- a/spec/controllers/admin/reported_statuses_controller_spec.rb
+++ b/spec/controllers/admin/reported_statuses_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Admin::ReportedStatusesController do
+  render_views
+
   let(:user) { Fabricate(:user, admin: true) }
   before do
     sign_in user, scope: :user
diff --git a/spec/controllers/admin/resets_controller_spec.rb b/spec/controllers/admin/resets_controller_spec.rb
index 283ab029f9..a0a77478e0 100644
--- a/spec/controllers/admin/resets_controller_spec.rb
+++ b/spec/controllers/admin/resets_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Admin::ResetsController do
+  render_views
+
   let(:account) { Fabricate(:account, user: Fabricate(:user)) }
   before do
     sign_in Fabricate(:user, admin: true), scope: :user
diff --git a/spec/controllers/admin/silences_controller_spec.rb b/spec/controllers/admin/silences_controller_spec.rb
index 7c541d7970..16b326542d 100644
--- a/spec/controllers/admin/silences_controller_spec.rb
+++ b/spec/controllers/admin/silences_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Admin::SilencesController do
+  render_views
+
   let(:account) { Fabricate(:account) }
   before do
     sign_in Fabricate(:user, admin: true), scope: :user
diff --git a/spec/controllers/admin/suspensions_controller_spec.rb b/spec/controllers/admin/suspensions_controller_spec.rb
index 9096f067ef..2d9adc23d6 100644
--- a/spec/controllers/admin/suspensions_controller_spec.rb
+++ b/spec/controllers/admin/suspensions_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Admin::SuspensionsController do
+  render_views
+
   let(:account) { Fabricate(:account) }
   before do
     sign_in Fabricate(:user, admin: true), scope: :user
diff --git a/spec/controllers/authorize_follows_controller_spec.rb b/spec/controllers/authorize_follows_controller_spec.rb
index f65b620cc1..87a46cf8ee 100644
--- a/spec/controllers/authorize_follows_controller_spec.rb
+++ b/spec/controllers/authorize_follows_controller_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 describe AuthorizeFollowsController do
+  render_views
+
   describe 'GET #show' do
     describe 'when signed out' do
       it 'redirects to sign in page' do
@@ -38,7 +40,7 @@ describe AuthorizeFollowsController do
       end
 
       it 'sets account from url' do
-        account = double
+        account = Account.new
         service = double
         allow(FetchRemoteAccountService).to receive(:new).and_return(service)
         allow(service).to receive(:call).with('http://example.com').and_return(account)
@@ -50,7 +52,7 @@ describe AuthorizeFollowsController do
       end
 
       it 'sets account from acct uri' do
-        account = double
+        account = Account.new
         service = double
         allow(FollowRemoteAccountService).to receive(:new).and_return(service)
         allow(service).to receive(:call).with('found@hostname').and_return(account)
diff --git a/spec/controllers/follower_accounts_controller_spec.rb b/spec/controllers/follower_accounts_controller_spec.rb
index 82d2b2067c..f2082f601f 100644
--- a/spec/controllers/follower_accounts_controller_spec.rb
+++ b/spec/controllers/follower_accounts_controller_spec.rb
@@ -2,6 +2,7 @@ require 'rails_helper'
 
 describe FollowerAccountsController do
   render_views
+
   let(:alice) { Fabricate(:account, username: 'alice') }
 
   describe 'GET #index' do
diff --git a/spec/controllers/following_accounts_controller_spec.rb b/spec/controllers/following_accounts_controller_spec.rb
index 5b5a6fe5f2..f4a7e88f92 100644
--- a/spec/controllers/following_accounts_controller_spec.rb
+++ b/spec/controllers/following_accounts_controller_spec.rb
@@ -2,6 +2,7 @@ require 'rails_helper'
 
 describe FollowingAccountsController do
   render_views
+
   let(:alice) { Fabricate(:account, username: 'alice') }
 
   describe 'GET #index' do
diff --git a/spec/controllers/media_controller_spec.rb b/spec/controllers/media_controller_spec.rb
index ebf6aa006e..2541df7344 100644
--- a/spec/controllers/media_controller_spec.rb
+++ b/spec/controllers/media_controller_spec.rb
@@ -3,6 +3,8 @@
 require 'rails_helper'
 
 describe MediaController do
+  render_views
+
   describe '#show' do
     it 'redirects to the file url when attached to a status' do
       status = Fabricate(:status)
diff --git a/spec/controllers/oauth/authorizations_controller_spec.rb b/spec/controllers/oauth/authorizations_controller_spec.rb
index 0e3b34bf07..a5997bba33 100644
--- a/spec/controllers/oauth/authorizations_controller_spec.rb
+++ b/spec/controllers/oauth/authorizations_controller_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 RSpec.describe Oauth::AuthorizationsController, type: :controller do
diff --git a/spec/controllers/settings/exports/blocked_accounts_controller_spec.rb b/spec/controllers/settings/exports/blocked_accounts_controller_spec.rb
index c815bdfec1..e79a6729a6 100644
--- a/spec/controllers/settings/exports/blocked_accounts_controller_spec.rb
+++ b/spec/controllers/settings/exports/blocked_accounts_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Settings::Exports::BlockedAccountsController do
+  render_views
+
   before do
     sign_in Fabricate(:user), scope: :user
   end
diff --git a/spec/controllers/settings/exports/following_accounts_controller_spec.rb b/spec/controllers/settings/exports/following_accounts_controller_spec.rb
index a7029709cf..503455feaa 100644
--- a/spec/controllers/settings/exports/following_accounts_controller_spec.rb
+++ b/spec/controllers/settings/exports/following_accounts_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Settings::Exports::FollowingAccountsController do
+  render_views
+
   before do
     sign_in Fabricate(:user), scope: :user
   end
diff --git a/spec/controllers/settings/exports/muted_accounts_controller_spec.rb b/spec/controllers/settings/exports/muted_accounts_controller_spec.rb
index bb52b6fcfd..37c3a0fcfe 100644
--- a/spec/controllers/settings/exports/muted_accounts_controller_spec.rb
+++ b/spec/controllers/settings/exports/muted_accounts_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Settings::Exports::MutedAccountsController do
+  render_views
+
   before do
     sign_in Fabricate(:user), scope: :user
   end
diff --git a/spec/controllers/settings/follower_domains_controller_spec.rb b/spec/controllers/settings/follower_domains_controller_spec.rb
index 1afdb97576..d48c3e68c5 100644
--- a/spec/controllers/settings/follower_domains_controller_spec.rb
+++ b/spec/controllers/settings/follower_domains_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Settings::FollowerDomainsController do
+  render_views
+
   let(:user) { Fabricate(:user) }
 
   before do
diff --git a/spec/controllers/settings/imports_controller_spec.rb b/spec/controllers/settings/imports_controller_spec.rb
index d57350a14e..8bf6aec2b4 100644
--- a/spec/controllers/settings/imports_controller_spec.rb
+++ b/spec/controllers/settings/imports_controller_spec.rb
@@ -1,6 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe Settings::ImportsController, type: :controller do
+  render_views
 
   before do
     sign_in Fabricate(:user), scope: :user
diff --git a/spec/controllers/settings/preferences_controller_spec.rb b/spec/controllers/settings/preferences_controller_spec.rb
index 0d3dc059ad..92b626d2d5 100644
--- a/spec/controllers/settings/preferences_controller_spec.rb
+++ b/spec/controllers/settings/preferences_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe Settings::PreferencesController do
+  render_views
+
   let(:user) { Fabricate(:user) }
 
   before do
diff --git a/spec/controllers/settings/profiles_controller_spec.rb b/spec/controllers/settings/profiles_controller_spec.rb
index 526bbc5bce..b3d6bc47dc 100644
--- a/spec/controllers/settings/profiles_controller_spec.rb
+++ b/spec/controllers/settings/profiles_controller_spec.rb
@@ -1,6 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe Settings::ProfilesController, type: :controller do
+  render_views
 
   before do
     sign_in Fabricate(:user), scope: :user