Add latest changes from gitlab-org/gitlab@master

4 files changed, 140 insertions, 113 deletions

diff --git a/spec/lib/gitlab/danger/roulette_spec.rb b/spec/lib/gitlab/danger/roulette_spec.rb
index b471e17e2e7..a1a8fdecb85 100644
--- a/spec/lib/gitlab/danger/roulette_spec.rb
+++ b/spec/lib/gitlab/danger/roulette_spec.rb
@@ -67,14 +67,18 @@ RSpec.describe Gitlab::Danger::Roulette do
     )
   end
 
-  let(:teammate_json) do
+  let(:teammates) do
     [
       backend_maintainer.to_h,
       frontend_maintainer.to_h,
       frontend_reviewer.to_h,
       software_engineer_in_test.to_h,
       engineering_productivity_reviewer.to_h
-    ].to_json
+    ]
+  end
+
+  let(:teammate_json) do
+    teammates.to_json
   end
 
   subject(:roulette) { Object.new.extend(described_class) }
@@ -210,6 +214,69 @@ RSpec.describe Gitlab::Danger::Roulette do
         end
       end
     end
+
+    describe 'reviewer suggestion probability' do
+      let(:reviewer) { teammate_with_capability('reviewer', 'reviewer backend') }
+      let(:hungry_reviewer) { teammate_with_capability('hungry_reviewer', 'reviewer backend', hungry: true) }
+      let(:traintainer) { teammate_with_capability('traintainer', 'trainee_maintainer backend') }
+      let(:hungry_traintainer) { teammate_with_capability('hungry_traintainer', 'trainee_maintainer backend', hungry: true) }
+      let(:teammates) do
+        [
+          reviewer.to_h,
+          hungry_reviewer.to_h,
+          traintainer.to_h,
+          hungry_traintainer.to_h
+        ]
+      end
+
+      let(:categories) { [:backend] }
+
+      # This test is testing probability with inherent randomness.
+      # The variance is inversely related to sample size
+      # Given large enough sample size, the variance would be smaller,
+      # but the test would take longer.
+      # Given smaller sample size, the variance would be larger,
+      # but the test would take less time.
+      let!(:sample_size) { 500 }
+      let!(:variance) { 0.1 }
+
+      before do
+        # This test needs actual randomness to simulate probabilities
+        allow(subject).to receive(:new_random).and_return(Random.new)
+        WebMock
+          .stub_request(:get, described_class::ROULETTE_DATA_URL)
+          .to_return(body: teammate_json)
+      end
+
+      it 'has 1:2:3:4 probability of picking reviewer, hungry_reviewer, traintainer, hungry_traintainer' do
+        picks = Array.new(sample_size).map do
+          spins = subject.spin(project, categories, timezone_experiment: timezone_experiment)
+          spins.first.reviewer.name
+        end
+
+        expect(probability(picks, 'reviewer')).to be_within(variance).of(0.1)
+        expect(probability(picks, 'hungry_reviewer')).to be_within(variance).of(0.2)
+        expect(probability(picks, 'traintainer')).to be_within(variance).of(0.3)
+        expect(probability(picks, 'hungry_traintainer')).to be_within(variance).of(0.4)
+      end
+
+      def probability(picks, role)
+        picks.count(role).to_f / picks.length
+      end
+
+      def teammate_with_capability(name, capability, hungry: false)
+        Gitlab::Danger::Teammate.new(
+          {
+            'name' => name,
+            'projects' => {
+              'gitlab' => capability
+            },
+            'available' => true,
+            'hungry' => hungry
+          }
+        )
+      end
+    end
   end
 
   RSpec::Matchers.define :match_teammates do |expected|
diff --git a/spec/lib/gitlab/import_export/group/relation_factory_spec.rb b/spec/lib/gitlab/import_export/group/relation_factory_spec.rb
index eb9a3fa9bd8..6b2f80cc80a 100644
--- a/spec/lib/gitlab/import_export/group/relation_factory_spec.rb
+++ b/spec/lib/gitlab/import_export/group/relation_factory_spec.rb
@@ -5,16 +5,19 @@ require 'spec_helper'
 RSpec.describe Gitlab::ImportExport::Group::RelationFactory do
   let(:group) { create(:group) }
   let(:members_mapper) { double('members_mapper').as_null_object }
-  let(:user) { create(:admin) }
+  let(:admin) { create(:admin) }
+  let(:importer_user) { admin }
   let(:excluded_keys) { [] }
   let(:created_object) do
-    described_class.create(relation_sym:   relation_sym,
-                           relation_hash:  relation_hash,
-                           members_mapper: members_mapper,
-                           object_builder: Gitlab::ImportExport::Group::ObjectBuilder,
-                           user:           user,
-                           importable:     group,
-                           excluded_keys:  excluded_keys)
+    described_class.create(
+      relation_sym: relation_sym,
+      relation_hash: relation_hash,
+      members_mapper: members_mapper,
+      object_builder: Gitlab::ImportExport::Group::ObjectBuilder,
+      user: importer_user,
+      importable: group,
+      excluded_keys: excluded_keys
+    )
   end
 
   context 'label object' do
@@ -24,18 +27,18 @@ RSpec.describe Gitlab::ImportExport::Group::RelationFactory do
 
     let(:relation_hash) do
       {
-        'id'          => 123456,
-        'title'       => 'Bruffefunc',
-        'color'       => '#1d2da4',
-        'project_id'  => nil,
-        'created_at'  => '2019-11-20T17:02:20.546Z',
-        'updated_at'  => '2019-11-20T17:02:20.546Z',
-        'template'    => false,
+        'id' => 123456,
+        'title' => 'Bruffefunc',
+        'color' => '#1d2da4',
+        'project_id' => nil,
+        'created_at' => '2019-11-20T17:02:20.546Z',
+        'updated_at' => '2019-11-20T17:02:20.546Z',
+        'template' => false,
         'description' => 'Description',
-        'group_id'    => original_group_id,
-        'type'        => 'GroupLabel',
-        'priorities'  => [],
-        'textColor'   => '#FFFFFF'
+        'group_id' => original_group_id,
+        'type' => 'GroupLabel',
+        'priorities' => [],
+        'textColor' => '#FFFFFF'
       }
     end
 
@@ -60,58 +63,28 @@ RSpec.describe Gitlab::ImportExport::Group::RelationFactory do
     end
   end
 
-  context 'Notes user references' do
-    let(:relation_sym) { :notes }
-    let(:new_user) { create(:user) }
-    let(:exported_member) do
-      {
-        'id'                 => 111,
-        'access_level'       => 30,
-        'source_id'          => 1,
-        'source_type'        => 'Namespace',
-        'user_id'            => 3,
-        'notification_level' => 3,
-        'created_at'         => '2016-11-18T09:29:42.634Z',
-        'updated_at'         => '2016-11-18T09:29:42.634Z',
-        'user'               => {
-          'id'       => 999,
-          'email'    => new_user.email,
-          'username' => new_user.username
-        }
-      }
-    end
-
+  it_behaves_like 'Notes user references' do
+    let(:importable) { group }
     let(:relation_hash) do
       {
-        'id'            => 4947,
-        'note'          => 'note',
+        'id' => 4947,
+        'note' => 'note',
         'noteable_type' => 'Epic',
-        'author_id'     => 999,
-        'created_at'    => '2016-11-18T09:29:42.634Z',
-        'updated_at'    => '2016-11-18T09:29:42.634Z',
-        'project_id'    => 1,
-        'attachment'    => {
+        'author_id' => 999,
+        'created_at' => '2016-11-18T09:29:42.634Z',
+        'updated_at' => '2016-11-18T09:29:42.634Z',
+        'project_id' => 1,
+        'attachment' => {
           'url' => nil
         },
-        'noteable_id'   => 377,
-        'system'        => true,
-        'author'        => {
+        'noteable_id' => 377,
+        'system' => true,
+        'author' => {
           'name' => 'Administrator'
         },
         'events' => []
       }
     end
-
-    let(:members_mapper) do
-      Gitlab::ImportExport::MembersMapper.new(
-        exported_members: [exported_member],
-        user:             user,
-        importable:       group)
-    end
-
-    it 'maps the right author to the imported note' do
-      expect(created_object.author).to eq(new_user)
-    end
   end
 
   def random_id
diff --git a/spec/lib/gitlab/import_export/project/relation_factory_spec.rb b/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
index 31cf2362628..50bc6a30044 100644
--- a/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
+++ b/spec/lib/gitlab/import_export/project/relation_factory_spec.rb
@@ -3,19 +3,22 @@
 require 'spec_helper'
 
 RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
-  let(:group)   { create(:group) }
+  let(:group) { create(:group) }
   let(:project) { create(:project, :repository, group: group) }
   let(:members_mapper) { double('members_mapper').as_null_object }
-  let(:user) { create(:admin) }
+  let(:admin) { create(:admin) }
+  let(:importer_user) { admin }
   let(:excluded_keys) { [] }
   let(:created_object) do
-    described_class.create(relation_sym: relation_sym,
-                           relation_hash: relation_hash,
-                           object_builder: Gitlab::ImportExport::Project::ObjectBuilder,
-                           members_mapper: members_mapper,
-                           user: user,
-                           importable: project,
-                           excluded_keys: excluded_keys)
+    described_class.create(
+      relation_sym: relation_sym,
+      relation_hash: relation_hash,
+      object_builder: Gitlab::ImportExport::Project::ObjectBuilder,
+      members_mapper: members_mapper,
+      user: importer_user,
+      importable: project,
+      excluded_keys: excluded_keys
+    )
   end
 
   before do
@@ -113,9 +116,9 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
         "created_at" => "2016-11-18T09:29:42.634Z",
         "updated_at" => "2016-11-18T09:29:42.634Z",
         "user" => {
-          "id" => user.id,
-          "email" => user.email,
-          "username" => user.username
+          "id" => admin.id,
+          "email" => admin.email,
+          "username" => admin.username
         }
       }
     end
@@ -123,7 +126,7 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
     let(:members_mapper) do
       Gitlab::ImportExport::MembersMapper.new(
         exported_members: [exported_member],
-        user: user,
+        user: importer_user,
         importable: project)
     end
 
@@ -134,9 +137,9 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
         'source_branch' => "feature_conflict",
         'source_project_id' => project.id,
         'target_project_id' => project.id,
-        'author_id' => user.id,
-        'assignee_id' => user.id,
-        'updated_by_id' => user.id,
+        'author_id' => admin.id,
+        'assignee_id' => admin.id,
+        'updated_by_id' => admin.id,
         'title' => "MR1",
         'created_at' => "2016-06-14T15:02:36.568Z",
         'updated_at' => "2016-06-14T15:02:56.815Z",
@@ -151,11 +154,11 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
     end
 
     it 'has preloaded author' do
-      expect(created_object.author).to equal(user)
+      expect(created_object.author).to equal(admin)
     end
 
     it 'has preloaded updated_by' do
-      expect(created_object.updated_by).to equal(user)
+      expect(created_object.updated_by).to equal(admin)
     end
 
     it 'has preloaded source project' do
@@ -264,27 +267,8 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
     end
   end
 
-  context 'Notes user references' do
-    let(:relation_sym) { :notes }
-    let(:new_user) { create(:user) }
-    let(:exported_member) do
-      {
-        "id" => 111,
-        "access_level" => 30,
-        "source_id" => 1,
-        "source_type" => "Project",
-        "user_id" => 3,
-        "notification_level" => 3,
-        "created_at" => "2016-11-18T09:29:42.634Z",
-        "updated_at" => "2016-11-18T09:29:42.634Z",
-        "user" => {
-          "id" => 999,
-          "email" => new_user.email,
-          "username" => new_user.username
-        }
-      }
-    end
-
+  it_behaves_like 'Notes user references' do
+    let(:importable) { project }
     let(:relation_hash) do
       {
         "id" => 4947,
@@ -305,17 +289,6 @@ RSpec.describe Gitlab::ImportExport::Project::RelationFactory do
         "events" => []
       }
     end
-
-    let(:members_mapper) do
-      Gitlab::ImportExport::MembersMapper.new(
-        exported_members: [exported_member],
-        user: user,
-        importable: project)
-    end
-
-    it 'maps the right author to the imported note' do
-      expect(created_object.author).to eq(new_user)
-    end
   end
 
   context 'encrypted attributes' do
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 22c6ef7346b..d3fb26c0a0a 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -255,6 +255,20 @@ RSpec.describe Gitlab::UsageData, :aggregate_failures do
       )
     end
 
+    it 'includes group imports usage data' do
+      for_defined_days_back do
+        user = create(:user)
+        group = create(:group)
+        group.add_owner(user)
+        create(:group_import_state, group: group, user: user)
+      end
+
+      expect(described_class.usage_activity_by_stage_manage({}))
+        .to include(groups_imported: 2)
+      expect(described_class.usage_activity_by_stage_manage(described_class.last_28_days_time_period))
+        .to include(groups_imported: 1)
+    end
+
     def omniauth_providers
       [
         OpenStruct.new(name: 'google_oauth2'),