Merge pull request #14 from watanabeyu/develop

v1.3.0

Author: watanabeyu

.vscode/settings.json

@@ -1,19 +1,15 @@
 {
   "eslint.nodePath": "./node_modules/eslint",
   "eslint.run": "onSave",
-  "eslint.autoFixOnSave": true,
   "eslint.alwaysShowStatus": true,
   "eslint.enable": true,
   "eslint.validate": [
     "javascript",
     "javascriptreact",
-    {
-      "language": "typescript",
-      "autoFix": true
-    },
-    {
-      "language": "typescriptreact",
-      "autoFix": true
-    }
-  ]
+    "typescript",
+    "typescriptreact"
+  ],
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  }
 }

README.md

@@ -7,37 +7,51 @@ By writing code successfully, you can make a forced update.
 $ npm install --save react-native-store-version
 ```
 
+## CHANGELOG
+### v1.3.0
+- if failed, throw an error.
+
 ## Usage
-```jsx
+```tsx
 import checkVersion from 'react-native-store-version';
 
-export default class App extends React.Component {
-  ...
-
-  async componentDidMount(){
-    const check = await checkVersion({
-      version: "1.0.0", // app local version
-      iosStoreURL: 'ios app store url',
-      androidStoreURL: 'android app store url',
-      country: 'jp' // default value is 'jp'
-    });
-
-    if(check.result === "new"){
-      // if app store version is new
-    }
-  }
+export default function App() {
+  useEffect(() => {
+    const init = async () => {
+      try{
+        const check = await checkVersion({
+          version: "1.0.0", // app local version
+          iosStoreURL: 'ios app store url',
+          androidStoreURL: 'android app store url',
+          country: 'jp' // default value is 'jp'
+        });
+
+        if(check.result === "new"){
+          // if app store version is new
+        }
+      } catch(e) {
+        console.log(e);
+      }
+    };
+
+    init();
+  },[]);
 }
 ```
 
 ## Return value
 ```jsx
+// correct
 {
-  error: false,
-  message: null, // if has error return error message
   local: "1.0.0",
   remote: "1.1.0",
   result: "new" // "new" | "old" | "equal"
 }
+
+// catch error
+{
+  message: "string",
+}
 ```
 result compare from a `local` to `remote`.  
 If `local(1.0.0)` and `remote(1.1.0)`, result is new.

__tests__/index.test.ts

@@ -1,51 +1,29 @@
-import fetch from 'jest-fetch-mock';
 import checkVersion, { compareVersion } from '../src';
 import getIOSVersion from '../src/ios';
 import getAndroidVersion from '../src/android';
 
-describe('checkVersion', () => {
+require('jest-fetch-mock');
+
+describe('ios', () => {
   beforeEach(() => {
-    jest.mock('Platform', () => ({ OS: 'ios' }));
-    jest.mock('fetch', () => fetch);
-    jest.setTimeout(30000);
+    jest.resetModules();
+    jest.mock('react-native/Libraries/Utilities/Platform', () => ({
+      OS: 'ios',
+      select: () => null,
+    }));
   });
 
-  // it('ios correct pattern', async () => {
-  //   jest.mock('Platform', () => ({ OS: 'ios' }));
-
-  //   const result = await checkVersion({
-  //     version: '1.0.0',
-  //     iosStoreURL: 'https://itunes.apple.com/app/id1321198947?mt=8',
-  //     country: 'us',
-  //   });
-
-  //   expect(result).toHaveProperty('local');
-  //   expect(result).toHaveProperty('remote');
-  //   expect(result).toHaveProperty('result', 'new');
-  // });
-
-  // it('android correct pattern', async () => {
-  //   jest.mock('Platform', () => ({ OS: 'android' }));
-
-  //   const result = await checkVersion({
-  //     version: '100.0.0',
-  //     iosStoreURL: 'https://play.google.com/store/apps/details?id=jp.ewaf.likedsearch.android',
-  //   });
-
-  //   expect(result).toHaveProperty('local');
-  //   expect(result).toHaveProperty('remote');
-  //   expect(result).toHaveProperty('result', 'old');
-  // });
-
   it('error pattern', async () => {
-    const result = await checkVersion({
-      version: '1.0.0',
-    });
-
-    expect(result).toHaveProperty('error', true);
+    try {
+      await checkVersion({
+        version: '1.0.0',
+      });
+    } catch (e) {
+      expect(e.message).toBe('iosStoreURL is not set.');
+    }
   });
 
-  it('ios get version', async () => {
+  it('get version', async () => {
     const correctPattern = await getIOSVersion('https://itunes.apple.com/jp/app/pin-point/id1321198947');
     expect(correctPattern).toEqual(expect.stringMatching(/[0-9]{1,}\.?[0-9]*\.?[0-9]*\.?/));
 
@@ -61,8 +39,28 @@ describe('checkVersion', () => {
       expect(e).toHaveProperty('message');
     }
   });
+});
+
+describe('android', () => {
+  beforeEach(() => {
+    jest.resetModules();
+    jest.mock('react-native/Libraries/Utilities/Platform', () => ({
+      OS: 'android',
+      select: () => null,
+    }));
+  });
 
-  it('android get version', async () => {
+  it('error pattern', async () => {
+    try {
+      await checkVersion({
+        version: '1.0.0',
+      });
+    } catch (e) {
+      expect(e.message).toBe('androidStoreURL is not set.');
+    }
+  });
+
+  it('get version', async () => {
     const correctPattern = await getAndroidVersion('https://play.google.com/store/apps/details?id=jp.ewaf.likedsearch.android');
     expect(correctPattern).toEqual(expect.stringMatching(/[0-9]{1,}\.?[0-9]*\.?[0-9]*\.?/));
 
@@ -78,7 +76,9 @@ describe('checkVersion', () => {
       expect(e).toHaveProperty('message');
     }
   });
+});
 
+describe('other', () => {
   it('compare version', () => {
     const remoteIsOld = compareVersion('1.1.0', '1.0.3');
     expect(remoteIsOld).toBe('old');

babel.config.js

@@ -1,19 +1,3 @@
 module.exports = {
-  presets: [
-    [
-      '@babel/preset-env',
-      {
-        targets: {
-          node: 'current',
-        },
-      },
-    ],
-  ],
-  env: {
-    test: {
-      plugins: [
-        '@babel/plugin-proposal-class-properties',
-      ],
-    },
-  },
+  presets: ['module:metro-react-native-babel-preset'],
 };