Merge branch 'pipelines-finder-spec-fix' into 'master'

Improve PipelinesFinder spec so that it does not depend on hard-coded database IDs

Fixes failed builds such as https://gitlab.com/gitlab-org/gitlab-ce/builds/3919501

See merge request !6291

1 files changed, 3 insertions, 2 deletions

diff --git a/spec/finders/pipelines_finder_spec.rb b/spec/finders/pipelines_finder_spec.rb
index 7100266ab55..b0811d134fa 100644
--- a/spec/finders/pipelines_finder_spec.rb
+++ b/spec/finders/pipelines_finder_spec.rb
@@ -43,9 +43,10 @@ describe PipelinesFinder do
     let(:params) { { scope: 'running' } }
 
     it 'orders in descending order on ID' do
-      create(:ci_pipeline, project: project, ref: 'feature')
+      feature_pipeline = create(:ci_pipeline, project: project, ref: 'feature')
 
-      expect(subject.map(&:id)).to eq [3, 2, 1]
+      expected_ids = [feature_pipeline.id, branch_pipeline.id, tag_pipeline.id].sort.reverse
+      expect(subject.map(&:id)).to eq expected_ids
     end
   end
 end