Merge branch 'spec_fix' into 'master'

Fix spec in master

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

cherry-picked form https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6291

See merge request !728

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