CLOUDP-285964: Clean up

Author: lovisaberggren

tools/ipa/__tests__/__helpers__/spectral.js

@@ -15,12 +15,7 @@ export default (ruleName, tests) => {
         const doc = testCase.document instanceof Document ? testCase.document : JSON.stringify(testCase.document);
         const allErrors = await s.run(doc);
 
-        const errors = allErrors.filter((e) => {
-          if (testCase.errors[0]) {
-            return e.code === testCase.errors[0].code;
-          }
-          return false;
-        });
+        const errors = getErrorsForRule(allErrors, ruleName);
 
         expect(errors.length).toEqual(testCase.errors.length);
 
@@ -36,8 +31,10 @@ export default (ruleName, tests) => {
 
 async function createSpectral() {
   const s = new Spectral({ resolver: httpAndFileResolver });
-
   s.setRuleset(await bundleAndLoadRuleset(rulesetPath, { fs, fetch }));
-
   return s;
 }
+
+function getErrorsForRule(errors, rule) {
+  return errors.filter((e) => e.code === rule);
+}

tools/ipa/__tests__/__helpers__/testRule.js

@@ -3,41 +3,82 @@ import { DiagnosticSeverity } from '@stoplight/types';
 
 testRule('xgen-IPA-104-resource-has-GET', [
   {
-    name: 'valid standard method',
+    name: 'valid methods',
     document: {
       paths: {
-        '/example': {
+        '/standard': {
           post: {},
           get: {},
         },
-        '/example/{exampleId}': {
+        '/standard/{exampleId}': {
           get: {},
           patch: {},
           delete: {},
         },
+        '/custom': {
+          post: {},
+          get: {},
+        },
+        '/custom/{exampleId}': {
+          get: {},
+          patch: {},
+          delete: {},
+        },
+        '/custom:method': {
+          post: {},
+        },
+        '/singleton': {
+          get: {},
+        },
       },
     },
     errors: [],
   },
   {
-    name: 'invalid standard method',
+    name: 'invalid methods',
     document: {
       paths: {
-        '/example': {
+        '/standard': {
           post: {},
           get: {},
         },
-        '/example/{exampleId}': {
+        '/standard/{exampleId}': {
           patch: {},
           delete: {},
         },
+        '/custom': {
+          post: {},
+          get: {},
+        },
+        '/custom/{exampleId}': {
+          patch: {},
+          delete: {},
+        },
+        '/custom:method': {
+          post: {},
+        },
+        '/singleton': {
+          patch: {},
+        },
       },
     },
     errors: [
       {
         code: 'xgen-IPA-104-resource-has-GET',
         message: 'APIs must provide a get method for resources. http://go/ipa/117',
-        path: ['paths', '/example'],
+        path: ['paths', '/standard'],
+        severity: DiagnosticSeverity.Warning,
+      },
+      {
+        code: 'xgen-IPA-104-resource-has-GET',
+        message: 'APIs must provide a get method for resources. http://go/ipa/117',
+        path: ['paths', '/custom'],
+        severity: DiagnosticSeverity.Warning,
+      },
+      {
+        code: 'xgen-IPA-104-resource-has-GET',
+        message: 'APIs must provide a get method for resources. http://go/ipa/117',
+        path: ['paths', '/singleton'],
         severity: DiagnosticSeverity.Warning,
       },
     ],

tools/ipa/__tests__/descriptions.test.js

@@ -1,3 +1,2 @@
 extends:
   - ./rulesets/IPA-104.yaml
-  - ./rulesets/IPA-xxx.yaml