diff options
Diffstat (limited to 'spec/controllers')
5 files changed, 19 insertions, 60 deletions
diff --git a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb b/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb index 42a18cdc3..75e0570e9 100644 --- a/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb +++ b/spec/controllers/api/v1/accounts/follower_accounts_controller_spec.rb @@ -7,40 +7,15 @@ describe Api::V1::Accounts::FollowerAccountsController do let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') } before do + Fabricate(:follow, target_account: user.account) allow(controller).to receive(:doorkeeper_token) { token } end describe 'GET #index' do - let(:simon) { Fabricate(:account, username: 'simon') } - let(:lewis) { Fabricate(:account, username: 'lewis') } - - before do - simon.follow!(lewis) - end - it 'returns http success' do - get :index, params: { account_id: lewis.id, limit: 1 } + get :index, params: { account_id: user.account.id, limit: 1 } expect(response).to have_http_status(200) end - - it 'returns JSON with correct data' do - get :index, params: { account_id: lewis.id, limit: 1 } - - json = body_as_json - - expect(json).to be_a Enumerable - expect(json.first[:username]).to eq 'simon' - end - - it 'does not return accounts blocking you' do - simon.block!(user.account) - get :index, params: { account_id: lewis.id, limit: 1 } - - json = body_as_json - - expect(json).to be_a Enumerable - expect(json.size).to eq 0 - end end end diff --git a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb b/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb index 911b381fe..7f7105ad3 100644 --- a/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb +++ b/spec/controllers/api/v1/accounts/following_accounts_controller_spec.rb @@ -7,40 +7,15 @@ describe Api::V1::Accounts::FollowingAccountsController do let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: 'read:accounts') } before do + Fabricate(:follow, account: user.account) allow(controller).to receive(:doorkeeper_token) { token } end describe 'GET #index' do - let(:simon) { Fabricate(:account, username: 'simon') } - let(:lewis) { Fabricate(:account, username: 'lewis') } - - before do - lewis.follow!(simon) - end - it 'returns http success' do - get :index, params: { account_id: lewis.id, limit: 1 } + get :index, params: { account_id: user.account.id, limit: 1 } expect(response).to have_http_status(200) end - - it 'returns JSON with correct data' do - get :index, params: { account_id: lewis.id, limit: 1 } - - json = body_as_json - - expect(json).to be_a Enumerable - expect(json.first[:username]).to eq 'simon' - end - - it 'does not return accounts blocking you' do - simon.block!(user.account) - get :index, params: { account_id: lewis.id, limit: 1 } - - json = body_as_json - - expect(json).to be_a Enumerable - expect(json.size).to eq 0 - end end end diff --git a/spec/controllers/settings/exports/following_accounts_controller_spec.rb b/spec/controllers/settings/exports/following_accounts_controller_spec.rb index 786769d24..78858e772 100644 --- a/spec/controllers/settings/exports/following_accounts_controller_spec.rb +++ b/spec/controllers/settings/exports/following_accounts_controller_spec.rb @@ -11,7 +11,7 @@ describe Settings::Exports::FollowingAccountsController do sign_in user, scope: :user get :index, format: :csv - expect(response.body).to eq "username@domain\n" + expect(response.body).to eq "Account address,Show boosts\nusername@domain,true\n" end end end diff --git a/spec/controllers/settings/exports/muted_accounts_controller_spec.rb b/spec/controllers/settings/exports/muted_accounts_controller_spec.rb index f42d7881e..642f0a9b8 100644 --- a/spec/controllers/settings/exports/muted_accounts_controller_spec.rb +++ b/spec/controllers/settings/exports/muted_accounts_controller_spec.rb @@ -11,7 +11,7 @@ describe Settings::Exports::MutedAccountsController do sign_in user, scope: :user get :index, format: :csv - expect(response.body).to eq "username@domain\n" + expect(response.body).to eq "Account address,Hide notifications\nusername@domain,true\n" end end end diff --git a/spec/controllers/settings/identity_proofs_controller_spec.rb b/spec/controllers/settings/identity_proofs_controller_spec.rb index 5c05eb83c..2a0f91088 100644 --- a/spec/controllers/settings/identity_proofs_controller_spec.rb +++ b/spec/controllers/settings/identity_proofs_controller_spec.rb @@ -28,11 +28,11 @@ describe Settings::IdentityProofsController do describe 'new proof creation' do context 'GET #new' do - context 'with all of the correct params' do - before do - allow_any_instance_of(ProofProvider::Keybase::Badge).to receive(:avatar_url) { full_pack_url('media/images/void.png') } - end + before do + allow_any_instance_of(ProofProvider::Keybase::Badge).to receive(:avatar_url) { full_pack_url('media/images/void.png') } + end + context 'with all of the correct params' do it 'renders the template' do get :new, params: new_proof_params expect(response).to render_template(:new) @@ -54,6 +54,15 @@ describe Settings::IdentityProofsController do expect(flash[:alert]).to eq I18n.t('identity_proofs.errors.wrong_user', proving: 'someone_else', current: user.account.username) end end + + context 'with params to prove the same username cased differently' do + let(:capitalized_username) { new_proof_params.merge(username: user.account.username.upcase) } + + it 'renders the new template' do + get :new, params: capitalized_username + expect(response).to render_template(:new) + end + end end context 'POST #create' do |