Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 15 deletions

diff --git a/spec/lib/gitlab/experimentation_spec.rb b/spec/lib/gitlab/experimentation_spec.rb
index cceeb15b05d..9be6ace3be5 100644
--- a/spec/lib/gitlab/experimentation_spec.rb
+++ b/spec/lib/gitlab/experimentation_spec.rb
@@ -73,22 +73,10 @@ describe Gitlab::Experimentation do
       end
 
       describe 'URL parameter to force enable experiment' do
-        context 'is not present' 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 }
+        it 'returns true' do
+          get :index, params: { force_experiment: :test_experiment }
 
-            expect(controller.experiment_enabled?(:test_experiment)).to be_falsey
-          end
-        end
-
-        context 'is present' 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
-          end
+          expect(controller.experiment_enabled?(:test_experiment)).to be_truthy
         end
       end
     end