Add latest changes from gitlab-org/gitlab@master

2 files changed, 29 insertions, 19 deletions

diff --git a/spec/experiments/empty_repo_upload_experiment_spec.rb b/spec/experiments/empty_repo_upload_experiment_spec.rb
index 0ab42375a5f..10cbedbe8ba 100644
--- a/spec/experiments/empty_repo_upload_experiment_spec.rb
+++ b/spec/experiments/empty_repo_upload_experiment_spec.rb
@@ -8,36 +8,42 @@ RSpec.describe EmptyRepoUploadExperiment, :experiment do
   let(:project) { create(:project, :repository) }
 
   describe '#track_initial_write' do
-    it "tracks an event for the first commit on a project" do
-      expect(subject).to receive(:commit_count_for).with(project, max_count: described_class::INITIAL_COMMIT_COUNT, experiment: 'empty_repo_upload').and_return(1)
+    context 'when experiment is turned on' do
+      before do
+        stub_experiments(empty_repo_upload: :control)
+      end
 
-      expect(subject).to receive(:track).with(:initial_write, project: project).and_call_original
+      it "tracks an event for the first commit on a project" do
+        expect(subject).to receive(:commit_count_for).with(project, max_count: described_class::INITIAL_COMMIT_COUNT, experiment: 'empty_repo_upload').and_return(1)
 
-      subject.track_initial_write
-    end
+        expect(subject).to receive(:track).with(:initial_write, project: project).and_call_original
 
-    it "doesn't track an event for projects with a commit count more than 1" do
-      expect(subject).to receive(:commit_count_for).and_return(2)
+        subject.track_initial_write
+      end
 
-      expect(subject).not_to receive(:track)
+      it "doesn't track an event for projects with a commit count more than 1" do
+        expect(subject).to receive(:commit_count_for).and_return(2)
 
-      subject.track_initial_write
-    end
+        expect(subject).not_to receive(:track)
 
-    it "doesn't track when we generally shouldn't" do
-      allow(subject).to receive(:should_track?).and_return(false)
+        subject.track_initial_write
+      end
 
-      expect(subject).not_to receive(:track)
+      it "doesn't track if the project is older" do
+        expect(project).to receive(:created_at).and_return(described_class::TRACKING_START_DATE - 1.minute)
 
-      subject.track_initial_write
-    end
+        expect(subject).not_to receive(:track)
 
-    it "doesn't track if the project is older" do
-      expect(project).to receive(:created_at).and_return(described_class::TRACKING_START_DATE - 1.minute)
+        subject.track_initial_write
+      end
+    end
 
-      expect(subject).not_to receive(:track)
+    context 'when experiment is turned off' do
+      it "doesn't track when we generally shouldn't" do
+        expect(subject).not_to receive(:track)
 
-      subject.track_initial_write
+        subject.track_initial_write
+      end
     end
   end
 end
diff --git a/spec/experiments/new_project_readme_experiment_spec.rb b/spec/experiments/new_project_readme_experiment_spec.rb
index ac82c1d71eb..e5ecc4662f6 100644
--- a/spec/experiments/new_project_readme_experiment_spec.rb
+++ b/spec/experiments/new_project_readme_experiment_spec.rb
@@ -29,6 +29,10 @@ RSpec.describe NewProjectReadmeExperiment, :experiment do
   context "when tracking initial writes" do
     let!(:project) { create(:project, :repository) }
 
+    before do
+      stub_experiments(new_project_readme: :control)
+    end
+
     it "tracks an event for the first commit on a project with a repository" do
       expect(subject).to receive(:commit_count_for).with(project, default_count: described_class::INITIAL_WRITE_LIMIT, max_count: described_class::INITIAL_WRITE_LIMIT, experiment: 'new_project_readme').and_return(1)
       expect(subject).to receive(:track).with(:write, property: project.created_at.to_s, value: 1).and_call_original