Admin base controller (#1465)

* Add Admin::BaseController to wrap admin area

Extracts the setting of the `admin` layout and verifying that users are admins
to a common base class for the admin/ controllers.

* Add basic coverage for admin/reports and admin/settings controllers

app/controllers/admin/accounts_controller.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-class Admin::AccountsController < ApplicationController
+module Admin
-  before_action :require_admin!
+  class AccountsController < BaseController
     before_action :set_account, except: :index
 
-  layout 'admin'
-
     def index
       @accounts = Account.alphabetic.paginate(page: params[:page], per_page: 40)
 
@@ -48,4 +46,5 @@ class Admin::AccountsController < ApplicationController
     def account_params
       params.require(:account).permit(:silenced, :suspended)
     end
+  end
 end

app/controllers/admin/base_controller.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Admin
+  class BaseController < ApplicationController
+    before_action :require_admin!
+
+    layout 'admin'
+  end
+end

app/controllers/admin/domain_blocks_controller.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
-class Admin::DomainBlocksController < ApplicationController
+module Admin
-  before_action :require_admin!
+  class DomainBlocksController < BaseController
-
-  layout 'admin'
-
     def index
       @blocks = DomainBlock.paginate(page: params[:page], per_page: 40)
     end
@@ -29,4 +26,5 @@ class Admin::DomainBlocksController < ApplicationController
     def resource_params
       params.require(:domain_block).permit(:domain, :severity)
     end
+  end
 end

app/controllers/admin/pubsubhubbub_controller.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-class Admin::PubsubhubbubController < ApplicationController
+module Admin
-  before_action :require_admin!
+  class PubsubhubbubController < BaseController
-
-  layout 'admin'
-
     def index
       @subscriptions = Subscription.order('id desc').includes(:account).paginate(page: params[:page], per_page: 40)
     end
+  end
 end

app/controllers/admin/reports_controller.rb

@@ -1,11 +1,9 @@
 # frozen_string_literal: true
 
-class Admin::ReportsController < ApplicationController
+module Admin
-  before_action :require_admin!
+  class ReportsController < BaseController
     before_action :set_report, except: [:index]
 
-  layout 'admin'
-
     def index
       @reports = Report.includes(:account, :target_account).order('id desc').paginate(page: params[:page], per_page: 40)
       @reports = params[:action_taken].present? ? @reports.resolved : @reports.unresolved
@@ -42,4 +40,5 @@ class Admin::ReportsController < ApplicationController
     def set_report
       @report = Report.find(params[:id])
     end
+  end
 end

app/controllers/admin/settings_controller.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
-class Admin::SettingsController < ApplicationController
+module Admin
-  before_action :require_admin!
+  class SettingsController < BaseController
-
-  layout 'admin'
-
     def index
       @settings = Setting.all_as_records
     end
@@ -32,4 +29,5 @@ class Admin::SettingsController < ApplicationController
     def settings_params
       params.require(:setting).permit(:value)
     end
+  end
 end

spec/controllers/admin/reports_controller_spec.rb

@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+RSpec.describe Admin::ReportsController, type: :controller do
+  describe 'GET #index' do
+    before do
+      sign_in Fabricate(:user, admin: true), scope: :user
+    end
+
+    it 'returns http success' do
+      get :index
+      expect(response).to have_http_status(:success)
+    end
+  end
+end

spec/controllers/admin/settings_controller_spec.rb

@@ -0,0 +1,14 @@
+require 'rails_helper'
+
+RSpec.describe Admin::SettingsController, type: :controller do
+  describe 'GET #index' do
+    before do
+      sign_in Fabricate(:user, admin: true), scope: :user
+    end
+
+    it 'returns http success' do
+      get :index
+      expect(response).to have_http_status(:success)
+    end
+  end
+end