Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 1 deletions

diff --git a/spec/models/ci/runner_manager_spec.rb b/spec/models/ci/runner_manager_spec.rb
index 575064f0bea..d69bf1a0da0 100644
--- a/spec/models/ci/runner_manager_spec.rb
+++ b/spec/models/ci/runner_manager_spec.rb
@@ -112,6 +112,16 @@ RSpec.describe Ci::RunnerManager, feature_category: :runner_fleet, type: :model
     end
   end
 
+  describe '.order_id_desc' do
+    subject(:scope) { described_class.order_id_desc }
+
+    let_it_be(:runner_manager1) { create(:ci_runner_machine) }
+    let_it_be(:runner_manager2) { create(:ci_runner_machine) }
+
+    specify { expect(described_class.all).to eq([runner_manager1, runner_manager2]) }
+    it { is_expected.to eq([runner_manager2, runner_manager1]) }
+  end
+
   describe '#status', :freeze_time do
     let(:runner_manager) { build(:ci_runner_machine, created_at: 8.days.ago) }
 
diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/stage_spec.rb
index 1be50083cd4..79e92082ee1 100644
--- a/spec/models/ci/stage_spec.rb
+++ b/spec/models/ci/stage_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::Stage, :models, feature_category: :continuous_integration do
+RSpec.describe Ci::Stage, :models do
   let_it_be(:pipeline) { create(:ci_empty_pipeline) }
 
   let(:stage) { create(:ci_stage, pipeline: pipeline, project: pipeline.project) }