Merge branch 'feature/issue-27' into develop

Author: mrpiotr-dev

src/supported-formulas.js

@@ -108,6 +108,7 @@ const SUPPORTED_FORMULAS = [
   'ERFC',
   'EVEN',
   'EXACT',
+  'EXP',
   'EXPON.DIST',
   'EXPONDIST',
   'F.DIST',

test/integration/parsing/formula/math-trig.js

@@ -224,6 +224,14 @@ describe('.parse() math-trig formulas', () => {
     expect(parser.parse('EQ(12.2, 12.3)')).toMatchObject({error: null, result: false});
   });
 
+  it('EXP', () => {
+    expect(parser.parse('EXP()')).toMatchObject({error: '#N/A', result: null});
+    expect(parser.parse('EXP(MY_VAR)')).toMatchObject({error: '#NAME?', result: null});
+    expect(parser.parse('EXP("1")')).toMatchObject({error: '#ERROR!', result: null});
+    expect(parser.parse('EXP(1, 1)')).toMatchObject({error: '#ERROR!', result: null});
+    expect(parser.parse('EXP(1)')).toMatchObject({error: null, result: 2.718281828459045});
+  });
+
   it('FACT', () => {
     expect(parser.parse('FACT()')).toMatchObject({error: '#VALUE!', result: null});
     expect(parser.parse('FACT("value")')).toMatchObject({error: '#VALUE!', result: null});

test/unit/supported-formulas.js

@@ -2,6 +2,6 @@ import SUPPORTED_FORMULAS from '../../src/supported-formulas';
 
 describe('.SUPPORTED_FORMULAS', () => {
   it('should be defined', () => {
-    expect(SUPPORTED_FORMULAS.length).toBe(389);
+    expect(SUPPORTED_FORMULAS.length).toBe(390);
   });
 });

yarn.lock

@@ -1913,9 +1913,15 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
+<<<<<<< HEAD
 "formulajs@github:handsontable/formula.js#1.2.1":
   version "1.2.1"
   resolved "https://codeload.github.com/handsontable/formula.js/tar.gz/84f410606b9e279bffcd1328d975ec463671a199"
+=======
+"formulajs@github:handsontable/formula.js#1.2.0":
+  version "1.2.0"
+  resolved "https://codeload.github.com/handsontable/formula.js/tar.gz/5e21c93bad1c37c3baf2a8e5fad4d080725159ba"
+>>>>>>> feature/issue-27
   dependencies:
     bessel "^0.2.0"
     jStat "^1.7.0"