Merge pull request #288 from manosim/travis-yarn

Travis & Yarn

Author: manosim

.travis.yml

@@ -1,20 +1,15 @@
 language: node_js
 
 node_js:
-  - '5'
+  - '6.10.3'
 
 cache:
+  yarn: true
   directories:
-    - node_modules
-
-install:
-  - npm install
-
-before_script:
-  - npm run build
+    - "node_modules"
 
 script:
-  - npm test -- --runInBand
+  - yarn test -- --runInBand
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)

package.json

@@ -1,14 +1,14 @@
 {
   "name": "gitify",
-  "version": "1.1.0",
+  "version": "2.0.0",
   "description": "GitHub Notifications on your menu bar.",
   "main": "main.js",
   "scripts": {
     "build-js": "mkdir -p dist/js/ && browserify -t babelify --ignore-missing --no-builtins --no-commondir --insert-global-vars=\"global\" --no-browser-field --exclude electron src/js/app.js | uglifyjs > dist/js/app.js",
     "build": "npm run build-js && gulp build",
     "watch-js": "watchify -t babelify --ignore-missing --no-builtins --no-commondir --insert-global-vars=\"global\" --no-browser-field --exclude electron src/js/app.js -o dist/js/app.js -v",
     "watch": "gulp build && npm run watch-js & gulp watch",
-    "package": "electron-packager . Gitify --overwrite --platform=darwin --arch=x64 --version=1.4.0 --asar=true --icon=images/app-icon.icns --prune --ignore='src' --ignore='coverage'",
+    "package": "electron-packager . Gitify --overwrite --platform=darwin --arch=x64 --version=1.6.10 --asar=true --icon=images/app-icon.icns --prune --ignore='src' --ignore='coverage'",
     "codesign": "bash scripts/codesign.bash",
     "dist": "npm run build && npm run package && npm run codesign",
     "lint-js": "eslint 'src/js/' 'src/js/app.js' 'main.js'",
@@ -76,11 +76,11 @@
     "react-emojione": "=2.0.0",
     "react-icheck": "=0.3.8",
     "react-modal": "=1.7.7",
-    "react-redux": "=5.0.4",
+    "react-redux": "=5.0.5",
     "react-router": "=4.1.1",
     "react-router-dom": "=4.1.1",
     "redux": "=3.6.0",
-    "redux-form": "=6.6.3",
+    "redux-form": "=6.7.0",
     "redux-storage": "=4.1.2",
     "redux-storage-decorator-filter": "=1.1.8",
     "redux-storage-engine-localstorage": "=1.1.4",
@@ -89,26 +89,26 @@
   },
   "devDependencies": {
     "babel-eslint": "=7.2.3",
-    "babel-jest": "=19.0.0",
+    "babel-jest": "=20.0.3",
     "babel-preset-es2015": "=6.24.1",
     "babel-preset-react": "=6.24.1",
     "babel-preset-stage-0": "=6.24.1",
     "babelify": "=7.3.0",
-    "browserify": "=14.3.0",
-    "electron": "=1.6.2",
-    "electron-packager": "=8.6.0",
+    "browserify": "=14.4.0",
+    "electron": "=1.6.10",
+    "electron-packager": "=8.7.0",
     "enzyme": "=2.8.2",
     "eslint": "=3.19.0",
-    "eslint-plugin-react": "=6.10.3",
+    "eslint-plugin-react": "=7.0.1",
     "gulp": "=3.9.1",
     "gulp-sass": "=3.1.0",
-    "jest": "=19.0.2",
+    "jest": "=20.0.4",
     "nock": "=9.0.13",
     "react-test-renderer": "=15.5.4",
-    "redux-logger": "=3.0.1",
+    "redux-logger": "=3.0.6",
     "redux-mock-store": "=1.2.3",
     "sass-lint": "=1.10.2 -v",
-    "uglify-js": "=2.8.22",
+    "uglify-js": "=3.0.12",
     "watchify": "=3.9.0"
   }
 }

src/js/__tests__/reducers/__snapshots__/auth.js.snap

@@ -1,67 +1,75 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`reducers/auth.js should handle LOGIN.FAILURE 1`] = `
-Object {
-  "failed": true,
-  "isFetching": false,
-  "response": Object {
-    "msg": "Failed to login.",
+Immutable.Map {
+  response: Immutable.Map {
+    msg: "Failed to login.",
   },
-  "token": null,
+  token: null,
+  isFetching: false,
+  failed: true,
 }
 `;
 
 exports[`reducers/auth.js should handle LOGIN.REQUEST 1`] = `
-Object {
-  "enterpriseAccounts": Array [],
-  "failed": false,
-  "isFetching": true,
-  "response": Object {},
-  "token": null,
+Immutable.Map {
+  response: Immutable.Map {
+  },
+  token: null,
+  isFetching: true,
+  failed: false,
+  enterpriseAccounts: Immutable.List [
+  ],
 }
 `;
 
 exports[`reducers/auth.js should handle LOGIN.SUCCESS - enterprise 1`] = `
-Object {
-  "enterpriseAccounts": Array [
-    Object {
-      "hostname": "github.gitify.io",
-      "token": "123HELLOWORLDTOKEN",
+Immutable.Map {
+  response: Immutable.Map {
+  },
+  token: null,
+  isFetching: false,
+  failed: false,
+  enterpriseAccounts: Immutable.List [
+    Immutable.Map {
+      hostname: "github.gitify.io",
+      token: "123HELLOWORLDTOKEN",
     },
   ],
-  "failed": false,
-  "isFetching": false,
-  "response": Object {},
-  "token": null,
 }
 `;
 
 exports[`reducers/auth.js should handle LOGIN.SUCCESS - github.com 1`] = `
-Object {
-  "enterpriseAccounts": Array [],
-  "failed": false,
-  "isFetching": false,
-  "response": Object {},
-  "token": "123HELLOWORLDTOKEN",
+Immutable.Map {
+  response: Immutable.Map {
+  },
+  token: "123HELLOWORLDTOKEN",
+  isFetching: false,
+  failed: false,
+  enterpriseAccounts: Immutable.List [
+  ],
 }
 `;
 
 exports[`reducers/auth.js should handle LOGOUT 1`] = `
-Object {
-  "enterpriseAccounts": Array [],
-  "failed": false,
-  "isFetching": false,
-  "response": null,
-  "token": null,
+Immutable.Map {
+  response: null,
+  token: null,
+  isFetching: false,
+  failed: false,
+  enterpriseAccounts: Immutable.List [
+  ],
 }
 `;
 
 exports[`reducers/auth.js should return the initial state 1`] = `
-Object {
-  "enterpriseAccounts": Array [],
-  "failed": false,
-  "isFetching": false,
-  "response": Object {},
-  "token": null,
+Immutable.Map {
+  response: Immutable.Map {
+  },
+  token: null,
+  isFetching: false,
+  failed: false,
+  enterpriseAccounts: Immutable.List [
+  ],
 }
 `;