From 9e6005ee392bb423b68731c1557893d4c8965196 Mon Sep 17 00:00:00 2001 From: Bart Butler Date: Thu, 1 Feb 2018 10:34:48 -0800 Subject: [PATCH] auto-scroll browser unit tests --- Gruntfile.js | 3 +-- test/unittests.js | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 0472fa1d..d759d9c1 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -263,7 +263,6 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-clean'); grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-saucelabs'); - grunt.loadNpmTasks('grunt-keepalive'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.registerTask('set_version', function() { @@ -307,6 +306,6 @@ module.exports = function(grunt) { grunt.registerTask('test', ['eslint', 'mochaTest']); grunt.registerTask('coverage', ['mocha_istanbul:coverage']); grunt.registerTask('saucelabs', ['default', 'copy:browsertest', 'connect:test', 'saucelabs-mocha']); - grunt.registerTask('browsertest', ['browserify:openpgp', 'copy:browsertest', 'connect:test', 'keepalive']); + grunt.registerTask('browsertest', ['default', 'copy:browsertest', 'connect:test', 'watch']); }; diff --git a/test/unittests.js b/test/unittests.js index 6af30273..2e07de4b 100644 --- a/test/unittests.js +++ b/test/unittests.js @@ -14,6 +14,7 @@ tests(); + //if (typeof window !== 'undefined') { afterEach(function () { window.scrollTo(0, document.body.scrollHeight); }); } if (options.afterEach) { afterEach(options.afterEach); } if (options.after) { after(options.after); } }); @@ -23,6 +24,9 @@ }; describe('Unit Tests', function () { + + if (typeof window !== 'undefined') { afterEach(function () { window.scrollTo(0, document.body.scrollHeight); }); } + require('./crypto'); require('./general'); require('./worker');