From caac3104c4e77a40ad8ec3d1275f7b47c0fc8f68 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sat, 18 May 2019 08:06:20 -0700 Subject: Make it easier to find invited group members We had a number of team members struggle to find invited members of a group. Searching for the e-mail address did not work because search only works with members with user accounts. This commit changes two things: 1. Breaks out the invited members into a separate table. 2. Adds search capability for the invited members. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61948 --- spec/models/member_spec.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'spec/models/member_spec.rb') diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb index 782a84f922b..99b268b07e8 100644 --- a/spec/models/member_spec.rb +++ b/spec/models/member_spec.rb @@ -172,6 +172,17 @@ describe Member do it { expect(described_class.non_request).to include @accepted_request_member } end + describe '.search_invited' do + it 'returns only the matching e-mail' do + create(:group_member, :invited) + + invited = described_class.search_invited(@invited_member.invite_email) + + expect(invited.count).to eq(1) + expect(invited.first).to eq(@invited_member) + end + end + describe '.developers' do subject { described_class.developers.to_a } -- cgit v1.2.1 From d39871d080ffbba35f4e58ed6c13c684e01be773 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Fri, 9 Aug 2019 00:33:42 -0700 Subject: Rename search_invited to search_invite_email --- spec/models/member_spec.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'spec/models/member_spec.rb') diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb index 99b268b07e8..25c39a1062c 100644 --- a/spec/models/member_spec.rb +++ b/spec/models/member_spec.rb @@ -172,14 +172,16 @@ describe Member do it { expect(described_class.non_request).to include @accepted_request_member } end - describe '.search_invited' do + describe '.search_invite_email' do it 'returns only the matching e-mail' do create(:group_member, :invited) - invited = described_class.search_invited(@invited_member.invite_email) + invited = described_class.search_invite_email(@invited_member.invite_email) expect(invited.count).to eq(1) expect(invited.first).to eq(@invited_member) + + expect(described_class.search_invite_email('bad-email@example.com').count).to eq(0) end end -- cgit v1.2.1 From 86b1e44a095edf2a639bb7f5e141ea7ddde6246e Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Sun, 11 Aug 2019 22:56:11 -0700 Subject: Improve spec description in member_spec.rb --- spec/models/member_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'spec/models/member_spec.rb') diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb index 25c39a1062c..2cb4f222ea4 100644 --- a/spec/models/member_spec.rb +++ b/spec/models/member_spec.rb @@ -173,7 +173,7 @@ describe Member do end describe '.search_invite_email' do - it 'returns only the matching e-mail' do + it 'returns only members the matching e-mail' do create(:group_member, :invited) invited = described_class.search_invite_email(@invited_member.invite_email) -- cgit v1.2.1