Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 33 deletions

diff --git a/spec/views/projects/project_members/index.html.haml_spec.rb b/spec/views/projects/project_members/index.html.haml_spec.rb
index b9b0d57bcb5..7186a5f1766 100644
--- a/spec/views/projects/project_members/index.html.haml_spec.rb
+++ b/spec/views/projects/project_members/index.html.haml_spec.rb
@@ -11,7 +11,6 @@ RSpec.describe 'projects/project_members/index', :aggregate_failures do
     allow(view).to receive(:project_members_app_data_json).and_return({})
     allow(view).to receive(:current_user).and_return(user)
     assign(:project, project)
-    assign(:project_member, build(:project_member, project: source))
   end
 
   context 'when user can invite members for the project' do
@@ -44,38 +43,6 @@ RSpec.describe 'projects/project_members/index', :aggregate_failures do
         end
       end
     end
-
-    context 'when modal is not enabled' do
-      before do
-        stub_feature_flags(invite_members_group_modal: false)
-      end
-
-      it 'renders as expected' do
-        render
-
-        expect(rendered).to have_content('Project members')
-        expect(rendered).to have_content('You can invite a new member')
-        expect(rendered).not_to have_selector('.js-invite-group-trigger')
-        expect(rendered).not_to have_selector('.js-invite-members-trigger')
-        expect(rendered).not_to have_content('Members can be added by project')
-        expect(response).not_to render_template(partial: 'projects/_invite_members_modal')
-        expect(response).to render_template(partial: 'shared/members/_invite_member')
-      end
-
-      context 'when project can not be shared' do
-        before do
-          project.namespace.share_with_group_lock = true
-        end
-
-        it 'renders as expected' do
-          render
-
-          expect(rendered).to have_content('Project members')
-          expect(rendered).to have_content('You can invite a new member')
-          expect(response).not_to render_template(partial: 'projects/_invite_members_modal')
-        end
-      end
-    end
   end
 
   context 'when user can not invite members or group for the project' do