Merge pull request #16 from kitsuyui/fix-regex-pattern

Fixing too much celebration
kitsuyui · Jan 7, 2023 · 09f326c · 09f326c
2 parents 01a08f3 + 153aafd
commit 09f326c
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 10 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -21837,7 +21837,7 @@ class MessageBuilder {
     }
 }
 const defaultRules = {
-    pr_reaches_power_of_10: true,
+    pr_reaches_contain_only_one_nonzero_digit: true,
     pr_reaches_power_of_2: true,
     pr_reaches_777: true,
     commit_hits_777: true,
@@ -21908,19 +21908,19 @@ function parseRules(json) {
 }
 exports.parseRules = parseRules;
 exports.Rules = {
-    pr_reaches_power_of_10: {
+    pr_reaches_contain_only_one_nonzero_digit: {
         kind: 'pr',
-        rule: /(?:[1]0+)/,
+        rule: /(?:^[1-9]0+$)/,
         message: `Now pull request issue number reaches **{{prNum}}**. It's time to celebrate!`,
     },
     pr_reaches_power_of_2: {
         kind: 'pr',
-        rule: /(?:(512|1024|2048|4096|8192|16384|32768|65536))/,
+        rule: /(?:^(512|1024|2048|4096|8192|16384|32768|65536)$)/,
         message: `Now pull request issue number reaches **{{prNum}}** (power of 2). It's time to celebrate!`,
     },
     pr_reaches_777: {
         kind: 'pr',
-        rule: /(?:7{3,})/,
+        rule: /(?:^7{3,}$)/,
         message: `Now pull request issue number reaches **{{prNum}}** (777). It's time to celebrate!`,
     },
     commit_hits_777: {

diff --git a/src/message_builder.spec.ts b/src/message_builder.spec.ts
@@ -28,4 +28,60 @@ describe('MessageBuilder', () => {
       ].join('\n'),
     });
   });
+
+  it('builds congratulatory message when inputs lucky pull request id', () => {
+    const context = {
+      commitIds: ['1243a86968b837366e6603cab1142462c8f33ea5'],
+      prNum: 777,
+    };
+    const mb = new CustomMessageBuilder(
+      `# :tada: Happy commit!\n{{#messages}}- {{&.}}\n{{/messages}}`,
+      {}
+    );
+    const message = mb.build(context);
+    expect(message).toEqual({
+      lucky: true,
+      body: [
+        '# :tada: Happy commit!',
+        `- Now pull request issue number reaches **777** (777). It's time to celebrate!`,
+        '',
+      ].join('\n'),
+    });
+  });
+
+  it('congratulates when pull request id is lucky', () => {
+    const context = {
+      commitIds: ['1243a86968b837366e6603cab1142462c8f33ea5'],
+      prNum: 2000,
+    };
+    const mb = new CustomMessageBuilder(
+      `# :tada: Happy commit!\n{{#messages}}- {{&.}}\n{{/messages}}`,
+      {}
+    );
+    const message = mb.build(context);
+    expect(message).toEqual({
+      lucky: true,
+      body: [
+        '# :tada: Happy commit!',
+        `- Now pull request issue number reaches **2000**. It's time to celebrate!`,
+        '',
+      ].join('\n'),
+    });
+  });
+
+  it('skips congratulatory message when it is not lucky', () => {
+    const context = {
+      commitIds: ['1243a86968b837366e6603cab1142462c8f33ea5'],
+      prNum: 410,
+    };
+    const mb = new CustomMessageBuilder(
+      `# :tada: Happy commit!\n{{#messages}}- {{&.}}\n{{/messages}}`,
+      {}
+    );
+    const message = mb.build(context);
+    expect(message).toEqual({
+      lucky: false,
+      body: '# :tada: Happy commit!\n',
+    });
+  });
 });
diff --git a/src/message_builder.ts b/src/message_builder.ts
@@ -58,7 +58,7 @@ class MessageBuilder {
 }
 
 const defaultRules = {
-  pr_reaches_power_of_10: true,
+  pr_reaches_contain_only_one_nonzero_digit: true,
   pr_reaches_power_of_2: true,
   pr_reaches_777: true,
   commit_hits_777: true,

diff --git a/src/rules.ts b/src/rules.ts
@@ -43,19 +43,19 @@ export function parseRules(json: string): MessageForRuleSet {
 }
 
 export const Rules: NamedMessageForRuleSet = {
-  pr_reaches_power_of_10: {
+  pr_reaches_contain_only_one_nonzero_digit: {
     kind: 'pr',
-    rule: /(?:[1]0+)/,
+    rule: /(?:^[1-9]0+$)/,
     message: `Now pull request issue number reaches **{{prNum}}**. It's time to celebrate!`,
   },
   pr_reaches_power_of_2: {
     kind: 'pr',
-    rule: /(?:(512|1024|2048|4096|8192|16384|32768|65536))/,
+    rule: /(?:^(512|1024|2048|4096|8192|16384|32768|65536)$)/,
     message: `Now pull request issue number reaches **{{prNum}}** (power of 2). It's time to celebrate!`,
   },
   pr_reaches_777: {
     kind: 'pr',
-    rule: /(?:7{3,})/,
+    rule: /(?:^7{3,}$)/,
     message: `Now pull request issue number reaches **{{prNum}}** (777). It's time to celebrate!`,
   },
   commit_hits_777: {