Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/lib/gitlab/experimentation_spec.rb b/spec/lib/gitlab/experimentation_spec.rb
index 725c23e913c..cceeb15b05d 100644
--- a/spec/lib/gitlab/experimentation_spec.rb
+++ b/spec/lib/gitlab/experimentation_spec.rb
@@ -74,7 +74,8 @@ describe Gitlab::Experimentation do
 
       describe 'URL parameter to force enable experiment' do
         context 'is not present' do
-          it 'returns false' do
+          # Disabled until https://gitlab.com/gitlab-org/gitlab/issues/34942 is solved properly
+          xit 'returns false' do
             get :index, params: { force_experiment: :test_experiment2 }
 
             expect(controller.experiment_enabled?(:test_experiment)).to be_falsey
@@ -82,7 +83,8 @@ describe Gitlab::Experimentation do
         end
 
         context 'is present' do
-          it 'returns true' do
+          # Disabled until https://gitlab.com/gitlab-org/gitlab/issues/34942 is solved properly
+          xit 'returns true' do
             get :index, params: { force_experiment: :test_experiment }
 
             expect(controller.experiment_enabled?(:test_experiment)).to be_truthy