Add latest changes from gitlab-org/gitlab@master

12 files changed, 28 insertions, 24 deletions

diff --git a/spec/lib/gitlab/git/tree_spec.rb b/spec/lib/gitlab/git/tree_spec.rb
index 005f8ecaa3a..97ba177da71 100644
--- a/spec/lib/gitlab/git/tree_spec.rb
+++ b/spec/lib/gitlab/git/tree_spec.rb
@@ -43,7 +43,7 @@ RSpec.describe Gitlab::Git::Tree, :seed_helper do
     end
 
     describe '#dir?' do
-      let(:dir) { entries.select(&:dir?).first }
+      let(:dir) { entries.find(&:dir?) }
 
       it { expect(dir).to be_kind_of Gitlab::Git::Tree }
       it { expect(dir.id).to eq('3c122d2b7830eca25235131070602575cf8b41a1') }
@@ -134,7 +134,7 @@ RSpec.describe Gitlab::Git::Tree, :seed_helper do
     end
 
     describe '#file?' do
-      let(:file) { entries.select(&:file?).first }
+      let(:file) { entries.find(&:file?) }
 
       it { expect(file).to be_kind_of Gitlab::Git::Tree }
       it { expect(file.id).to eq('dfaa3f97ca337e20154a98ac9d0be76ddd1fcc82') }
@@ -143,21 +143,21 @@ RSpec.describe Gitlab::Git::Tree, :seed_helper do
     end
 
     describe '#readme?' do
-      let(:file) { entries.select(&:readme?).first }
+      let(:file) { entries.find(&:readme?) }
 
       it { expect(file).to be_kind_of Gitlab::Git::Tree }
       it { expect(file.name).to eq('README.md') }
     end
 
     describe '#contributing?' do
-      let(:file) { entries.select(&:contributing?).first }
+      let(:file) { entries.find(&:contributing?) }
 
       it { expect(file).to be_kind_of Gitlab::Git::Tree }
       it { expect(file.name).to eq('CONTRIBUTING.md') }
     end
 
     describe '#submodule?' do
-      let(:submodule) { entries.select(&:submodule?).first }
+      let(:submodule) { entries.find(&:submodule?) }
 
       it { expect(submodule).to be_kind_of Gitlab::Git::Tree }
       it { expect(submodule.id).to eq('79bceae69cb5750d6567b223597999bfa91cb3b9') }
diff --git a/spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb b/spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb
index 0eecdfcb630..d0787d8b673 100644
--- a/spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/conflict_files_stitcher_spec.rb
@@ -43,10 +43,10 @@ RSpec.describe Gitlab::GitalyClient::ConflictFilesStitcher do
 
       messages = [
         double(files: [double(header: header_1), double(header: nil, content: content_1[0..5])]),
-        double(files: [double(header: nil, content: content_1[6..-1])]),
+        double(files: [double(header: nil, content: content_1[6..])]),
         double(files: [double(header: header_2)]),
         double(files: [double(header: nil, content: content_2[0..5]), double(header: nil, content: content_2[6..10])]),
-        double(files: [double(header: nil, content: content_2[11..-1])])
+        double(files: [double(header: nil, content: content_2[11..])])
       ]
 
       conflict_files = described_class.new(messages, target_repository.gitaly_repository).to_a
diff --git a/spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb b/spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb
index 113c47b4f2c..54c84ddc56f 100644
--- a/spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/diff_stitcher_spec.rb
@@ -41,7 +41,7 @@ RSpec.describe Gitlab::GitalyClient::DiffStitcher do
       msg_2.raw_patch_data = diff_2.patch[0..100]
       msg_2.end_of_patch = false
 
-      msg_3 = OpenStruct.new(raw_patch_data: diff_2.patch[101..-1], end_of_patch: true)
+      msg_3 = OpenStruct.new(raw_patch_data: diff_2.patch[101..], end_of_patch: true)
 
       msg_4 = OpenStruct.new(diff_3.to_h.except(:patch))
       msg_4.raw_patch_data = diff_3.patch
diff --git a/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb b/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb
index 771f6e1ec46..5d444775e53 100644
--- a/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb
+++ b/spec/lib/gitlab/gpg/invalid_gpg_signature_updater_spec.rb
@@ -192,7 +192,7 @@ RSpec.describe Gitlab::Gpg::InvalidGpgSignatureUpdater do
           project: project,
           commit_sha: commit_sha,
           gpg_key: nil,
-          gpg_key_primary_keyid: GpgHelpers::User3.subkey_fingerprints.last[24..-1],
+          gpg_key_primary_keyid: GpgHelpers::User3.subkey_fingerprints.last[24..],
           verification_status: 'unknown_key'
       end
 
diff --git a/spec/lib/gitlab/graphql/pagination/keyset/connection_generic_keyset_spec.rb b/spec/lib/gitlab/graphql/pagination/keyset/connection_generic_keyset_spec.rb
index d9afac5f522..0741088c915 100644
--- a/spec/lib/gitlab/graphql/pagination/keyset/connection_generic_keyset_spec.rb
+++ b/spec/lib/gitlab/graphql/pagination/keyset/connection_generic_keyset_spec.rb
@@ -98,7 +98,7 @@ RSpec.describe Gitlab::Graphql::Pagination::Keyset::Connection do
           let(:nodes) { Project.all.order(Gitlab::Pagination::Keyset::Order.build([column_order_id_desc])) }
 
           it 'returns the correct nodes' do
-            expect(subject.sliced_nodes).to contain_exactly(*projects[2..-1])
+            expect(subject.sliced_nodes).to contain_exactly(*projects[2..])
           end
         end
       end
@@ -107,7 +107,7 @@ RSpec.describe Gitlab::Graphql::Pagination::Keyset::Connection do
         let(:arguments) { { after: encoded_cursor(projects[1]) } }
 
         it 'only returns the project before the selected one' do
-          expect(subject.sliced_nodes).to contain_exactly(*projects[2..-1])
+          expect(subject.sliced_nodes).to contain_exactly(*projects[2..])
         end
 
         context 'when the sort order is descending' do
diff --git a/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb b/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb
index 8ef5f1147c5..efdbe199761 100644
--- a/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb
+++ b/spec/lib/gitlab/graphql/pagination/keyset/connection_spec.rb
@@ -120,7 +120,7 @@ RSpec.describe Gitlab::Graphql::Pagination::Keyset::Connection do
         let(:nodes) { Project.all.order(id: :desc) }
 
         it 'returns the correct nodes' do
-          expect(subject.sliced_nodes).to contain_exactly(*projects[2..-1])
+          expect(subject.sliced_nodes).to contain_exactly(*projects[2..])
         end
       end
     end
@@ -129,7 +129,7 @@ RSpec.describe Gitlab::Graphql::Pagination::Keyset::Connection do
       let(:arguments) { { after: encoded_cursor(projects[1]) } }
 
       it 'only returns the project before the selected one' do
-        expect(subject.sliced_nodes).to contain_exactly(*projects[2..-1])
+        expect(subject.sliced_nodes).to contain_exactly(*projects[2..])
       end
 
       context 'when the sort order is descending' do
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index cabc7cff8a1..e2ed821f622 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -224,6 +224,7 @@ ci_pipelines:
 - ci_ref
 - stages
 - statuses
+- statuses_order_id_desc
 - latest_statuses_ordered_by_stage
 - builds
 - bridges
diff --git a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
index 6bb6be07749..1d8b137c196 100644
--- a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
+++ b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 def match_mr1_note(content_regex)
-  MergeRequest.find_by(title: 'MR1').notes.select { |n| n.note.match(/#{content_regex}/)}.first
+  MergeRequest.find_by(title: 'MR1').notes.find { |n| n.note.match(/#{content_regex}/) }
 end
 
 RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
@@ -75,7 +75,7 @@ RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
           context 'for an Issue' do
             it 'does not import note_html' do
               note_content = 'Quo reprehenderit aliquam qui dicta impedit cupiditate eligendi'
-              issue_note = Issue.find_by(description: 'Aliquam enim illo et possimus.').notes.select { |n| n.note.match(/#{note_content}/)}.first
+              issue_note = Issue.find_by(description: 'Aliquam enim illo et possimus.').notes.find { |n| n.note.match(/#{note_content}/) }
 
               expect(issue_note.note_html).to match(/#{note_content}/)
             end
@@ -552,7 +552,7 @@ RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
 
         it 'issue system note metadata restored successfully' do
           note_content = 'created merge request !1 to address this issue'
-          note = project.issues.first.notes.select { |n| n.note.match(/#{note_content}/)}.first
+          note = project.issues.first.notes.find { |n| n.note.match(/#{note_content}/)}
 
           expect(note.noteable_type).to eq('Issue')
           expect(note.system).to eq(true)
diff --git a/spec/lib/gitlab/multi_collection_paginator_spec.rb b/spec/lib/gitlab/multi_collection_paginator_spec.rb
index c7c8f4f969f..080b3382684 100644
--- a/spec/lib/gitlab/multi_collection_paginator_spec.rb
+++ b/spec/lib/gitlab/multi_collection_paginator_spec.rb
@@ -40,7 +40,7 @@ RSpec.describe Gitlab::MultiCollectionPaginator do
     end
 
     it 'fils the last page with elements from the second collection' do
-      expected_collection = all_groups[-2..-1]
+      expected_collection = all_groups[-2..]
 
       expect(paginator.paginate(3)).to eq(expected_collection)
     end
diff --git a/spec/lib/gitlab/pagination/keyset/order_spec.rb b/spec/lib/gitlab/pagination/keyset/order_spec.rb
index 3c14d91fdfd..1bed8e542a2 100644
--- a/spec/lib/gitlab/pagination/keyset/order_spec.rb
+++ b/spec/lib/gitlab/pagination/keyset/order_spec.rb
@@ -127,7 +127,7 @@ RSpec.describe Gitlab::Pagination::Keyset::Order do
         end
 
         it do
-          expect(subject).to eq(expected.reverse[1..-1]) # removing one item because we used it to calculate cursor data for the "last" page in subject
+          expect(subject).to eq(expected.reverse[1..]) # removing one item because we used it to calculate cursor data for the "last" page in subject
         end
       end
     end
diff --git a/spec/lib/gitlab/rack_attack_spec.rb b/spec/lib/gitlab/rack_attack_spec.rb
index f0d6e3a527a..39ea02bad8b 100644
--- a/spec/lib/gitlab/rack_attack_spec.rb
+++ b/spec/lib/gitlab/rack_attack_spec.rb
@@ -78,7 +78,7 @@ RSpec.describe Gitlab::RackAttack, :aggregate_failures do
 
     it 'configures tracks and throttles with a selected set of dry-runs' do
       dry_run_throttles = throttles.each_key.first(2)
-      regular_throttles = throttles.keys[2..-1]
+      regular_throttles = throttles.keys[2..]
       stub_env('GITLAB_THROTTLE_DRY_RUN', dry_run_throttles.join(','))
 
       described_class.configure(fake_rack_attack)
diff --git a/spec/lib/gitlab/redis/sessions_spec.rb b/spec/lib/gitlab/redis/sessions_spec.rb
index ecd77564360..a6a0373a4bb 100644
--- a/spec/lib/gitlab/redis/sessions_spec.rb
+++ b/spec/lib/gitlab/redis/sessions_spec.rb
@@ -44,20 +44,23 @@ RSpec.describe Gitlab::Redis::Sessions do
   describe '#store' do
     subject { described_class.store(namespace: described_class::SESSION_NAMESPACE) }
 
-    context 'when redis.sessions configuration is provided' do
+    context 'when redis.sessions configuration is NOT provided' do
       it 'instantiates ::Redis instance' do
         expect(described_class).to receive(:config_fallback?).and_return(true)
         expect(subject).to be_instance_of(::Redis::Store)
       end
     end
 
-    context 'when redis.sessions configuration is not provided' do
+    context 'when redis.sessions configuration is provided' do
+      before do
+        allow(described_class).to receive(:config_fallback?).and_return(false)
+      end
+
       it 'instantiates an instance of MultiStore' do
-        expect(described_class).to receive(:config_fallback?).and_return(false)
         expect(subject).to be_instance_of(::Gitlab::Redis::MultiStore)
       end
-    end
 
-    it_behaves_like 'multi store feature flags', :use_primary_and_secondary_stores_for_sessions, :use_primary_store_as_default_for_sessions
+      it_behaves_like 'multi store feature flags', :use_primary_and_secondary_stores_for_sessions, :use_primary_store_as_default_for_sessions
+    end
   end
 end