Merge branch 'master' into patch-2

Author: adrienharnay

__tests__/FlagDropDown.test.js

@@ -65,8 +65,10 @@ describe('FlagDropDown', function () { // eslint-disable-line func-names
     };
     const subject = await this.makeSubject();
 
-    expect(subject.state().countryCode).toBe('jp');
-    window.localStorage.clear();
+    subject.instance().utilsScriptDeferred.then(() => {
+      expect(subject.state().countryCode).toBe('jp');
+      window.localStorage.clear();
+    });
   });
 
   it('should has .separate-dial-code class when with separateDialCode = true', () => {
@@ -160,7 +162,9 @@ describe('FlagDropDown', function () { // eslint-disable-line func-names
     };
     const subject = await this.makeSubject();
 
-    expect(subject.state().countryCode).toBe('jp');
+    subject.instance().utilsScriptDeferred.then(() => {
+      expect(subject.state().countryCode).toBe('jp');
+    });
   });
 
   describe('with original ReactTestUtils', () => {

__tests__/TelInput.test.js

@@ -497,6 +497,19 @@ describe('TelInput', function () { // eslint-disable-line func-names
 
       expect(subject.find(TelInput).props().placeholder).toBe('Your phone');
     });
+
+    it('should set "expanded" class to wrapper only when flags are open', () => {
+      const subject = this.makeSubject();
+      const flagComponent = subject.find(FlagDropDown).find('.selected-flag');
+
+      flagComponent.simulate('click');
+      expect(subject.instance().wrapperClass.expanded).toBe(true);
+
+      const taiwanOption = subject.find(FlagDropDown).find('[data-country-code="tw"]');
+
+      taiwanOption.simulate('click');
+      expect(subject.instance().wrapperClass.expanded).toBe(false);
+    });
   });
 
   describe('uncontrolled', () => {

__tests__/utils.test.js

@@ -61,6 +61,7 @@ describe('utils', () => {
     expect(utils.trim(undefined)).toBe('');
 
     const str = ' Hello World   ';
+
     expect(utils.trim(str)).toBe('Hello World');
   });
 
@@ -83,6 +84,7 @@ describe('utils', () => {
     expect(utils.retrieveLiIndex(bListItem)).toBe(1);
 
     const otherListItem = doc.querySelector('.z');
+
     expect(utils.retrieveLiIndex(otherListItem)).toBe(-1);
   });
 
@@ -154,4 +156,47 @@ describe('utils', () => {
 
     expect(element.classList.contains('abc')).toBeFalsy();
   });
+
+  it('findIndex', () => {
+    let array = [];
+    let predicate = () => true;
+
+    expect(utils.findIndex(array, predicate)).toEqual(-1);
+
+    array = [1, 2, 3];
+    predicate = (item) => item === 2;
+
+    expect(utils.findIndex(array, predicate)).toEqual(1);
+
+    array = [1, 2, 3];
+    predicate = (item) => item === 4;
+
+    expect(utils.findIndex(array, predicate)).toEqual(-1);
+  });
+
+  it('getCursorPositionAfterFormating', () => {
+    let previousStringBeforeCursor = '9123';
+    let previousString = '912345';
+    let nextString = '912345';
+
+    expect(utils.getCursorPositionAfterFormating(previousStringBeforeCursor, previousString, nextString)).toEqual(4);
+
+    previousStringBeforeCursor = '0912 345';
+    previousString = '0912 345 678';
+    nextString = '91234678';
+
+    expect(utils.getCursorPositionAfterFormating(previousStringBeforeCursor, previousString, nextString)).toEqual(5);
+
+    previousStringBeforeCursor = '91234';
+    previousString = '91234678';
+    nextString = '0912 345 678';
+
+    expect(utils.getCursorPositionAfterFormating(previousStringBeforeCursor, previousString, nextString)).toEqual(7);
+
+    previousStringBeforeCursor = '(201) 5';
+    previousString = '(201) 55-01';
+    nextString = '201-5501';
+
+    expect(utils.getCursorPositionAfterFormating(previousStringBeforeCursor, previousString, nextString)).toEqual(5);
+  });
 });

config/babel.dev.js

@@ -6,9 +6,17 @@ module.exports = {
   // This is a feature of `babel-loader` for webpack (not Babel itself).
   // It enables caching results in OS temporary directory for faster rebuilds.
   cacheDirectory: true,
+  env: {
+    test: {
+      plugins: [
+        // to enable dynamic import in tests
+        require.resolve('babel-plugin-dynamic-import-node')
+      ]
+    }
+  },
   presets: [
     // Latest stable ECMAScript features
-    ['latest'],
+    ['env'],
     // JSX, Flow
     require.resolve('babel-preset-react'),
   ],
@@ -17,6 +25,8 @@ module.exports = {
     require.resolve('babel-plugin-transform-class-properties'),
     // { ...todo, completed: true }
     require.resolve('babel-plugin-transform-object-rest-spread'),
+    // to enable import() [dynamic import]
+    require.resolve('babel-plugin-syntax-dynamic-import'),
     // function* () { yield 42; yield 43; }
     [require.resolve('babel-plugin-transform-regenerator'), {
       // Async functions are converted to generators by babel-preset-latest

config/babel.prod.js

@@ -5,7 +5,7 @@ module.exports = {
   babelrc: false,
   presets: [
     // Latest stable ECMAScript features
-    ['latest', { es2015: { 'modules': false } }],
+    ['env', { es2015: { 'modules': false } }],
     // JSX, Flow
     require.resolve('babel-preset-react')
   ],
@@ -36,5 +36,7 @@ module.exports = {
     // * https://phabricator.babeljs.io/search/query/pCNlnC2xzwzx/
     // TODO: Enable again when these issues are resolved.
     // require.resolve('babel-plugin-transform-react-constant-elements')
+    // to enable import() [dynamic import]
+    require.resolve('babel-plugin-syntax-dynamic-import'),
   ]
 };