Calculator: treat user input as invalid If math.eval returns undefined (

Fixes oliverschwendener#108)
dyslexictech · Feb 8, 2019 · 514596f · 514596f
1 parent fa49102
commit 514596f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/tests/unit/input-validators/calculator-input-validator.test.ts b/src/tests/unit/input-validators/calculator-input-validator.test.ts
@@ -24,6 +24,8 @@ describe(CalculatorInputValidator.name, (): void => {
 
         it("should return false when passing in an invalid argument", (): void => {
             const invalidInputs = [
+                "#",
+                "#2",
                 "s",
                 "kg",
                 "log()",

diff --git a/src/ts/calculator/calculator.ts b/src/ts/calculator/calculator.ts
@@ -18,6 +18,10 @@ export class Calculator {
         } catch (e) {
             return false;
         }
+
+        if (result === undefined) {
+            return false;
+        }
         return !isNaN(result) || this.isValidMathType(result) || false;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,6 +24,8 @@ describe(CalculatorInputValidator.name, (): void => { @@
             it("should return false when passing in an invalid argument", (): void => {
                 const invalidInputs = [
+                    "#",
+                    "#2",
                     "s",
                     "kg",
                     "log()",
@@ Expand Down @@