Merge branch 'new-proj-member-scb' into 'master'

Resolve CE/EE diffs in new proj member import

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

1 files changed, 20 insertions, 0 deletions

diff --git a/spec/helpers/projects_helper_spec.rb b/spec/helpers/projects_helper_spec.rb
index 554cb861563..83271aa24a3 100644
--- a/spec/helpers/projects_helper_spec.rb
+++ b/spec/helpers/projects_helper_spec.rb
@@ -799,4 +799,24 @@ describe ProjectsHelper do
       it { is_expected.to eq(result) }
     end
   end
+
+  describe '#can_import_members?' do
+    let(:project) { create(:project) }
+    let(:user) { create(:user) }
+    let(:owner) { project.owner }
+
+    before do
+      helper.instance_variable_set(:@project, project)
+    end
+
+    it 'returns false if user cannot admin_project_member' do
+      allow(helper).to receive(:current_user) { user }
+      expect(helper.can_import_members?).to eq false
+    end
+
+    it 'returns true if user can admin_project_member' do
+      allow(helper).to receive(:current_user) { owner }
+      expect(helper.can_import_members?).to eq true
+    end
+  end
 end