L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-68576-master' of git://github.com/mihailges/moodle

Browse Source
This commit is contained in:
Sara Arjona
2020-05-11 16:36:59 +02:00
parent d1735204c0 90feebe486
commit 80fd46edfd
3 changed files with 132 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repository/filepicker.js
+4 -2
View File
@@ -390,9 +390,11 @@ YUI.add('moodle-core_filepicker', function(Y) {
div.appendChild(checkboxLabel);
div.appendChild(checkbox);
// Define the selector for the click event handler.
var clickEventSelector = 'tr';
// Enable the selectable checkboxes
if (options.disablecheckboxes != undefined && !options.disablecheckboxes) {
clickEventSelector = 'tr td:not(:first-child)';
cols.unshift({
key: "",
label: div.getContent(),
@@ -411,7 +413,7 @@ YUI.add('moodle-core_filepicker', function(Y) {
}
Y.bind(callback, this)(e, record.getAttrs());
}
}, 'tr td:not(:first-child)', options.callbackcontext, scope.tableview);
}, clickEventSelector, options.callbackcontext, scope.tableview);
if (options.rightclickcallback) {
scope.tableview.delegate('contextmenu', function (e, tableview) {
repository/tests/behat/edit_file.feature
+55
View File
@@ -0,0 +1,55 @@
@core @core_filepicker @_file_upload
Feature: Edit file feature
In order to edit a file
As a user
I need to be able to select the file in filemanager and modify the file information
Background:
Given the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
@javascript
Scenario: Select file from "Files" filemanager using "icons" view and edit the name
Given I log in as "admin"
And I follow "Manage private files"
And I click on "Display folder with file icons" "link" in the ".filemanager" "css_element"
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
And I should see "empty.txt" in the ".fp-content .fp-file" "css_element"
And I click on "//div[contains(concat(' ', normalize-space(@class), ' '), ' fp-file ')]/descendant::a[normalize-space(.)='empty.txt']" "xpath_element"
And I should see "Edit empty.txt"
And I set the following fields to these values:
| Name | empty_edited.txt |
When I click on "Update" "button"
Then I should see "empty_edited.txt" in the ".fp-content .fp-file" "css_element"
And I should not see "empty.txt" in the ".fp-content .fp-file" "css_element"
@javascript
Scenario: Select file from "Files" filemanager using "list" view and edit the name
Given I log in as "admin"
And I follow "Manage private files"
And I click on "Display folder with file details" "link" in the ".filemanager" "css_element"
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
And I should see "empty.txt" in the ".fp-content .fp-filename" "css_element"
And I click on "//span[contains(concat(' ', normalize-space(@class), ' '), ' fp-filename-icon ')]/descendant::a[normalize-space(.)='empty.txt']" "xpath_element"
And I should see "Edit empty.txt"
And I set the following fields to these values:
| Name | empty_edited.txt |
When I click on "Update" "button"
Then I should see "empty_edited.txt" in the ".fp-content .fp-filename" "css_element"
And I should not see "empty.txt" in the ".fp-content .fp-filename" "css_element"
@javascript
Scenario: Select file from "Files" filemanager using "tree" view and edit the name
Given I log in as "admin"
And I follow "Manage private files"
And I click on "Display folder as file tree" "link" in the ".filemanager" "css_element"
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
And I should see "empty.txt" in the ".fp-content .fp-hascontextmenu .fp-filename" "css_element"
And I click on "//span[contains(concat(' ', normalize-space(@class), ' '), ' fp-filename-icon ')]/descendant::a[normalize-space(.)='empty.txt']" "xpath_element"
And I should see "Edit empty.txt"
And I set the following fields to these values:
| Name | empty_edited.txt |
When I click on "Update" "button"
Then I should see "empty_edited.txt" in the ".fp-content .fp-hascontextmenu .fp-filename" "css_element"
And I should not see "empty.txt" in the ".fp-content .fp-hascontextmenu .fp-filename" "css_element"
repository/tests/behat/select_file.feature
+73
View File
@@ -0,0 +1,73 @@
@core @core_filepicker @_file_upload
Feature: Select file feature
In order to add a file to a filearea
As a user
I need to be able to select the file using the file picker
Background:
Given the following "courses" exist:
| fullname | shortname | category |
| Course 1 | C1 | 0 |
@javascript
Scenario: Select a file from the "Recent files" repository using "icons" view
Given I log in as "admin"
And I am on "Course 1" course homepage with editing mode on
And I add a "Folder" to section "1"
And I set the following fields to these values:
| Name | Test folder |
| Description | Test folder description |
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
And I click on "Save and display" "button"
And I follow "Dashboard" in the user menu
And I follow "Manage private files"
And I click on "//label[contains(., 'Files')]/ancestor::div[contains(concat(' ', @class, ' '), ' fitem ')]//*[contains(@title, 'Add...')]" "xpath_element"
And I click on "Recent files" "link" in the ".fp-repo-area" "css_element"
And I click on "Display folder with file icons" "link" in the ".file-picker" "css_element"
And I click on "//a[contains(concat(' ', normalize-space(@class), ' '), ' fp-file ')][normalize-space(.)='empty.txt']" "xpath_element"
And I should see "Select empty.txt"
When I click on "Select this file" "button"
Then I should see "1" elements in "Files" filemanager
And I should see "empty.txt" in the ".fp-content .fp-file" "css_element"
@javascript
Scenario: Select a file from the "Recent files" repository using "list" view
Given I log in as "admin"
And I am on "Course 1" course homepage with editing mode on
And I add a "Folder" to section "1"
And I set the following fields to these values:
| Name | Test folder |
| Description | Test folder description |
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
And I click on "Save and display" "button"
And I follow "Dashboard" in the user menu
And I follow "Manage private files"
And I click on "//label[contains(., 'Files')]/ancestor::div[contains(concat(' ', @class, ' '), ' fitem ')]//*[contains(@title, 'Add...')]" "xpath_element"
And I click on "Recent files" "link" in the ".fp-repo-area" "css_element"
And I click on "Display folder with file details" "link" in the ".file-picker" "css_element"
And I click on "//div[contains(concat(' ', normalize-space(@class), ' '), ' file-picker ')]/descendant::span[normalize-space(.)='empty.txt']/ancestor::a" "xpath_element"
And I should see "Select empty.txt"
When I click on "Select this file" "button"
Then I should see "1" elements in "Files" filemanager
And I should see "empty.txt" in the ".fp-content .fp-file" "css_element"
@javascript
Scenario: Select a file from the "Recent files" repository using "tree" view
Given I log in as "admin"
And I am on "Course 1" course homepage with editing mode on
And I add a "Folder" to section "1"
And I set the following fields to these values:
| Name | Test folder |
| Description | Test folder description |
And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
And I click on "Save and display" "button"
And I follow "Dashboard" in the user menu
And I follow "Manage private files"
And I click on "//label[contains(., 'Files')]/ancestor::div[contains(concat(' ', @class, ' '), ' fitem ')]//*[contains(@title, 'Add...')]" "xpath_element"
And I click on "Recent files" "link" in the ".fp-repo-area" "css_element"
And I click on "Display folder as file tree" "link" in the ".file-picker" "css_element"
And I click on "//div[contains(concat(' ', normalize-space(@class), ' '), ' file-picker ')]/descendant::span[normalize-space(.)='empty.txt']/ancestor::a" "xpath_element"
And I should see "Select empty.txt"
When I click on "Select this file" "button"
Then I should see "1" elements in "Files" filemanager
And I should see "empty.txt" in the ".fp-content .fp-file" "css_element"