Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 29 deletions

diff --git a/spec/views/projects/empty.html.haml_spec.rb b/spec/views/projects/empty.html.haml_spec.rb
index dd7b1bd94a9..09fb9da598e 100644
--- a/spec/views/projects/empty.html.haml_spec.rb
+++ b/spec/views/projects/empty.html.haml_spec.rb
@@ -46,47 +46,32 @@ RSpec.describe 'projects/empty' do
     end
   end
 
-  describe 'invite_members_empty_project_version_a experiment' do
+  context 'with invite button on empty projects' do
     let(:can_import_members) { true }
 
     before do
       allow(view).to receive(:can_import_members?).and_return(can_import_members)
     end
 
-    shared_examples_for 'no invite member info' do
-      it 'does not show invite member info' do
-        render
+    it 'shows invite members info', :aggregate_failures do
+      render
 
-        expect(rendered).not_to have_content('Invite your team')
-      end
+      expect(rendered).to have_selector('[data-track-event=render]')
+      expect(rendered).to have_selector('[data-track-label=invite_members_empty_project]', count: 2)
+      expect(rendered).to have_content('Invite your team')
+      expect(rendered).to have_content('Add members to this project and start collaborating with your team.')
+      expect(rendered).to have_link('Invite members', href: project_project_members_path(project, sort: :access_level_desc))
+      expect(rendered).to have_selector('[data-track-event=click_button]')
     end
 
-    context 'when experiment is enabled' do
-      it 'shows invite members info', :aggregate_failures do
-        render
-
-        expect(rendered).to have_selector('[data-track-event=render]')
-        expect(rendered).to have_selector('[data-track-label=invite_members_empty_project]', count: 2)
-        expect(rendered).to have_content('Invite your team')
-        expect(rendered).to have_content('Add members to this project and start collaborating with your team.')
-        expect(rendered).to have_link('Invite members', href: project_project_members_path(project, sort: :access_level_desc))
-        expect(rendered).to have_selector('[data-track-event=click_button]')
-      end
+    context 'when user does not have permissions to invite members' do
+      let(:can_import_members) { false }
 
-      context 'when user does not have permissions to invite members' do
-        let(:can_import_members) { false }
-
-        it_behaves_like 'no invite member info'
-      end
-    end
+      it 'does not show invite member info' do
+        render
 
-    context 'when experiment is not enabled' do
-      before do
-        allow(view).to receive(:experiment_enabled?)
-                         .with(:invite_members_empty_project_version_a).and_return(false)
+        expect(rendered).not_to have_content('Invite your team')
       end
-
-      it_behaves_like 'no invite member info'
     end
   end
 end