Merge pull request #27 from zestia/add-natural-number-fix

Fix whole number constraint option not matching some numbers with zeros
zestia · Jan 31, 2024 · 1bbfa1c · 1bbfa1c
2 parents f49a221 + 914bacb
commit 1bbfa1c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.2.1
+
+- Fix whole number constraint option not matching some numbers with zeros
+
 ## 5.2.0
 
 - Add whole number constraint option

diff --git a/addon/-private/constraints/number.js b/addon/-private/constraints/number.js
@@ -8,7 +8,7 @@ export default function number(options = {}) {
     }
 
     if (options.whole) {
-      if (/^([0-9]|[1-9,]+)$/i.test(value)) {
+      if (/^([0-9,]+)$/i.test(value)) {
         return;
       }
     } else if (/^-?[0-9,.]+$/i.test(value)) {

diff --git a/tests/unit/constraints/number-test.js b/tests/unit/constraints/number-test.js
@@ -53,7 +53,7 @@ module('number', function (hooks) {
   });
 
   test('inputs, non-whole', function (assert) {
-    assert.expect(13);
+    assert.expect(15);
 
     const validExamples = [
       12345,
@@ -65,27 +65,37 @@ module('number', function (hooks) {
       '123.45',
       '01',
       0,
-      '0'
+      '0',
+      10,
+      '10'
     ];
     const invalidExamples = [null, '', 'abc'];
 
     testInputs(assert, {}, validExamples, invalidExamples);
   });
 
   test('inputs, whole', function (assert) {
-    assert.expect(14);
+    assert.expect(15);
 
     const options = { whole: true };
-    const validExamples = [0, '0', 12345, '12345', 123456789, '123,456,789'];
+    const validExamples = [
+      0,
+      '0',
+      12345,
+      '12345',
+      123456789,
+      '123,456,789',
+      10,
+      '10'
+    ];
     const invalidExamples = [
       null,
       '',
       'abc',
       -12345,
       '-12345',
       123.45,
-      '123.45',
-      '01'
+      '123.45'
     ];
 
     testInputs(assert, options, validExamples, invalidExamples);