Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 51 deletions

diff --git a/spec/helpers/invite_members_helper_spec.rb b/spec/helpers/invite_members_helper_spec.rb
index e08ce09702f..4f44acecbd9 100644
--- a/spec/helpers/invite_members_helper_spec.rb
+++ b/spec/helpers/invite_members_helper_spec.rb
@@ -126,42 +126,4 @@ RSpec.describe InviteMembersHelper do
       end
     end
   end
-
-  context 'with group' do
-    let_it_be(:group) { create(:group) }
-
-    describe "#invite_group_members?" do
-      context 'when the user is an owner' do
-        before do
-          group.add_owner(owner)
-          allow(helper).to receive(:current_user) { owner }
-        end
-
-        it 'returns false' do
-          allow(helper).to receive(:experiment_enabled?).with(:invite_members_empty_group_version_a) { false }
-
-          expect(helper.invite_group_members?(group)).to eq false
-        end
-
-        it 'returns true' do
-          allow(helper).to receive(:experiment_enabled?).with(:invite_members_empty_group_version_a) { true }
-
-          expect(helper.invite_group_members?(group)).to eq true
-        end
-      end
-
-      context 'when the user is a developer' do
-        before do
-          group.add_developer(developer)
-          allow(helper).to receive(:current_user) { developer }
-        end
-
-        it 'returns false' do
-          allow(helper).to receive(:experiment_enabled?).with(:invite_members_empty_group_version_a) { true }
-
-          expect(helper.invite_group_members?(group)).to eq false
-        end
-      end
-    end
-  end
 end
diff --git a/spec/lib/gitlab/experimentation_spec.rb b/spec/lib/gitlab/experimentation_spec.rb
index bd7aa28746c..c486538a260 100644
--- a/spec/lib/gitlab/experimentation_spec.rb
+++ b/spec/lib/gitlab/experimentation_spec.rb
@@ -2,19 +2,6 @@
 
 require 'spec_helper'
 
-# As each associated, backwards-compatible experiment gets cleaned up and removed from the EXPERIMENTS list, its key will also get removed from this list. Once the list here is empty, we can remove the backwards compatibility code altogether.
-# Originally created as part of https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45733 for https://gitlab.com/gitlab-org/gitlab/-/issues/270858.
-RSpec.describe Gitlab::Experimentation::EXPERIMENTS do
-  it 'temporarily ensures we know what experiments exist for backwards compatibility' do
-    expected_experiment_keys = [:invite_members_empty_group_version_a]
-
-    backwards_compatible_experiment_keys = described_class.filter { |_, v| v[:use_backwards_compatible_subject_index] }.keys
-
-    expect(backwards_compatible_experiment_keys).not_to be_empty, "Oh, hey! Let's clean up that :use_backwards_compatible_subject_index stuff now :D"
-    expect(backwards_compatible_experiment_keys).to match(expected_experiment_keys)
-  end
-end
-
 RSpec.describe Gitlab::Experimentation do
   using RSpec::Parameterized::TableSyntax