Merge branch 'master' into webcrypto

2019-01-22 20:11:42 +01:00
parent 5e4c6b5770 48560e3d60
commit e418b083e8
11 changed files with 173 additions and 35 deletions
--- a/js/test/Prompt.js
+++ b/js/test/Prompt.js
@@ -16,7 +16,7 @@ describe('Prompt', function () {
            'string',
            function (password) {
                password = password.replace(/\r+/g, '');
-                var clean = jsdom('', {url: 'ftp://example.com/?0'});
+                var clean = jsdom('', {url: 'ftp://example.com/?0000000000000000'});
                $('body').html(
                    '<div id="passwordmodal" class="modal fade" role="dialog">' +
                    '<div class="modal-dialog"><div class="modal-content">' +