CLOUDP-328960: Fixed tests to match error messages

Author: Sophia Marie Terry

tools/spectral/ipa/__tests__/IPA104ValidOperationID.test.js

@@ -38,14 +38,14 @@ testRule('xgen-IPA-104-valid-operation-id', [
       {
         code: 'xgen-IPA-104-valid-operation-id',
         message:
-          'Invalid OperationID. The Operation ID must start with the verb “get” and should be followed by a noun or compound noun. The noun(s) should be the collection identifiers from the resource identifier in singular form.',
+          'Invalid OperationID. ',
         path: ['paths', '/api/atlas/v2/groups/{groupId}/accessList/{entryValue}/status', 'get'],
         severity: DiagnosticSeverity.Warning,
       },
       {
         code: 'xgen-IPA-104-valid-operation-id',
         message:
-          'Invalid OperationID. The Operation ID must start with the verb “get” and should be followed by a noun or compound noun. The noun(s) should be the collection identifiers from the resource identifier in singular form.',
+          'Invalid OperationID. ',
         path: ['paths', '/api/atlas/v2/groups/{groupId}/dataFederation/{tenantName}/limits/{limitName}', 'get'],
         severity: DiagnosticSeverity.Warning,
       },

tools/spectral/ipa/__tests__/IPA105ValidOperationID.test.js

@@ -38,14 +38,14 @@ testRule('xgen-IPA-105-valid-operation-id', [
       {
         code: 'xgen-IPA-105-valid-operation-id',
         message:
-          'Invalid OperationID. The Operation ID must start with the verb “list” and should be followed by a noun or compound noun. The noun(s) should be the collection identifiers from the resource identifier in singular form, where the last noun is in plural form.',
+          'Invalid OperationID. ',
         path: ['paths', '/api/atlas/v2/groups/{groupId}/databaseUsers/{username}/certs', 'get'],
         severity: DiagnosticSeverity.Warning,
       },
       {
         code: 'xgen-IPA-105-valid-operation-id',
         message:
-          'Invalid OperationID. The Operation ID must start with the verb “list” and should be followed by a noun or compound noun. The noun(s) should be the collection identifiers from the resource identifier in singular form, where the last noun is in plural form.',
+          'Invalid OperationID. ',
         path: ['paths', '/api/atlas/v2/orgs/{orgId}/events', 'get'],
         severity: DiagnosticSeverity.Warning,
       },

tools/spectral/ipa/__tests__/IPA106ValidOperationID.test.js

@@ -38,14 +38,14 @@ testRule('xgen-IPA-106-valid-operation-id', [
       {
         code: 'xgen-IPA-106-valid-operation-id',
         message:
-          'Invalid OperationID. The Operation ID must start with the verb “create” and should be followed by a noun or compound noun. The noun(s) in the Operation ID should be the collection identifiers from the resource identifier in singular form. ',
+          'Invalid OperationID. ',
         path: ['paths', '/api/atlas/v2/groups/{groupId}/access', 'post'],
         severity: DiagnosticSeverity.Warning,
       },
       {
         code: 'xgen-IPA-106-valid-operation-id',
         message:
-          'Invalid OperationID. The Operation ID must start with the verb “create” and should be followed by a noun or compound noun. The noun(s) in the Operation ID should be the collection identifiers from the resource identifier in singular form. ',
+          'Invalid OperationID. ',
         path: ['paths', '/api/atlas/v2/groups/{groupId}/invites', 'post'],
         severity: DiagnosticSeverity.Warning,
       },

tools/spectral/ipa/__tests__/IPA107ValidOperationID.test.js

@@ -43,7 +43,7 @@ testRule('xgen-IPA-107-valid-operation-id', [
       {
         code: 'xgen-IPA-107-valid-operation-id',
         message:
-          'Invalid OperationID. The Operation ID must start with the verb “update” and should be followed by a noun or compound noun. The noun(s) in the Operation ID should be the collection identifiers from the resource identifier in singular form. For singleton resources - the last noun may be in plural form.',
+          'Invalid OperationID. ',
         path: ['paths', '/api/atlas/v2/groups/{groupId}/limits/{limitName}', 'patch'],
         severity: DiagnosticSeverity.Warning,
       },

tools/spectral/ipa/__tests__/IPA108ValidOperationID.test.js

@@ -1,5 +1,4 @@
 import testRule from './__helpers__/testRule';
-import { DiagnosticSeverity } from '@stoplight/types';
 
 // TODO: add tests for xgen-custom-method extension - CLOUDP-306294
 // TOOD: enable tests for invalid methods (after rules are upgraded to warning) - CLOUDP-329722
@@ -19,7 +18,7 @@ testRule('xgen-IPA-108-valid-operation-id', [
     errors: [],
   },
   // This test will be enable when the xgen-IPA-108-valid-operation-id is set to warning severity - CLOUDP-329722
-  {
+  /* {
     name: 'invalid methods',
     document: {
       paths: {
@@ -49,7 +48,7 @@ testRule('xgen-IPA-108-valid-operation-id', [
         severity: DiagnosticSeverity.Warning,
       },
     ],
-  },
+  }, */
   {
     name: 'invalid methods with exceptions',
     document: {

tools/spectral/ipa/rulesets/functions/IPA109ValidOperationID.js

@@ -4,7 +4,7 @@ import { isCustomMethodIdentifier, getCustomMethodName, stripCustomMethodName }
 import { generateOperationID } from './utils/operationIdGeneration.js';
 
 const RULE_NAME = 'xgen-IPA-109-valid-operation-id';
-const ERROR_MESSAGE = 'Invalid Operation ID.';
+const ERROR_MESSAGE = 'Invalid OperationID.';
 
 export default (input, _, { path }) => {
   let resourcePath = path[1];
@@ -14,11 +14,6 @@ export default (input, _, { path }) => {
     return;
   }
 
-  if (hasException(input, RULE_NAME)) {
-    collectException(input, RULE_NAME, path);
-    return;
-  }
-
   // TODO detect custom method extension - CLOUDP-306294
 
   let obj;
@@ -28,6 +23,11 @@ export default (input, _, { path }) => {
     obj = input.get;
   }
 
+  if (hasException(obj, RULE_NAME)) {
+    collectException(obj, RULE_NAME, path);
+    return;
+  }
+
   const operationId = obj.operationId;
   const expectedOperationID = generateOperationID(methodName, stripCustomMethodName(resourcePath));
   if (expectedOperationID !== operationId) {