Merge branch 'master' into issue_51789_part_1

12 files changed, 591 insertions, 46 deletions

diff --git a/spec/lib/gitlab/ci/build/policy/changes_spec.rb b/spec/lib/gitlab/ci/build/policy/changes_spec.rb
index 5fee37bb43e..dc3329061d1 100644
--- a/spec/lib/gitlab/ci/build/policy/changes_spec.rb
+++ b/spec/lib/gitlab/ci/build/policy/changes_spec.rb
@@ -73,9 +73,9 @@ describe Gitlab::Ci::Build::Policy::Changes do
         expect(policy).not_to be_satisfied_by(pipeline, seed)
       end
 
-      context 'when pipelines does not run for a branch update' do
+      context 'when modified paths can not be evaluated' do
         before do
-          pipeline.before_sha = Gitlab::Git::BLANK_SHA
+          allow(pipeline).to receive(:modified_paths) { nil }
         end
 
         it 'is always satisfied' do
@@ -115,5 +115,57 @@ describe Gitlab::Ci::Build::Policy::Changes do
         expect(policy).not_to be_satisfied_by(pipeline, seed)
       end
     end
+
+    context 'when branch is created' do
+      let(:pipeline) do
+        create(:ci_empty_pipeline, project: project,
+                                   ref: 'feature',
+                                   source: source,
+                                   sha: '0b4bc9a4',
+                                   before_sha: Gitlab::Git::BLANK_SHA,
+                                   merge_request: merge_request)
+      end
+
+      let(:ci_build) do
+        build(:ci_build, pipeline: pipeline, project: project, ref: 'feature')
+      end
+
+      let(:seed) { double('build seed', to_resource: ci_build) }
+
+      context 'when source is merge request' do
+        let(:source) { :merge_request }
+
+        let(:merge_request) do
+          create(:merge_request,
+                 source_project: project,
+                 source_branch: 'feature',
+                 target_project: project,
+                 target_branch: 'master')
+        end
+
+        it 'is satified by changes in the merge request' do
+          policy = described_class.new(%w[files/ruby/feature.rb])
+
+          expect(policy).to be_satisfied_by(pipeline, seed)
+        end
+
+        it 'is not satified by changes not in the merge request' do
+          policy = described_class.new(%w[foo.rb])
+
+          expect(policy).not_to be_satisfied_by(pipeline, seed)
+        end
+      end
+
+      context 'when source is push' do
+        let(:source) { :push }
+        let(:merge_request) { nil }
+
+        it 'is always satified' do
+          policy = described_class.new(%w[foo.rb])
+
+          expect(policy).to be_satisfied_by(pipeline, seed)
+        end
+      end
+    end
   end
 end
diff --git a/spec/lib/gitlab/danger/helper_spec.rb b/spec/lib/gitlab/danger/helper_spec.rb
new file mode 100644
index 00000000000..793cac593a2
--- /dev/null
+++ b/spec/lib/gitlab/danger/helper_spec.rb
@@ -0,0 +1,300 @@
+# frozen_string_literal: true
+
+require 'fast_spec_helper'
+require 'rspec-parameterized'
+require 'webmock/rspec'
+
+require 'gitlab/danger/helper'
+
+describe Gitlab::Danger::Helper do
+  using RSpec::Parameterized::TableSyntax
+
+  class FakeDanger
+    include Gitlab::Danger::Helper
+
+    attr_reader :git
+
+    def initialize(git:)
+      @git = git
+    end
+  end
+
+  let(:teammate_json) do
+    <<~JSON
+    [
+      {
+        "username": "in-gitlab-ce",
+        "name": "CE maintainer",
+        "projects":{ "gitlab-ce": "maintainer backend" }
+      },
+      {
+        "username": "in-gitlab-ee",
+        "name": "EE reviewer",
+        "projects":{ "gitlab-ee": "reviewer frontend" }
+      }
+    ]
+    JSON
+  end
+
+  let(:ce_teammate_matcher) do
+    satisfy do |teammate|
+      teammate.username == 'in-gitlab-ce' &&
+        teammate.name == 'CE maintainer' &&
+        teammate.projects == { 'gitlab-ce' => 'maintainer backend' }
+    end
+  end
+
+  let(:ee_teammate_matcher) do
+    satisfy do |teammate|
+      teammate.username == 'in-gitlab-ee' &&
+        teammate.name == 'EE reviewer' &&
+        teammate.projects == { 'gitlab-ee' => 'reviewer frontend' }
+    end
+  end
+
+  let(:fake_git) { double('fake-git') }
+
+  subject(:helper) { FakeDanger.new(git: fake_git) }
+
+  describe '#all_changed_files' do
+    subject { helper.all_changed_files }
+
+    it 'interprets a list of changes from the danger git plugin' do
+      expect(fake_git).to receive(:added_files) { %w[a b c.old] }
+      expect(fake_git).to receive(:modified_files) { %w[d e] }
+      expect(fake_git)
+        .to receive(:renamed_files)
+        .at_least(:once)
+        .and_return([{ before: 'c.old', after: 'c.new' }])
+
+      is_expected.to contain_exactly('a', 'b', 'c.new', 'd', 'e')
+    end
+  end
+
+  describe '#ee?' do
+    subject { helper.ee? }
+
+    it 'returns true if CI_PROJECT_NAME if set to gitlab-ee' do
+      stub_env('CI_PROJECT_NAME', 'gitlab-ee')
+      expect(File).not_to receive(:exist?)
+
+      is_expected.to be_truthy
+    end
+
+    it 'delegates to CHANGELOG-EE.md existence if CI_PROJECT_NAME is set to something else' do
+      stub_env('CI_PROJECT_NAME', 'something else')
+      expect(File).to receive(:exist?).with('../../CHANGELOG-EE.md') { true }
+
+      is_expected.to be_truthy
+    end
+
+    it 'returns true if CHANGELOG-EE.md exists' do
+      stub_env('CI_PROJECT_NAME', nil)
+      expect(File).to receive(:exist?).with('../../CHANGELOG-EE.md') { true }
+
+      is_expected.to be_truthy
+    end
+
+    it "returns false if CHANGELOG-EE.md doesn't exist" do
+      stub_env('CI_PROJECT_NAME', nil)
+      expect(File).to receive(:exist?).with('../../CHANGELOG-EE.md') { false }
+
+      is_expected.to be_falsy
+    end
+  end
+
+  describe '#project_name' do
+    subject { helper.project_name }
+
+    it 'returns gitlab-ee if ee? returns true' do
+      expect(helper).to receive(:ee?) { true }
+
+      is_expected.to eq('gitlab-ee')
+    end
+
+    it 'returns gitlab-ce if ee? returns false' do
+      expect(helper).to receive(:ee?) { false }
+
+      is_expected.to eq('gitlab-ce')
+    end
+  end
+
+  describe '#team' do
+    subject(:team) { helper.team }
+
+    context 'HTTP failure' do
+      before do
+        WebMock
+          .stub_request(:get, 'https://about.gitlab.com/roulette.json')
+          .to_return(status: 404)
+      end
+
+      it 'raises a pretty error' do
+        expect { team }.to raise_error(/Failed to read/)
+      end
+    end
+
+    context 'JSON failure' do
+      before do
+        WebMock
+          .stub_request(:get, 'https://about.gitlab.com/roulette.json')
+          .to_return(body: 'INVALID JSON')
+      end
+
+      it 'raises a pretty error' do
+        expect { team }.to raise_error(/Failed to parse/)
+      end
+    end
+
+    context 'success' do
+      before do
+        WebMock
+          .stub_request(:get, 'https://about.gitlab.com/roulette.json')
+          .to_return(body: teammate_json)
+      end
+
+      it 'returns an array of teammates' do
+        is_expected.to contain_exactly(ce_teammate_matcher, ee_teammate_matcher)
+      end
+
+      it 'memoizes the result' do
+        expect(team.object_id).to eq(helper.team.object_id)
+      end
+    end
+  end
+
+  describe '#project_team' do
+    subject { helper.project_team }
+
+    before do
+      WebMock
+        .stub_request(:get, 'https://about.gitlab.com/roulette.json')
+        .to_return(body: teammate_json)
+    end
+
+    it 'filters team by project_name' do
+      expect(helper)
+        .to receive(:project_name)
+        .at_least(:once)
+        .and_return('gitlab-ce')
+
+      is_expected.to contain_exactly(ce_teammate_matcher)
+    end
+  end
+
+  describe '#changes_by_category' do
+    it 'categorizes changed files' do
+      expect(fake_git).to receive(:added_files) { %w[foo foo.md foo.rb foo.js db/foo qa/foo ee/changelogs/foo.yml] }
+      allow(fake_git).to receive(:modified_files) { [] }
+      allow(fake_git).to receive(:renamed_files) { [] }
+
+      expect(helper.changes_by_category).to eq(
+        backend: %w[foo.rb],
+        database: %w[db/foo],
+        docs: %w[foo.md],
+        frontend: %w[foo.js],
+        none: %w[ee/changelogs/foo.yml],
+        qa: %w[qa/foo],
+        unknown: %w[foo]
+      )
+    end
+  end
+
+  describe '#category_for_file' do
+    where(:path, :expected_category) do
+      'doc/foo'         | :docs
+      'CONTRIBUTING.md' | :docs
+      'LICENSE'         | :docs
+      'MAINTENANCE.md'  | :docs
+      'PHILOSOPHY.md'   | :docs
+      'PROCESS.md'      | :docs
+      'README.md'       | :docs
+
+      'ee/doc/foo'      | :unknown
+      'ee/README'       | :unknown
+
+      'app/assets/foo'       | :frontend
+      'app/views/foo'        | :frontend
+      'public/foo'           | :frontend
+      'spec/javascripts/foo' | :frontend
+      'vendor/assets/foo'    | :frontend
+      'jest.config.js'       | :frontend
+      'package.json'         | :frontend
+      'yarn.lock'            | :frontend
+
+      'ee/app/assets/foo'       | :frontend
+      'ee/app/views/foo'        | :frontend
+      'ee/spec/javascripts/foo' | :frontend
+
+      'app/models/foo' | :backend
+      'bin/foo'        | :backend
+      'config/foo'     | :backend
+      'danger/foo'     | :backend
+      'lib/foo'        | :backend
+      'rubocop/foo'    | :backend
+      'scripts/foo'    | :backend
+      'spec/foo'       | :backend
+      'spec/foo/bar'   | :backend
+
+      'ee/app/foo'      | :backend
+      'ee/bin/foo'      | :backend
+      'ee/spec/foo'     | :backend
+      'ee/spec/foo/bar' | :backend
+
+      'generator_templates/foo' | :backend
+      'vendor/languages.yml'    | :backend
+      'vendor/licenses.csv'     | :backend
+
+      'Dangerfile'     | :backend
+      'Gemfile'        | :backend
+      'Gemfile.lock'   | :backend
+      'Procfile'       | :backend
+      'Rakefile'       | :backend
+      '.gitlab-ci.yml' | :backend
+      'FOO_VERSION'    | :backend
+
+      'ee/FOO_VERSION' | :unknown
+
+      'db/foo' | :database
+      'qa/foo' | :qa
+
+      'ee/db/foo' | :database
+      'ee/qa/foo' | :qa
+
+      'changelogs/foo'    | :none
+      'ee/changelogs/foo' | :none
+
+      'FOO'          | :unknown
+      'foo'          | :unknown
+
+      'foo/bar.rb'  | :backend
+      'foo/bar.js'  | :frontend
+      'foo/bar.txt' | :docs
+      'foo/bar.md'  | :docs
+    end
+
+    with_them do
+      subject { helper.category_for_file(path) }
+
+      it { is_expected.to eq(expected_category) }
+    end
+  end
+
+  describe '#label_for_category' do
+    where(:category, :expected_label) do
+      :backend   | '~backend'
+      :database  | '~database'
+      :docs      | '~Documentation'
+      :foo       | '~foo'
+      :frontend  | '~frontend'
+      :none      | ''
+      :qa        | '~QA'
+    end
+
+    with_them do
+      subject { helper.label_for_category(category) }
+
+      it { is_expected.to eq(expected_label) }
+    end
+  end
+end
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index cf9e0cccc71..8a9e78ba3c3 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -283,6 +283,96 @@ describe Gitlab::Git::Repository, :seed_helper do
     end
   end
 
+  describe '#diverging_commit_count' do
+    it 'counts 0 for the same branch' do
+      expect(repository.diverging_commit_count('master', 'master', max_count: 1000)).to eq([0, 0])
+    end
+
+    context 'max count does not truncate results' do
+      where(:left, :right, :expected) do
+        1 | 1 | [1, 1]
+        4 | 4 | [4, 4]
+        2 | 2 | [2, 2]
+        2 | 4 | [2, 4]
+        4 | 2 | [4, 2]
+        10 | 10 | [10, 10]
+      end
+
+      with_them do
+        before do
+          repository.create_branch('left-branch', 'master')
+          repository.create_branch('right-branch', 'master')
+
+          left.times do
+            new_commit_edit_new_file_on_branch(repository_rugged, 'encoding/CHANGELOG', 'left-branch', 'some more content for a', 'some stuff')
+          end
+
+          right.times do
+            new_commit_edit_new_file_on_branch(repository_rugged, 'encoding/CHANGELOG', 'right-branch', 'some more content for b', 'some stuff')
+          end
+        end
+
+        after do
+          repository.delete_branch('left-branch')
+          repository.delete_branch('right-branch')
+        end
+
+        it 'returns the correct count bounding at max_count' do
+          branch_a_sha = repository_rugged.branches['left-branch'].target.oid
+          branch_b_sha = repository_rugged.branches['right-branch'].target.oid
+
+          count = repository.diverging_commit_count(branch_a_sha, branch_b_sha, max_count: 1000)
+
+          expect(count).to eq(expected)
+        end
+      end
+    end
+
+    context 'max count truncates results' do
+      where(:left, :right, :max_count) do
+        1 | 1 | 1
+        4 | 4 | 4
+        2 | 2 | 3
+        2 | 4 | 3
+        4 | 2 | 5
+        10 | 10 | 10
+      end
+
+      with_them do
+        before do
+          repository.create_branch('left-branch', 'master')
+          repository.create_branch('right-branch', 'master')
+
+          left.times do
+            new_commit_edit_new_file_on_branch(repository_rugged, 'encoding/CHANGELOG', 'left-branch', 'some more content for a', 'some stuff')
+          end
+
+          right.times do
+            new_commit_edit_new_file_on_branch(repository_rugged, 'encoding/CHANGELOG', 'right-branch', 'some more content for b', 'some stuff')
+          end
+        end
+
+        after do
+          repository.delete_branch('left-branch')
+          repository.delete_branch('right-branch')
+        end
+
+        it 'returns the correct count bounding at max_count' do
+          branch_a_sha = repository_rugged.branches['left-branch'].target.oid
+          branch_b_sha = repository_rugged.branches['right-branch'].target.oid
+
+          results = repository.diverging_commit_count(branch_a_sha, branch_b_sha, max_count: max_count)
+
+          expect(results[0] + results[1]).to eq(max_count)
+        end
+      end
+    end
+
+    it_behaves_like 'wrapping gRPC errors', Gitlab::GitalyClient::CommitService, :diverging_commit_count do
+      subject { repository.diverging_commit_count('master', 'master', max_count: 1000) }
+    end
+  end
+
   describe '#has_local_branches?' do
     context 'check for local branches' do
       it { expect(repository.has_local_branches?).to eq(true) }
diff --git a/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb
index 0f21b8843b6..15e59718dce 100644
--- a/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb
+++ b/spec/lib/gitlab/github_import/importer/pull_request_importer_spec.rb
@@ -89,7 +89,7 @@ describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitlab_redi
               description: 'This is my pull request',
               source_project_id: project.id,
               target_project_id: project.id,
-              source_branch: 'alice:feature',
+              source_branch: 'github/fork/alice/feature',
               target_branch: 'master',
               state: :merged,
               milestone_id: milestone.id,
@@ -134,7 +134,7 @@ describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitlab_redi
               description: "*Created by: alice*\n\nThis is my pull request",
               source_project_id: project.id,
               target_project_id: project.id,
-              source_branch: 'alice:feature',
+              source_branch: 'github/fork/alice/feature',
               target_branch: 'master',
               state: :merged,
               milestone_id: milestone.id,
@@ -259,6 +259,40 @@ describe Gitlab::GithubImport::Importer::PullRequestImporter, :clean_gitlab_redi
         .and_return(user.id)
     end
 
+    it 'does not create the source branch if merge request is merged' do
+      mr, exists = importer.create_merge_request
+
+      importer.insert_git_data(mr, exists)
+
+      expect(project.repository.branch_exists?(mr.source_branch)).to be_falsey
+      expect(project.repository.branch_exists?(mr.target_branch)).to be_truthy
+    end
+
+    it 'creates the source branch if merge request is open' do
+      mr, exists = importer.create_merge_request
+      mr.state = 'opened'
+      mr.save
+
+      importer.insert_git_data(mr, exists)
+
+      expect(project.repository.branch_exists?(mr.source_branch)).to be_truthy
+      expect(project.repository.branch_exists?(mr.target_branch)).to be_truthy
+    end
+
+    it 'ignores Git errors when creating a branch' do
+      mr, exists = importer.create_merge_request
+      mr.state = 'opened'
+      mr.save
+
+      expect(project.repository).to receive(:add_branch).and_raise(Gitlab::Git::CommandError)
+      expect(Gitlab::Sentry).to receive(:track_acceptable_exception).and_call_original
+
+      importer.insert_git_data(mr, exists)
+
+      expect(project.repository.branch_exists?(mr.source_branch)).to be_falsey
+      expect(project.repository.branch_exists?(mr.target_branch)).to be_truthy
+    end
+
     it 'creates the merge request diffs' do
       mr, exists = importer.create_merge_request
 
diff --git a/spec/lib/gitlab/github_import/representation/pull_request_spec.rb b/spec/lib/gitlab/github_import/representation/pull_request_spec.rb
index 33f6ff0ae6a..d478e5ae899 100644
--- a/spec/lib/gitlab/github_import/representation/pull_request_spec.rb
+++ b/spec/lib/gitlab/github_import/representation/pull_request_spec.rb
@@ -238,7 +238,7 @@ describe Gitlab::GithubImport::Representation::PullRequest do
           target_repository_id: 2
         )
 
-        expect(pr.formatted_source_branch).to eq('foo:branch')
+        expect(pr.formatted_source_branch).to eq('github/fork/foo/branch')
       end
     end
 
diff --git a/spec/lib/gitlab/graphql/authorize/instrumentation_spec.rb b/spec/lib/gitlab/graphql/authorize/instrumentation_spec.rb
new file mode 100644
index 00000000000..cf3a8bcc8b4
--- /dev/null
+++ b/spec/lib/gitlab/graphql/authorize/instrumentation_spec.rb
@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Graphql::Authorize::Instrumentation do
+  describe '#build_checker' do
+    let(:current_user) { double(:current_user) }
+    let(:abilities) { [double(:first_ability), double(:last_ability)] }
+
+    let(:checker) do
+      described_class.new.__send__(:build_checker, current_user, abilities)
+    end
+
+    it 'returns a checker which checks for a single object' do
+      object = double(:object)
+
+      abilities.each do |ability|
+        spy_ability_check_for(ability, object, passed: true)
+      end
+
+      expect(checker.call(object)).to eq(object)
+    end
+
+    it 'returns a checker which checks for all objects' do
+      objects = [double(:first), double(:last)]
+
+      abilities.each do |ability|
+        objects.each do |object|
+          spy_ability_check_for(ability, object, passed: true)
+        end
+      end
+
+      expect(checker.call(objects)).to eq(objects)
+    end
+
+    context 'when some objects would not pass the check' do
+      it 'returns nil when it is single object' do
+        disallowed = double(:object)
+
+        spy_ability_check_for(abilities.first, disallowed, passed: false)
+
+        expect(checker.call(disallowed)).to be_nil
+      end
+
+      it 'returns only objects which passed when there are more than one' do
+        allowed = double(:allowed)
+        disallowed = double(:disallowed)
+
+        spy_ability_check_for(abilities.first, disallowed, passed: false)
+
+        abilities.each do |ability|
+          spy_ability_check_for(ability, allowed, passed: true)
+        end
+
+        expect(checker.call([disallowed, allowed]))
+          .to contain_exactly(allowed)
+      end
+    end
+
+    def spy_ability_check_for(ability, object, passed: true)
+      expect(Ability)
+        .to receive(:allowed?)
+        .with(current_user, ability, object)
+        .and_return(passed)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 6897ac8a3a8..c15b360b563 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -219,7 +219,6 @@ project:
 - packagist_service
 - pivotaltracker_service
 - prometheus_service
-- hipchat_service
 - flowdock_service
 - assembla_service
 - asana_service
diff --git a/spec/lib/gitlab/import_export/project.json b/spec/lib/gitlab/import_export/project.json
index 58949f76bd6..1327f414498 100644
--- a/spec/lib/gitlab/import_export/project.json
+++ b/spec/lib/gitlab/import_export/project.json
@@ -6775,28 +6775,6 @@
       "wiki_page_events": true
     },
     {
-      "id": 93,
-      "title": "HipChat",
-      "project_id": 5,
-      "created_at": "2016-06-14T15:01:51.219Z",
-      "updated_at": "2016-06-14T15:01:51.219Z",
-      "active": false,
-      "properties": {
-        "notify_only_broken_pipelines": true
-      },
-      "template": false,
-      "push_events": true,
-      "issues_events": true,
-      "merge_requests_events": true,
-      "tag_push_events": true,
-      "note_events": true,
-      "pipeline_events": true,
-      "type": "HipchatService",
-      "category": "common",
-      "default": false,
-      "wiki_page_events": true
-    },
-    {
       "id": 91,
       "title": "Flowdock",
       "project_id": 5,
diff --git a/spec/lib/gitlab/import_export/shared_spec.rb b/spec/lib/gitlab/import_export/shared_spec.rb
index f2d750c6595..2c288cff6ef 100644
--- a/spec/lib/gitlab/import_export/shared_spec.rb
+++ b/spec/lib/gitlab/import_export/shared_spec.rb
@@ -14,6 +14,16 @@ describe Gitlab::ImportExport::Shared do
       expect(subject.errors).to eq(['Error importing into [FILTERED] Permission denied @ unlink_internal - [FILTERED]'])
     end
 
+    it 'updates the import JID' do
+      import_state = create(:import_state, project: project, jid: 'jid-test')
+
+      expect_next_instance_of(Gitlab::Import::Logger) do |logger|
+        expect(logger).to receive(:error).with(hash_including(import_jid: import_state.jid))
+      end
+
+      subject.error(error)
+    end
+
     it 'calls the error logger with the full message' do
       expect(subject).to receive(:log_error).with(hash_including(message: error.message))
 
diff --git a/spec/lib/gitlab/lfs_token_spec.rb b/spec/lib/gitlab/lfs_token_spec.rb
index 1ec1ba19e39..8961ecc4be0 100644
--- a/spec/lib/gitlab/lfs_token_spec.rb
+++ b/spec/lib/gitlab/lfs_token_spec.rb
@@ -4,10 +4,8 @@ require 'spec_helper'
 
 describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
   describe '#token' do
-    shared_examples 'an LFS token generator' do
+    shared_examples 'a valid LFS token' do
       it 'returns a computed token' do
-        expect(Settings).to receive(:attr_encrypted_db_key_base).and_return('fbnbv6hdjweo53qka7kza8v8swxc413c05pb51qgtfte0bygh1p2e508468hfsn5ntmjcyiz7h1d92ashpet5pkdyejg7g8or3yryhuso4h8o5c73h429d9c3r6bjnet').twice
-
         token = lfs_token.token
 
         expect(token).not_to be_nil
@@ -20,11 +18,7 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
       let(:actor) { create(:user, username: 'test_user_lfs_1') }
       let(:lfs_token) { described_class.new(actor) }
 
-      before do
-        allow(actor).to receive(:encrypted_password).and_return('$2a$04$ETfzVS5spE9Hexn9wh6NUenCHG1LyZ2YdciOYxieV1WLSa8DHqOFO')
-      end
-
-      it_behaves_like 'an LFS token generator'
+      it_behaves_like 'a valid LFS token'
 
       it 'returns the correct username' do
         expect(lfs_token.actor_name).to eq(actor.username)
@@ -40,11 +34,7 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
       let(:actor) { create(:key, user: user) }
       let(:lfs_token) { described_class.new(actor) }
 
-      before do
-        allow(user).to receive(:encrypted_password).and_return('$2a$04$C1GAMKsOKouEbhKy2JQoe./3LwOfQAZc.hC8zW2u/wt8xgukvnlV.')
-      end
-
-      it_behaves_like 'an LFS token generator'
+      it_behaves_like 'a valid LFS token'
 
       it 'returns the correct username' do
         expect(lfs_token.actor_name).to eq(user.username)
@@ -65,7 +55,7 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
         allow(actor).to receive(:id).and_return(actor_id)
       end
 
-      it_behaves_like 'an LFS token generator'
+      it_behaves_like 'a valid LFS token'
 
       it 'returns the correct username' do
         expect(lfs_token.actor_name).to eq("lfs+deploy-key-#{actor_id}")
@@ -87,10 +77,6 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
     let(:actor) { create(:user, username: 'test_user_lfs_1') }
     let(:lfs_token) { described_class.new(actor) }
 
-    before do
-      allow(actor).to receive(:encrypted_password).and_return('$2a$04$ETfzVS5spE9Hexn9wh6NUenCHG1LyZ2YdciOYxieV1WLSa8DHqOFO')
-    end
-
     context 'for an HMAC token' do
       before do
         # We're not interested in testing LegacyRedisDeviseToken here
@@ -240,4 +226,18 @@ describe Gitlab::LfsToken, :clean_gitlab_redis_shared_state do
       end
     end
   end
+
+  describe '#authentication_payload' do
+    it 'returns a Hash designed for gitlab-shell' do
+      actor = create(:user)
+      lfs_token = described_class.new(actor)
+      repo_http_path = 'http://localhost/user/repo.git'
+      authentication_payload = lfs_token.authentication_payload(repo_http_path)
+
+      expect(authentication_payload[:username]).to eq(actor.username)
+      expect(authentication_payload[:repository_http_path]).to eq(repo_http_path)
+      expect(authentication_payload[:lfs_token]).to be_a String
+      expect(authentication_payload[:expires_in]).to eq(described_class::DEFAULT_EXPIRE_TIME)
+    end
+  end
 end
diff --git a/spec/lib/gitlab/sql/recursive_cte_spec.rb b/spec/lib/gitlab/sql/recursive_cte_spec.rb
index 25146860615..7fe39dd5a96 100644
--- a/spec/lib/gitlab/sql/recursive_cte_spec.rb
+++ b/spec/lib/gitlab/sql/recursive_cte_spec.rb
@@ -31,6 +31,15 @@ describe Gitlab::SQL::RecursiveCTE, :postgresql do
 
       expect(cte.alias_to(table).to_sql).to eq("#{source_name} AS #{alias_name}")
     end
+
+    it 'replaces dots with an underscore' do
+      table = Arel::Table.new('gitlab.kittens')
+
+      source_name = ActiveRecord::Base.connection.quote_table_name(:cte_name)
+      alias_name = ActiveRecord::Base.connection.quote_table_name(:gitlab_kittens)
+
+      expect(cte.alias_to(table).to_sql).to eq("#{source_name} AS #{alias_name}")
+    end
   end
 
   describe '#apply_to' do
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 4f5993ba226..d3eae80cc56 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -124,9 +124,15 @@ describe Gitlab::UsageData do
         todos
         uploads
         web_hooks
+        user_preferences
       ))
     end
 
+    it 'does not gather user preferences usage data when the feature is disabled' do
+      stub_feature_flags(group_overview_security_dashboard: false)
+      expect(subject[:counts].keys).not_to include(:user_preferences)
+    end
+
     it 'gathers projects data correctly' do
       count_data = subject[:counts]