Merge branch 'master' into webcrypto

This commit is contained in:
El RIDO 2019-01-22 20:11:42 +01:00
commit e418b083e8
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
11 changed files with 173 additions and 35 deletions

View file

@ -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">' +