Merge 5dc77a9 into 5d93219

summernote · Dec 22, 2018 · 937580d · 937580d
2 parents 5d93219 + 5dc77a9
commit 937580d
Show file tree

Hide file tree

Showing 30 changed files with 2,569 additions and 2,103 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,12 +11,9 @@ before_install:
 before_script:
 - node --version
 - npm --version
-- if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then node test/e2e/static-server.js & fi
 script:
 - npm run test:travis
-- if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then npm run test:saucelabs; fi
-- if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then npm run test:e2e-saucelabs; fi
-- if [[ $TRAVIS_PULL_REQUEST == "false" ]]; then pkill node; fi
+- npm run test:saucelabs
 before_deploy:
 - npm install
 - npm run build

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -43,7 +43,7 @@ module.exports = function(grunt) {
     'SL_CHROME': {
       base: 'SauceLabs',
       browserName: 'chrome',
-      version: 'latest',
+      version: '70',
       platform: 'windows 8',
     },
     'SL_FIREFOX': {