ARSN-362:fixups on imp deny logic in policy eval tests

scality · Oct 30, 2023 · f8efb79 · f8efb79
1 parent ec6334b
commit f8efb79
Showing 1 changed file with 10 additions and 70 deletions.
diff --git a/tests/unit/policyEvaluator.spec.js b/tests/unit/policyEvaluator.spec.js
@@ -1548,7 +1548,7 @@ describe('policyEvaluator', () => {
             },
         };
 
-        const TestMatrixV2 = [
+        const TestMatrix = [
             {
                 policiesToEvaluate: [],
                 expectedPolicyEvaluation: {
@@ -1605,6 +1605,13 @@ describe('policyEvaluator', () => {
                     isImplicit: true,
                 },
             },
+            {
+                policiesToEvaluate: ['Neutral', 'Deny'],
+                expectedPolicyEvaluation: {
+                    verdict: 'Deny',
+                    isImplicit: false,
+                },
+            },
             {
                 policiesToEvaluate: ['Allow', 'Deny'],
                 expectedPolicyEvaluation: {
@@ -1663,7 +1670,7 @@ describe('policyEvaluator', () => {
             },
         ];
 
-        TestMatrixV2.forEach(testCase => {
+        TestMatrix.forEach(testCase => {
             it(`policies evaluating individually to [${testCase.policiesToEvaluate.join(', ')}] `
             + `should return ${testCase.expectedPolicyEvaluation}`, () => {
                 requestContext = new RequestContext({}, {},
@@ -1678,73 +1685,6 @@ describe('policyEvaluator', () => {
             });
         });
 
-        const TestMatrix = [
-            {
-                policiesToEvaluate: [],
-                expectedPolicyEvaluation: 'Deny',
-            },
-            {
-                policiesToEvaluate: ['Allow'],
-                expectedPolicyEvaluation: 'Allow',
-            },
-            {
-                policiesToEvaluate: ['Neutral'],
-                expectedPolicyEvaluation: 'Deny',
-            },
-            {
-                policiesToEvaluate: ['Deny'],
-                expectedPolicyEvaluation: 'Deny',
-            },
-            {
-                policiesToEvaluate: ['Allow', 'Allow'],
-                expectedPolicyEvaluation: 'Allow',
-            },
-            {
-                policiesToEvaluate: ['Allow', 'Neutral'],
-                expectedPolicyEvaluation: 'Allow',
-            },
-            {
-                policiesToEvaluate: ['Neutral', 'Allow'],
-                expectedPolicyEvaluation: 'Allow',
-            },
-            {
-                policiesToEvaluate: ['Neutral', 'Neutral'],
-                expectedPolicyEvaluation: 'Deny',
-            },
-            {
-                policiesToEvaluate: ['Allow', 'Deny'],
-                expectedPolicyEvaluation: 'Deny',
-            },
-            {
-                policiesToEvaluate: ['AllowWithTagCondition'],
-                expectedPolicyEvaluation: 'NeedTagConditionEval',
-            },
-            {
-                policiesToEvaluate: ['Allow', 'AllowWithTagCondition'],
-                expectedPolicyEvaluation: 'Allow',
-            },
-            {
-                policiesToEvaluate: ['DenyWithTagCondition'],
-                expectedPolicyEvaluation: 'Deny',
-            },
-            {
-                policiesToEvaluate: ['Allow', 'DenyWithTagCondition'],
-                expectedPolicyEvaluation: 'NeedTagConditionEval',
-            },
-            {
-                policiesToEvaluate: ['AllowWithTagCondition', 'DenyWithTagCondition'],
-                expectedPolicyEvaluation: 'NeedTagConditionEval',
-            },
-            {
-                policiesToEvaluate: ['AllowWithTagCondition', 'DenyWithTagCondition', 'Deny'],
-                expectedPolicyEvaluation: 'Deny',
-            },
-            {
-                policiesToEvaluate: ['DenyWithTagCondition', 'AllowWithTagCondition', 'Allow'],
-                expectedPolicyEvaluation: 'NeedTagConditionEval',
-            },
-        ];
-
         TestMatrix.forEach(testCase => {
             it(`policies evaluating individually to [${testCase.policiesToEvaluate.join(', ')}] `
             + `should return ${testCase.expectedPolicyEvaluation}`, () => {
@@ -1756,7 +1696,7 @@ describe('policyEvaluator', () => {
                     requestContext,
                     testCase.policiesToEvaluate.map(policyName => TestMatrixPolicies[policyName]),
                     log);
-                assert.strictEqual(result, testCase.expectedPolicyEvaluation);
+                assert.strictEqual(result, testCase.expectedPolicyEvaluation.verdict);
             });
         });
     });