More coverage yes more even more (#2627)
* Add coverage for admin/confirmations controller * Coverage for statuses controller show action * Add coverage for admin/domain_blocks controller * Add coverage for settings/profiles#update
This commit is contained in:
		
							parent
							
								
									8325866c61
								
							
						
					
					
						commit
						f48cb3eb17
					
				
					 6 changed files with 108 additions and 7 deletions
				
			
		| 
						 | 
				
			
			@ -2,17 +2,15 @@
 | 
			
		|||
 | 
			
		||||
module Admin
 | 
			
		||||
  class ConfirmationsController < BaseController
 | 
			
		||||
    before_action :set_account
 | 
			
		||||
 | 
			
		||||
    def create
 | 
			
		||||
      @account.user.confirm
 | 
			
		||||
      account_user.confirm
 | 
			
		||||
      redirect_to admin_accounts_path
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    private
 | 
			
		||||
 | 
			
		||||
    def set_account
 | 
			
		||||
      @account = Account.find(params[:account_id])
 | 
			
		||||
    def account_user
 | 
			
		||||
      Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -27,7 +27,7 @@ module Admin
 | 
			
		|||
 | 
			
		||||
    def destroy
 | 
			
		||||
      @domain_block = DomainBlock.find(params[:id])
 | 
			
		||||
      UnblockDomainService.new.call(@domain_block, resource_params[:retroactive])
 | 
			
		||||
      UnblockDomainService.new.call(@domain_block, retroactive_unblock?)
 | 
			
		||||
      redirect_to admin_domain_blocks_path, notice: I18n.t('admin.domain_blocks.destroyed_msg')
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -36,5 +36,9 @@ module Admin
 | 
			
		|||
    def resource_params
 | 
			
		||||
      params.require(:domain_block).permit(:domain, :severity, :reject_media, :retroactive)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    def retroactive_unblock?
 | 
			
		||||
      resource_params[:retroactive] == '1'
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										33
									
								
								spec/controllers/admin/confirmations_controller_spec.rb
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								spec/controllers/admin/confirmations_controller_spec.rb
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,33 @@
 | 
			
		|||
require 'rails_helper'
 | 
			
		||||
 | 
			
		||||
RSpec.describe Admin::ConfirmationsController, type: :controller do
 | 
			
		||||
  render_views
 | 
			
		||||
 | 
			
		||||
  before do
 | 
			
		||||
    sign_in Fabricate(:user, admin: true), scope: :user
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe 'POST #create' do
 | 
			
		||||
    it 'confirms the user' do
 | 
			
		||||
      account = Fabricate(:account)
 | 
			
		||||
      user = Fabricate(:user, confirmed_at: false, account: account)
 | 
			
		||||
      post :create, params: { account_id: account.id }
 | 
			
		||||
 | 
			
		||||
      expect(response).to redirect_to(admin_accounts_path)
 | 
			
		||||
      expect(user.reload).to be_confirmed
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'raises an error when there is no account' do
 | 
			
		||||
      post :create, params: { account_id: 'fake' }
 | 
			
		||||
 | 
			
		||||
      expect(response).to have_http_status(:missing)
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    it 'raises an error when there is no user' do
 | 
			
		||||
      account = Fabricate(:account, user: nil)
 | 
			
		||||
      post :create, params: { account_id: account.id }
 | 
			
		||||
 | 
			
		||||
      expect(response).to have_http_status(:missing)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			@ -10,7 +10,47 @@ RSpec.describe Admin::DomainBlocksController, type: :controller do
 | 
			
		|||
  describe 'GET #index' do
 | 
			
		||||
    it 'returns http success' do
 | 
			
		||||
      get :index
 | 
			
		||||
 | 
			
		||||
      expect(response).to have_http_status(:success)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe 'GET #new' do
 | 
			
		||||
    it 'returns http success' do
 | 
			
		||||
      get :new
 | 
			
		||||
 | 
			
		||||
      expect(response).to have_http_status(:success)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe 'GET #show' do
 | 
			
		||||
    it 'returns http success' do
 | 
			
		||||
      domain_block = Fabricate(:domain_block)
 | 
			
		||||
      get :show, params: { id: domain_block.id }
 | 
			
		||||
 | 
			
		||||
      expect(response).to have_http_status(:success)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe 'POST #create' do
 | 
			
		||||
    it 'blocks the domain' do
 | 
			
		||||
      allow(DomainBlockWorker).to receive(:perform_async).and_return(true)
 | 
			
		||||
      post :create, params: { domain_block: { domain: 'example.com', severity: 'silence' } }
 | 
			
		||||
 | 
			
		||||
      expect(DomainBlockWorker).to have_received(:perform_async)
 | 
			
		||||
      expect(response).to redirect_to(admin_domain_blocks_path)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe 'DELETE #destroy' do
 | 
			
		||||
    it 'unblocks the domain' do
 | 
			
		||||
      service = double(call: true)
 | 
			
		||||
      allow(UnblockDomainService).to receive(:new).and_return(service)
 | 
			
		||||
      domain_block = Fabricate(:domain_block)
 | 
			
		||||
      delete :destroy, params: { id: domain_block.id, domain_block: { retroactive: '1' } }
 | 
			
		||||
 | 
			
		||||
      expect(service).to have_received(:call).with(domain_block, true)
 | 
			
		||||
      expect(response).to redirect_to(admin_domain_blocks_path)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -4,7 +4,8 @@ RSpec.describe Settings::ProfilesController, type: :controller do
 | 
			
		|||
  render_views
 | 
			
		||||
 | 
			
		||||
  before do
 | 
			
		||||
    sign_in Fabricate(:user), scope: :user
 | 
			
		||||
    @user = Fabricate(:user)
 | 
			
		||||
    sign_in @user, scope: :user
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe "GET #show" do
 | 
			
		||||
| 
						 | 
				
			
			@ -14,4 +15,13 @@ RSpec.describe Settings::ProfilesController, type: :controller do
 | 
			
		|||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  describe 'PUT #update' do
 | 
			
		||||
    it 'updates the user profile' do
 | 
			
		||||
      account = Fabricate(:account, user: @user, display_name: 'Old name')
 | 
			
		||||
 | 
			
		||||
      put :update, params: { account: { display_name: 'New name' } }
 | 
			
		||||
      expect(account.reload.display_name).to eq 'New name'
 | 
			
		||||
      expect(response).to redirect_to(settings_profile_path)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										16
									
								
								spec/controllers/statuses_controller_spec.rb
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								spec/controllers/statuses_controller_spec.rb
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,16 @@
 | 
			
		|||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
require 'rails_helper'
 | 
			
		||||
 | 
			
		||||
describe StatusesController do
 | 
			
		||||
  render_views
 | 
			
		||||
 | 
			
		||||
  describe '#show' do
 | 
			
		||||
    it 'returns a success' do
 | 
			
		||||
      status = Fabricate(:status)
 | 
			
		||||
      get :show, params: { account_username: status.account.username, id: status.id }
 | 
			
		||||
 | 
			
		||||
      expect(response).to have_http_status(:success)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
		Loading…
	
	Add table
		
		Reference in a new issue