Commit d09980a8 authored by Sara Arjona's avatar Sara Arjona
Browse files

Merge branch 'MDL-69897' of https://github.com/paulholden/moodle into master

parents 66e3ccea 9cbce685
......@@ -924,10 +924,12 @@ M.form_filemanager.init = function(Y, options) {
}, this);
selectnode.one('.fp-file-delete').on('click', function(e) {
e.preventDefault();
var dialog_options = {};
var dialog_options = {
scope: this,
header: M.util.get_string('confirm', 'moodle'),
};
var params = {};
var fileinfo = this.selectui.fileinfo;
dialog_options.scope = this;
params.filepath = fileinfo.filepath;
if (fileinfo.type == 'folder') {
params.filename = '.';
......
......@@ -172,9 +172,7 @@ class behat_filepicker extends behat_base {
$this->perform_on_element('delete', $exception);
// Yes, we are sure.
// Using xpath + click instead of pressButton as 'Ok' it is a common string.
$okbutton = $this->find('css', 'div.fp-dlg button.fp-dlg-butconfirm');
$okbutton->click();
$this->execute('behat_general::i_click_on_in_the', [get_string('ok'), 'button', get_string('confirm'), 'dialogue']);
}
/**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment