1 files changed, 13 insertions, 11 deletions
diff --git a/spec/requests/api/graphql/ci/groups_spec.rb b/spec/requests/api/graphql/ci/groups_spec.rb
index 9e81358a152..d1a4395d2c9 100644
--- a/spec/requests/api/graphql/ci/groups_spec.rb
+++ b/spec/requests/api/graphql/ci/groups_spec.rb
@@ -4,10 +4,15 @@ require 'spec_helper'
 RSpec.describe 'Query.project.pipeline.stages.groups' do
   include GraphqlHelpers
 
-  let(:project) { create(:project, :repository, :public) }
-  let(:user) { create(:user) }
-  let(:pipeline) { create(:ci_pipeline, project: project, user: user) }
-  let(:group_graphql_data) { graphql_data.dig('project', 'pipeline', 'stages', 'nodes', 0, 'groups', 'nodes') }
+  let_it_be(:project) { create(:project, :repository, :public) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:pipeline) { create(:ci_pipeline, project: project, user: user) }
+  let(:group_graphql_data) { graphql_data_at(:project, :pipeline, :stages, :nodes, 0, :groups, :nodes) }
+
+  let_it_be(:ref) { 'master' }
+  let_it_be(:job_a) { create(:commit_status, pipeline: pipeline, name: 'rspec 0 2', ref: ref) }
+  let_it_be(:job_b) { create(:ci_build, pipeline: pipeline, name: 'rspec 0 1', ref: ref) }
+  let_it_be(:job_c) { create(:ci_bridge, pipeline: pipeline, name: 'spinach 0 1', ref: ref) }
 
   let(:params) { {} }
 
@@ -38,18 +43,15 @@ RSpec.describe 'Query.project.pipeline.stages.groups' do
   end
 
   before do
-    create(:commit_status, pipeline: pipeline, name: 'rspec 0 2')
-    create(:commit_status, pipeline: pipeline, name: 'rspec 0 1')
-    create(:commit_status, pipeline: pipeline, name: 'spinach 0 1')
     post_graphql(query, current_user: user)
   end
 
   it_behaves_like 'a working graphql query'
 
   it 'returns a array of jobs belonging to a pipeline' do
-    expect(group_graphql_data.map { |g| g.slice('name', 'size') }).to eq([
-      { 'name' => 'rspec', 'size' => 2 },
-      { 'name' => 'spinach', 'size' => 1 }
-    ])
+    expect(group_graphql_data).to contain_exactly(
+      a_hash_including('name' => 'rspec',   'size' => 2),
+      a_hash_including('name' => 'spinach', 'size' => 1)
+    )
   end
 end