Add latest changes from gitlab-org/gitlab@master

4 files changed, 33 insertions, 99 deletions

diff --git a/spec/lib/gitlab/experimentation/controller_concern_spec.rb b/spec/lib/gitlab/experimentation/controller_concern_spec.rb
index 8535d72a61f..1f7b7b90467 100644
--- a/spec/lib/gitlab/experimentation/controller_concern_spec.rb
+++ b/spec/lib/gitlab/experimentation/controller_concern_spec.rb
@@ -7,10 +7,6 @@ RSpec.describe Gitlab::Experimentation::ControllerConcern, type: :controller do
 
   before do
     stub_const('Gitlab::Experimentation::EXPERIMENTS', {
-        backwards_compatible_test_experiment: {
-          tracking_category: 'Team',
-          use_backwards_compatible_subject_index: true
-        },
         test_experiment: {
           tracking_category: 'Team',
           rollout_strategy: rollout_strategy
@@ -23,7 +19,6 @@ RSpec.describe Gitlab::Experimentation::ControllerConcern, type: :controller do
 
     allow(Gitlab).to receive(:dev_env_or_com?).and_return(is_gitlab_com)
 
-    Feature.enable_percentage_of_time(:backwards_compatible_test_experiment_experiment_percentage, enabled_percentage)
     Feature.enable_percentage_of_time(:test_experiment_experiment_percentage, enabled_percentage)
   end
 
@@ -124,24 +119,15 @@ RSpec.describe Gitlab::Experimentation::ControllerConcern, type: :controller do
     end
 
     context 'cookie is present' do
-      using RSpec::Parameterized::TableSyntax
-
       before do
         cookies.permanent.signed[:experimentation_subject_id] = 'abcd-1234'
         get :index
       end
 
-      where(:experiment_key, :index_value) do
-        :test_experiment | 'abcd-1234'
-        :backwards_compatible_test_experiment | 'abcd1234'
-      end
-
-      with_them do
-        it 'calls Gitlab::Experimentation.in_experiment_group?? with the name of the experiment and the calculated experimentation_subject_index based on the uuid' do
-          expect(Gitlab::Experimentation).to receive(:in_experiment_group?).with(experiment_key, subject: index_value)
+      it 'calls Gitlab::Experimentation.in_experiment_group? with the name of the experiment and the calculated experimentation_subject_index based on the uuid' do
+        expect(Gitlab::Experimentation).to receive(:in_experiment_group?).with(:test_experiment, subject: 'abcd-1234')
 
-          check_experiment(experiment_key)
-        end
+        check_experiment(:test_experiment)
       end
 
       context 'when subject is given' do
diff --git a/spec/lib/gitlab/experimentation/experiment_spec.rb b/spec/lib/gitlab/experimentation/experiment_spec.rb
index 94dbf1d7e4b..d52ab3a8983 100644
--- a/spec/lib/gitlab/experimentation/experiment_spec.rb
+++ b/spec/lib/gitlab/experimentation/experiment_spec.rb
@@ -9,7 +9,6 @@ RSpec.describe Gitlab::Experimentation::Experiment do
   let(:params) do
     {
       tracking_category: 'Category1',
-      use_backwards_compatible_subject_index: true,
       rollout_strategy: nil
     }
   end
diff --git a/spec/lib/gitlab/experimentation_spec.rb b/spec/lib/gitlab/experimentation_spec.rb
index c486538a260..c482874b725 100644
--- a/spec/lib/gitlab/experimentation_spec.rb
+++ b/spec/lib/gitlab/experimentation_spec.rb
@@ -7,10 +7,6 @@ RSpec.describe Gitlab::Experimentation do
 
   before do
     stub_const('Gitlab::Experimentation::EXPERIMENTS', {
-      backwards_compatible_test_experiment: {
-        tracking_category: 'Team',
-        use_backwards_compatible_subject_index: true
-      },
       test_experiment: {
         tracking_category: 'Team'
       },
@@ -22,7 +18,6 @@ RSpec.describe Gitlab::Experimentation do
 
     skip_feature_flags_yaml_validation
     skip_default_enabled_yaml_check
-    Feature.enable_percentage_of_time(:backwards_compatible_test_experiment_experiment_percentage, enabled_percentage)
     Feature.enable_percentage_of_time(:test_experiment_experiment_percentage, enabled_percentage)
     allow(Gitlab).to receive(:com?).and_return(true)
   end
@@ -65,97 +60,47 @@ RSpec.describe Gitlab::Experimentation do
   end
 
   describe '.in_experiment_group?' do
-    context 'with new index calculation' do
-      let(:enabled_percentage) { 50 }
-      let(:experiment_subject) { 'z' } # Zlib.crc32('test_experimentz') % 100 = 33
-
-      subject { described_class.in_experiment_group?(:test_experiment, subject: experiment_subject) }
-
-      context 'when experiment is active' do
-        context 'when subject is part of the experiment' do
-          it { is_expected.to eq(true) }
-        end
+    let(:enabled_percentage) { 50 }
+    let(:experiment_subject) { 'z' } # Zlib.crc32('test_experimentz') % 100 = 33
 
-        context 'when subject is not part of the experiment' do
-          let(:experiment_subject) { 'a' } # Zlib.crc32('test_experimenta') % 100 = 61
+    subject { described_class.in_experiment_group?(:test_experiment, subject: experiment_subject) }
 
-          it { is_expected.to eq(false) }
-        end
+    context 'when experiment is active' do
+      context 'when subject is part of the experiment' do
+        it { is_expected.to eq(true) }
+      end
 
-        context 'when subject has a global_id' do
-          let(:experiment_subject) { double(:subject, to_global_id: 'z') }
+      context 'when subject is not part of the experiment' do
+        let(:experiment_subject) { 'a' } # Zlib.crc32('test_experimenta') % 100 = 61
 
-          it { is_expected.to eq(true) }
-        end
+        it { is_expected.to eq(false) }
+      end
 
-        context 'when subject is nil' do
-          let(:experiment_subject) { nil }
+      context 'when subject has a global_id' do
+        let(:experiment_subject) { double(:subject, to_global_id: 'z') }
 
-          it { is_expected.to eq(false) }
-        end
+        it { is_expected.to eq(true) }
+      end
 
-        context 'when subject is an empty string' do
-          let(:experiment_subject) { '' }
+      context 'when subject is nil' do
+        let(:experiment_subject) { nil }
 
-          it { is_expected.to eq(false) }
-        end
+        it { is_expected.to eq(false) }
       end
 
-      context 'when experiment is not active' do
-        before do
-          allow(described_class).to receive(:active?).and_return(false)
-        end
+      context 'when subject is an empty string' do
+        let(:experiment_subject) { '' }
 
         it { is_expected.to eq(false) }
       end
     end
 
-    context 'with backwards compatible index calculation' do
-      let(:experiment_subject) { 'abcd' } # Digest::SHA1.hexdigest('abcd').hex % 100 = 7
-
-      subject { described_class.in_experiment_group?(:backwards_compatible_test_experiment, subject: experiment_subject) }
-
-      context 'when experiment is active' do
-        before do
-          allow(described_class).to receive(:active?).and_return(true)
-        end
-
-        context 'when subject is part of the experiment' do
-          it { is_expected.to eq(true) }
-        end
-
-        context 'when subject is not part of the experiment' do
-          let(:experiment_subject) { 'abc' } # Digest::SHA1.hexdigest('abc').hex % 100 = 17
-
-          it { is_expected.to eq(false) }
-        end
-
-        context 'when subject has a global_id' do
-          let(:experiment_subject) { double(:subject, to_global_id: 'abcd') }
-
-          it { is_expected.to eq(true) }
-        end
-
-        context 'when subject is nil' do
-          let(:experiment_subject) { nil }
-
-          it { is_expected.to eq(false) }
-        end
-
-        context 'when subject is an empty string' do
-          let(:experiment_subject) { '' }
-
-          it { is_expected.to eq(false) }
-        end
+    context 'when experiment is not active' do
+      before do
+        allow(described_class).to receive(:active?).and_return(false)
       end
 
-      context 'when experiment is not active' do
-        before do
-          allow(described_class).to receive(:active?).and_return(false)
-        end
-
-        it { is_expected.to eq(false) }
-      end
+      it { is_expected.to eq(false) }
     end
   end
 
diff --git a/spec/requests/api/generic_packages_spec.rb b/spec/requests/api/generic_packages_spec.rb
index 4091253fb54..d615247aeb0 100644
--- a/spec/requests/api/generic_packages_spec.rb
+++ b/spec/requests/api/generic_packages_spec.rb
@@ -388,9 +388,11 @@ RSpec.describe API::GenericPackages do
       end
 
       context 'event tracking' do
+        let(:snowplow_gitlab_standard_context) { { project: project, namespace: project.namespace, user: user } }
+
         subject { upload_file(params, workhorse_headers.merge(personal_access_token_header)) }
 
-        it_behaves_like 'a gitlab tracking event', described_class.name, 'push_package'
+        it_behaves_like 'a package tracking event', described_class.name, 'push_package'
       end
 
       it 'rejects request without a file from workhorse' do
@@ -542,13 +544,15 @@ RSpec.describe API::GenericPackages do
     end
 
     context 'event tracking' do
+      let(:snowplow_gitlab_standard_context) { { project: project, namespace: project.namespace, user: user } }
+
       before do
         project.add_developer(user)
       end
 
       subject { download_file(personal_access_token_header) }
 
-      it_behaves_like 'a gitlab tracking event', described_class.name, 'pull_package'
+      it_behaves_like 'a package tracking event', described_class.name, 'pull_package'
     end
 
     it 'rejects a malicious file name request' do