1 files changed, 31 insertions, 17 deletions
diff --git a/spec/features/invites_spec.rb b/spec/features/invites_spec.rb
index 3954de56eea..8ccaf82536a 100644
--- a/spec/features/invites_spec.rb
+++ b/spec/features/invites_spec.rb
@@ -23,7 +23,8 @@ RSpec.describe 'Group or Project invitations', :aggregate_failures do
   end
 
   def fill_in_sign_up_form(new_user)
-    fill_in 'new_user_name', with: new_user.name
+    fill_in 'new_user_first_name', with: new_user.first_name
+    fill_in 'new_user_last_name', with: new_user.last_name
     fill_in 'new_user_username', with: new_user.username
     fill_in 'new_user_email', with: new_user.email
     fill_in 'new_user_password', with: new_user.password
@@ -81,10 +82,10 @@ RSpec.describe 'Group or Project invitations', :aggregate_failures do
     end
   end
 
-  context 'when inviting a user using their email address' do
+  context 'when inviting a user' do
     let(:new_user) { build_stubbed(:user) }
     let(:invite_email) { new_user.email }
-    let(:group_invite) { create(:group_member, :invited, group: group, invite_email: invite_email) }
+    let(:group_invite) { create(:group_member, :invited, group: group, invite_email: invite_email, created_by: owner) }
     let!(:project_invite) { create(:project_member, :invited, project: project, invite_email: invite_email) }
 
     context 'when user has not signed in yet' do
@@ -210,30 +211,43 @@ RSpec.describe 'Group or Project invitations', :aggregate_failures do
     context 'when declining the invitation' do
       let(:send_email_confirmation) { true }
 
-      context 'when signed in' do
-        before do
-          sign_in(user)
-          visit invite_path(group_invite.raw_invite_token)
+      context 'as an existing user' do
+        let(:group_invite) { create(:group_member, user: user, group: group, created_by: owner) }
+
+        context 'when signed in' do
+          before do
+            sign_in(user)
+            visit decline_invite_path(group_invite.raw_invite_token)
+          end
+
+          it 'declines application and redirects to dashboard' do
+            expect(current_path).to eq(dashboard_projects_path)
+            expect(page).to have_content('You have declined the invitation to join group Owned.')
+            expect { group_invite.reload }.to raise_error ActiveRecord::RecordNotFound
+          end
         end
 
-        it 'declines application and redirects to dashboard' do
-          page.click_link 'Decline'
+        context 'when signed out' do
+          before do
+            visit decline_invite_path(group_invite.raw_invite_token)
+          end
 
-          expect(current_path).to eq(dashboard_projects_path)
-          expect(page).to have_content('You have declined the invitation to join group Owned.')
-          expect { group_invite.reload }.to raise_error ActiveRecord::RecordNotFound
+          it 'declines application and redirects to sign in page' do
+            expect(current_path).to eq(new_user_session_path)
+            expect(page).to have_content('You have declined the invitation to join group Owned.')
+            expect { group_invite.reload }.to raise_error ActiveRecord::RecordNotFound
+          end
         end
       end
 
-      context 'when signed out' do
+      context 'as a non-existing user' do
         before do
           visit decline_invite_path(group_invite.raw_invite_token)
         end
 
-        it 'declines application and redirects to sign in page' do
-          expect(current_path).to eq(new_user_session_path)
-
-          expect(page).to have_content('You have declined the invitation to join group Owned.')
+        it 'declines application and shows a decline page' do
+          expect(current_path).to eq(decline_invite_path(group_invite.raw_invite_token))
+          expect(page).to have_content('You successfully declined the invitation')
           expect { group_invite.reload }.to raise_error ActiveRecord::RecordNotFound
         end
       end