Merge pull request #4 from AshDevFr/fixes/travis

Fixes/travis

.travis.yml

@@ -1,18 +1,19 @@
 language: node_js
 sudo: false
-node_js: 5.1
-os:
-- osx
+node_js: 7
+cache:
+  directories:
+    - node_modules
 before_script:
 - node --version
 - npm --version
 - npm install -g grunt-cli
 script:
-- grunt test-travis --verbose
+- npm run test-travis
 before_deploy:
 - npm install
-- grunt build
-- grunt dist --verbose
+- npm run build
+- npm run dist
 deploy:
   provider: npm
   email: ashdevfr@gmail.com
@@ -22,4 +23,4 @@ deploy:
     tags: true
     branch: develop
 after_success:
-- grunt coveralls:travis
+- npm run coveralls

package.json

@@ -16,39 +16,49 @@
     "email": "<susukang98@gmail.com>"
   },
   "main": "dist/summernote.js",
+  "scripts": {
+    "start": "grunt server",
+    "test": "grunt test",
+    "build": "grunt build",
+    "dist": "grunt dist",
+    "test-travis": "grunt test-travis --verbose",
+    "test-saucelabs": "grunt saucelabs-test",
+    "coveralls": "grunt coveralls:travis"
+  },
   "devDependencies": {
     "chai": "^3.2.0",
     "chai-spies": "^0.7.1",
     "grunt": "*",
-    "grunt-contrib-clean": "^0.7.0",
+    "grunt-cli": "*",
+    "grunt-contrib-clean": "^1.1.0",
     "grunt-contrib-compress": "*",
     "grunt-contrib-connect": "*",
-    "grunt-contrib-copy": "^0.8.2",
-    "grunt-contrib-jshint": "0.7.2",
-    "grunt-contrib-uglify": "~0.2.2",
+    "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-jshint": "1.1.0",
+    "grunt-contrib-uglify": "~2.2.0",
     "grunt-contrib-watch": "*",
     "grunt-coveralls": "^1.0.0",
-    "grunt-exec": "^0.4.6",
-    "grunt-jscs": "^2.6.0",
-    "grunt-karma": "^0.12.0",
+    "grunt-exec": "^2.0.0",
+    "grunt-jscs": "^3.0.1",
+    "grunt-karma": "^2.0.0",
     "grunt-recess": "*",
     "grunt-saucelabs": "*",
     "grunt-webfont": "^1.0.2",
-    "karma": "^1.3.0",
+    "karma": "1.5.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.1.1",
-    "karma-firefox-launcher": "^1.0.0",
+    "karma-firefox-launcher": "^1.0.1",
     "karma-ie-launcher": "^1.0.0",
     "karma-mocha": "^1.3.0",
     "karma-opera-launcher": "^1.0.0",
-    "karma-phantomjs-launcher": "^1.0.2",
+    "karma-phantomjs-launcher": "^1.0.4",
     "karma-requirejs": "^1.1.0",
     "karma-safari-launcher": "^1.0.0",
     "karma-sauce-launcher": "^1.1.0",
-    "load-grunt-tasks": "0.2.0",
-    "mocha": "^2.3.4",
-    "open": "0.0.4",
-    "phantomjs": "^2.1.7",
+    "load-grunt-tasks": "3.5.2",
+    "mocha": "^3.2.0",
+    "open": "0.0.5",
+    "phantomjs-prebuilt": "^2.1.7",
     "requirejs": "^2.1.22"
   }
 }

test/karma.conf.js

@@ -20,13 +20,17 @@ module.exports = function (config) {
     ],
     // Chrome, ChromeCanary, Firefox, Opera, Safari, PhantomJS, IE
     browsers: ['Chrome'],
-    captureTimeout: 60000,
     singleRun: false,
     preprocessors: { 'src/js/**/!(app|intro|outro).js': 'coverage' },
     coverageReporter: {
       type: 'lcov',
       dir: 'test/coverage/',
       includeAllSources: true
-    }
+    },
+    retryLimit: 5,
+    browserDisconnectTolerance: 5,
+    browserNoActivityTimeout: 60000,
+    browserDisconnectTimeout: 30000,
+    captureTimeout: 60000
   });
 };