fix: correct validation for duration flags's default value

salesforcecli · Aug 15, 2022 · 9fd41be · 9fd41be
1 parent 8cabbca
commit 9fd41be
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/src/rules/flagMinMaxDefault.ts b/src/rules/flagMinMaxDefault.ts
@@ -35,7 +35,10 @@ export const flagMinMaxDefault = ESLintUtils.RuleCreator.withoutDocs({
                 (flagPropertyIsNamed(property, 'min') || flagPropertyIsNamed(property, 'max'))
             ) &&
             !node.value.arguments[0].properties.some(
-              (property) => property.type === 'Property' && flagPropertyIsNamed(property, 'default')
+              (property) =>
+                property.type === 'Property' &&
+                // defaultValue for DurationFlags
+                (flagPropertyIsNamed(property, 'default') || flagPropertyIsNamed(property, 'defaultValue'))
             )
           ) {
             context.report({

diff --git a/test/rules/flagMinMaxDefault.test.ts b/test/rules/flagMinMaxDefault.test.ts
@@ -42,6 +42,23 @@ export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
   }
 }
 
+`,
+    },
+
+    // duration flags use defaultValue instead of default
+    {
+      filename: path.normalize('src/commands/foo.ts'),
+      code: `
+export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
+  public static flags = {
+    alias: Flags.duration({
+      min: 1,
+      max: 5,
+      defaultValue: 2
+    }),
+  }
+}
+
 `,
     },
   ],
@@ -51,7 +68,6 @@ export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
       errors: [
         {
           messageId: 'message',
-          data: { flagName: 'Alias' },
         },
       ],
       code: `
@@ -62,6 +78,23 @@ export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
     }),
   }
 }
+`,
+    },
+    {
+      filename: path.normalize('src/commands/foo.ts'),
+      errors: [
+        {
+          messageId: 'message',
+        },
+      ],
+      code: `
+export default class EnvCreateScratch extends SfCommand<ScratchCreateResponse> {
+  public static flags = {
+    foo: Flags.duration({
+      min: 5
+    }),
+  }
+}
 `,
     },
     {