fix(rulesets): simplify schema used in duplicated-entry-in-enum (#2055)

stoplightio · Feb 11, 2022 · 8451774 · 8451774
1 parent 7f2f5aa
commit 8451774
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 38 deletions.
diff --git a/packages/rulesets/src/oas/__tests__/duplicated-entry-in-enum.test.ts b/packages/rulesets/src/oas/__tests__/duplicated-entry-in-enum.test.ts
@@ -24,30 +24,6 @@ testRule('duplicated-entry-in-enum', [
     errors: [],
   },
 
-  {
-    name: 'oas2: enum is an object property',
-    document: {
-      openapi: '3.0.2',
-      components: {
-        schemas: {
-          schema: {
-            type: 'object',
-            properties: {
-              enum: {
-                type: 'array',
-                items: {
-                  type: 'string',
-                },
-              },
-            },
-          },
-        },
-      },
-    },
-
-    errors: [],
-  },
-
   {
     name: 'oas2: enum with duplicated entries',
     document: {
@@ -70,9 +46,24 @@ testRule('duplicated-entry-in-enum', [
   },
 
   {
-    name: 'oas3: empty object',
+    name: 'oas3: enum is a property',
     document: {
-      openapi: '3.0.0',
+      openapi: '3.0.2',
+      components: {
+        schemas: {
+          schema: {
+            type: 'object',
+            properties: {
+              enum: {
+                type: 'array',
+                items: {
+                  type: 'string',
+                },
+              },
+            },
+          },
+        },
+      },
     },
     errors: [],
   },

diff --git a/packages/rulesets/src/oas/index.ts b/packages/rulesets/src/oas/index.ts
@@ -123,22 +123,14 @@ const ruleset = {
       severity: 'warn',
       recommended: true,
       message: '{{error}}',
-      given: '$..enum',
+      given: ["$..[?(@property !== 'properties' && @ && @.enum)]"],
       then: {
+        field: 'enum',
         function: oasSchema,
         functionOptions: {
           schema: {
-            oneOf: [
-              {
-                type: 'array',
-                uniqueItems: true,
-              },
-              {
-                not: {
-                  type: 'array',
-                },
-              },
-            ],
+            type: 'array',
+            uniqueItems: true,
           },
         },
       },