Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/graphql/resolvers/work_items/types_resolver_spec.rb b/spec/graphql/resolvers/work_items/types_resolver_spec.rb
index f7aeed30fd3..868f4566ad6 100644
--- a/spec/graphql/resolvers/work_items/types_resolver_spec.rb
+++ b/spec/graphql/resolvers/work_items/types_resolver_spec.rb
@@ -53,5 +53,15 @@ RSpec.describe Resolvers::WorkItems::TypesResolver do
 
       it_behaves_like 'a work item type resolver'
     end
+
+    context 'when parent is not a group or project' do
+      let(:object) { 'not a project/group' }
+
+      it 'returns nil because of feature flag check' do
+        result = resolve(described_class, obj: object, args: {})
+
+        expect(result).to be_nil
+      end
+    end
   end
 end