Merge branch 'member-access-granted-leave-email-fe' into 'master'

CE Add leave link to access_granted email

See merge request gitlab-org/gitlab-ce!27892

4 files changed, 48 insertions, 4 deletions

diff --git a/spec/features/groups/members/leave_group_spec.rb b/spec/features/groups/members/leave_group_spec.rb
index 7a91c64d7db..439803f9255 100644
--- a/spec/features/groups/members/leave_group_spec.rb
+++ b/spec/features/groups/members/leave_group_spec.rb
@@ -21,6 +21,20 @@ describe 'Groups > Members > Leave group' do
     expect(group.users).not_to include(user)
   end
 
+  it 'guest leaves the group by url param', :js do
+    group.add_guest(user)
+    group.add_owner(other_user)
+
+    visit group_path(group, leave: 1)
+
+    page.accept_confirm
+
+    expect(find('.flash-notice')).to have_content "You left the \"#{group.full_name}\" group"
+    expect(page).to have_content left_group_message(group)
+    expect(current_path).to eq(dashboard_groups_path)
+    expect(group.users).not_to include(user)
+  end
+
   it 'guest leaves the group as last member' do
     group.add_guest(user)
 
@@ -32,7 +46,7 @@ describe 'Groups > Members > Leave group' do
     expect(group.users).not_to include(user)
   end
 
-  it 'owner leaves the group if they is not the last owner' do
+  it 'owner leaves the group if they are not the last owner' do
     group.add_owner(user)
     group.add_owner(other_user)
 
@@ -44,7 +58,7 @@ describe 'Groups > Members > Leave group' do
     expect(group.users).not_to include(user)
   end
 
-  it 'owner can not leave the group if they is a last owner' do
+  it 'owner can not leave the group if they are the last owner' do
     group.add_owner(user)
 
     visit group_path(group)
@@ -56,6 +70,14 @@ describe 'Groups > Members > Leave group' do
     expect(find(:css, '.project-members-page li', text: user.name)).not_to have_selector(:css, 'a.btn-remove')
   end
 
+  it 'owner can not leave the group by url param if they are the last owner', :js do
+    group.add_owner(user)
+
+    visit group_path(group, leave: 1)
+
+    expect(find('.flash-alert')).to have_content 'You do not have permission to leave this group'
+  end
+
   def left_group_message(group)
     "You left the \"#{group.name}\""
   end
diff --git a/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb b/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb
index 0ab29660189..a645b917568 100644
--- a/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb
+++ b/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb
@@ -8,10 +8,17 @@ describe 'Projects > Members > Group member cannot leave group project' do
   before do
     group.add_developer(user)
     sign_in(user)
-    visit project_path(project)
   end
 
   it 'user does not see a "Leave project" link' do
+    visit project_path(project)
+
     expect(page).not_to have_content 'Leave project'
   end
+
+  it 'renders a flash message if attempting to leave by url', :js do
+    visit project_path(project, leave: 1)
+
+    expect(find('.flash-alert')).to have_content 'You do not have permission to leave this project'
+  end
 end
diff --git a/spec/features/projects/members/member_leaves_project_spec.rb b/spec/features/projects/members/member_leaves_project_spec.rb
index 94b29de4686..bd2ef9c07c4 100644
--- a/spec/features/projects/members/member_leaves_project_spec.rb
+++ b/spec/features/projects/members/member_leaves_project_spec.rb
@@ -7,13 +7,24 @@ describe 'Projects > Members > Member leaves project' do
   before do
     project.add_developer(user)
     sign_in(user)
-    visit project_path(project)
   end
 
   it 'user leaves project' do
+    visit project_path(project)
+
     click_link 'Leave project'
 
     expect(current_path).to eq(dashboard_projects_path)
     expect(project.users.exists?(user.id)).to be_falsey
   end
+
+  it 'user leaves project by url param', :js do
+    visit project_path(project, leave: 1)
+
+    page.accept_confirm
+
+    expect(find('.flash-notice')).to have_content "You left the \"#{project.full_name}\" project"
+    expect(current_path).to eq(dashboard_projects_path)
+    expect(project.users.exists?(user.id)).to be_falsey
+  end
 end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index fee1d701e3a..8f348b1b053 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -701,6 +701,8 @@ describe Notify do
         is_expected.to have_body_text project.full_name
         is_expected.to have_body_text project.web_url
         is_expected.to have_body_text project_member.human_access
+        is_expected.to have_body_text 'leave the project'
+        is_expected.to have_body_text project_url(project, leave: 1)
       end
     end
 
@@ -1144,6 +1146,8 @@ describe Notify do
         is_expected.to have_body_text group.name
         is_expected.to have_body_text group.web_url
         is_expected.to have_body_text group_member.human_access
+        is_expected.to have_body_text 'leave the group'
+        is_expected.to have_body_text group_url(group, leave: 1)
       end
     end