From a09983ae35713f5a2bbb100981116d31ce99826e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Jul 2020 12:26:25 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-2-stable-ee --- spec/controllers/invites_controller_spec.rb | 37 +++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'spec/controllers/invites_controller_spec.rb') diff --git a/spec/controllers/invites_controller_spec.rb b/spec/controllers/invites_controller_spec.rb index f2821bb67e8..a9e4073780d 100644 --- a/spec/controllers/invites_controller_spec.rb +++ b/spec/controllers/invites_controller_spec.rb @@ -4,21 +4,44 @@ require 'spec_helper' RSpec.describe InvitesController do let(:token) { '123456' } - let(:user) { create(:user) } - let(:member) { create(:project_member, invite_token: token, invite_email: 'test@abc.com', user: user) } + let_it_be(:user) { create(:user) } + let(:member) { create(:project_member, :invited, invite_token: token, invite_email: user.email) } + let(:project_members) { member.source.users } before do controller.instance_variable_set(:@member, member) sign_in(user) end - describe 'GET #accept' do + describe 'GET #show' do + it 'accepts user if invite email matches signed in user' do + expect do + get :show, params: { id: token } + end.to change { project_members.include?(user) }.from(false).to(true) + + expect(response).to have_gitlab_http_status(:found) + expect(flash[:notice]).to include 'You have been granted' + end + + it 'forces re-confirmation if email does not match signed in user' do + member.invite_email = 'bogus@email.com' + + expect do + get :show, params: { id: token } + end.not_to change { project_members.include?(user) } + + expect(response).to have_gitlab_http_status(:ok) + expect(flash[:notice]).to be_nil + end + end + + describe 'POST #accept' do it 'accepts user' do - get :accept, params: { id: token } - member.reload + expect do + post :accept, params: { id: token } + end.to change { project_members.include?(user) }.from(false).to(true) expect(response).to have_gitlab_http_status(:found) - expect(member.user).to eq(user) expect(flash[:notice]).to include 'You have been granted' end end @@ -26,8 +49,8 @@ RSpec.describe InvitesController do describe 'GET #decline' do it 'declines user' do get :decline, params: { id: token } - expect {member.reload}.to raise_error ActiveRecord::RecordNotFound + expect { member.reload }.to raise_error ActiveRecord::RecordNotFound expect(response).to have_gitlab_http_status(:found) expect(flash[:notice]).to include 'You have declined the invitation to join' end -- cgit v1.2.3