Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 1 deletions

diff --git a/spec/graphql/resolvers/ci/jobs_resolver_spec.rb b/spec/graphql/resolvers/ci/jobs_resolver_spec.rb
index c44f6b623d7..1b69bf7f63a 100644
--- a/spec/graphql/resolvers/ci/jobs_resolver_spec.rb
+++ b/spec/graphql/resolvers/ci/jobs_resolver_spec.rb
@@ -13,6 +13,7 @@ RSpec.describe Resolvers::Ci::JobsResolver do
     create(:ci_build, :sast, name: 'DAST job', pipeline: pipeline)
     create(:ci_build, :dast, name: 'SAST job', pipeline: pipeline)
     create(:ci_build, :container_scanning, name: 'Container scanning job', pipeline: pipeline)
+    create(:ci_build, name: 'Job with tags', pipeline: pipeline, tag_list: ['review'])
   end
 
   describe '#resolve' do
@@ -24,7 +25,8 @@ RSpec.describe Resolvers::Ci::JobsResolver do
           have_attributes(name: 'Normal job'),
           have_attributes(name: 'DAST job'),
           have_attributes(name: 'SAST job'),
-          have_attributes(name: 'Container scanning job')
+          have_attributes(name: 'Container scanning job'),
+          have_attributes(name: 'Job with tags')
         )
       end
     end
@@ -43,5 +45,18 @@ RSpec.describe Resolvers::Ci::JobsResolver do
         )
       end
     end
+
+    context 'when a job has tags' do
+      it "returns jobs with tags when applicable" do
+        jobs = resolve(described_class, obj: pipeline)
+        expect(jobs).to contain_exactly(
+          have_attributes(tag_list: []),
+          have_attributes(tag_list: []),
+          have_attributes(tag_list: []),
+          have_attributes(tag_list: []),
+          have_attributes(tag_list: ['review'])
+        )
+      end
+    end
   end
 end