moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-12-10 23:29:06 +01:00
commit ebc77165a4
51 changed files with 991 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mod/assign/tests/behat/file_submission.feature
View file

@ -38,10 +38,10 @@ Feature: In an assignment, students can upload files for assessment
And I should see "Not graded"
And I press "Edit submission"
And I upload "lib/tests/fixtures/upload_users.csv" file to "File submissions" filemanager
And ".ffilemanager .fm-maxfiles .fp-btn-add" "css_element" should exists
And ".ffilemanager .fm-maxfiles .fp-btn-add" "css_element" should not be visible
And I press "Save changes"
And I should see "Submitted for grading"
And I should see "empty.txt"
And I should see "upload_users.csv"
And I press "Edit submission"
And ".ffilemanager .fm-maxfiles .fp-btn-add" "css_element" should exists
And ".ffilemanager .fm-maxfiles .fp-btn-add" "css_element" should not be visible

1
mod/forum/tests/behat/add_forum.feature
View file

@ -25,5 +25,4 @@ Feature: Add forum activities and discussions
When I add a new discussion to "Test forum name" forum with:
| Subject | Forum post 1 |
| Message | This is the body |
And I wait "6" seconds
Then I should see "Test forum name"

3
mod/forum/tests/behat/edit_post_teacher.feature
View file

@ -41,7 +41,6 @@ Feature: Teachers can edit or delete any forum post
And I follow "Teacher post subject"
And I click on "Delete" "link" in the "//div[contains(concat(' ', normalize-space(@class), ' '), ' forumpost ')][contains(., 'Student post subject')]" "xpath_element"
And I press "Continue"
And I wait "4" seconds
Then I should not see "Student post subject"
And I should not see "Student post message"
@ -56,7 +55,7 @@ Feature: Teachers can edit or delete any forum post
And I fill the moodle form with:
| Subject | Edited student subject |
And I press "Save changes"
And I wait "4" seconds
And I wait to be redirected
Then I should see "Edited student subject"
And I should see "Edited by Teacher 1 - original submission"

23
mod/forum/tests/behat/track_read_posts.feature
View file

@ -30,7 +30,6 @@ Feature: A teacher can set one of 3 possible options for tracking read forum pos
And I add a new discussion to "Test forum name" forum with:
| Subject | Test post subject |
| Message | Test post message |
And I wait "6" seconds
And I log out
When I log in as "student1"
And I follow "Course 1"
@ -48,19 +47,18 @@ Feature: A teacher can set one of 3 possible options for tracking read forum pos
And I add a new discussion to "Test forum name" forum with:
| Subject | Test post subject |
| Message | Test post message |
And I wait "6" seconds
And I log out
When I log in as "student1"
And I follow "Course 1"
Then I should see "1 unread post"
And I follow "Test forum name"
And I follow "Don't track unread posts"
And I wait "4" seconds
And I wait to be redirected
And I follow "Course 1"
And I should not see "1 unread post"
And I follow "Test forum name"
And I follow "Track unread posts"
And I wait "4" seconds
And I wait to be redirected
And I follow "1"
And I follow "Course 1"
And I should not see "1 unread post"
@ -75,7 +73,6 @@ Feature: A teacher can set one of 3 possible options for tracking read forum pos
And I add a new discussion to "Test forum name" forum with:
| Subject | Test post subject |
| Message | Test post message |
And I wait "6" seconds
And I log out
When I log in as "student2"
And I follow "Course 1"
@ -85,7 +82,7 @@ Feature: A teacher can set one of 3 possible options for tracking read forum pos
@javascript
Scenario: Tracking forum posts forced with user tracking on
And I set the following administration settings values:
Given I set the following administration settings values:
| Allow forced read tracking | 1 |
And I follow "Home"
And I follow "Course 1"
@ -97,7 +94,6 @@ Feature: A teacher can set one of 3 possible options for tracking read forum pos
And I add a new discussion to "Test forum name" forum with:
| Subject | Test post subject |
| Message | Test post message |
And I wait "6" seconds
And I log out
When I log in as "student1"
And I follow "Course 1"
@ -110,7 +106,7 @@ Feature: A teacher can set one of 3 possible options for tracking read forum pos
@javascript
Scenario: Tracking forum posts forced with user tracking off
And I set the following administration settings values:
Given I set the following administration settings values:
| Allow forced read tracking | 1 |
And I follow "Home"
And I follow "Course 1"
@ -122,7 +118,6 @@ Feature: A teacher can set one of 3 possible options for tracking read forum pos
And I add a new discussion to "Test forum name" forum with:
| Subject | Test post subject |
| Message | Test post message |
And I wait "6" seconds
And I log out
When I log in as "student2"
And I follow "Course 1"
@ -135,7 +130,7 @@ Feature: A teacher can set one of 3 possible options for tracking read forum pos
@javascript
Scenario: Tracking forum posts forced (with force disabled) with user tracking on
And I set the following administration settings values:
Given I set the following administration settings values:
| Allow forced read tracking | 1 |
And I follow "Home"
And I follow "Course 1"
@ -147,7 +142,6 @@ Feature: A teacher can set one of 3 possible options for tracking read forum pos
And I add a new discussion to "Test forum name" forum with:
| Subject | Test post subject |
| Message | Test post message |
And I wait "6" seconds
And I set the following administration settings values:
| Allow forced read tracking | 0 |
And I log out
@ -156,19 +150,19 @@ Feature: A teacher can set one of 3 possible options for tracking read forum pos
Then I should see "1 unread post"
And I follow "Test forum name"
And I follow "Don't track unread posts"
And I wait "4" seconds
And I wait to be redirected
And I follow "Course 1"
And I should not see "1 unread post"
And I follow "Test forum name"
And I follow "Track unread posts"
And I wait "4" seconds
And I wait to be redirected
And I follow "1"
And I follow "Course 1"
And I should not see "1 unread post"
@javascript
Scenario: Tracking forum posts forced (with force disabled) with user tracking off
And I set the following administration settings values:
Given I set the following administration settings values:
| Allow forced read tracking | 1 |
And I follow "Home"
And I follow "Course 1"
@ -180,7 +174,6 @@ Feature: A teacher can set one of 3 possible options for tracking read forum pos
And I add a new discussion to "Test forum name" forum with:
| Subject | Test post subject |
| Message | Test post message |
And I wait "6" seconds
And I set the following administration settings values:
| Allow forced read tracking | 0 |
And I log out

5
mod/scorm/tests/behat/add_scorm.feature
View file

@ -1,4 +1,4 @@
@mod @mod_scorm
@mod @mod_scorm @_only_local @_switch_frame
Feature: Add scorm activity
In order to let students access a scorm package
As a teacher
@ -21,10 +21,10 @@ Feature: Add scorm activity
And I follow "Course 1"
And I turn editing mode on
And I add a "SCORM package" to section "1"
And I upload "mod/scorm/tests/packages/singlescobasic.zip" file to "Package file" filemanager
And I fill the moodle form with:
| Name | Awesome SCORM package |
| Description | Description |
And I upload "mod/scorm/tests/packages/singlescobasic.zip" file to "Package file" filemanager
And I click on "Save and display" "button"
Then I should see "Awesome SCORM package"
And I should see "Normal"
@ -35,7 +35,6 @@ Feature: Add scorm activity
And I follow "Awesome SCORM package"
And I should see "Normal"
And I press "Enter"
And I wait "5" seconds
And I switch to "scorm_object" iframe
And I switch to "contentFrame" iframe
And I should see "Play of the game"

30
mod/wiki/module.js
View file

@ -38,21 +38,23 @@ M.mod_wiki.init = function(Y, args) {
});
new WikiHelper(args);
};
M.mod_wiki.renew_lock = function(Y, args) {
function renewLock() {
var args = {};
args['sesskey'] = M.cfg.sesskey;
args['pageid'] = wiki.pageid;
if (wiki.section) {
args['section'] = wiki.section;
}
var callback = {};
Y.use('yui2-connection', function(Y) {
Y.YUI2.util.Connect.asyncRequest('GET', 'lock.php?' + build_querystring(args), callback);
});
M.mod_wiki.renew_lock = function() {
var args = {
sesskey: M.cfg.sesskey,
pageid: wiki.pageid
};
if (wiki.section) {
args.section = wiki.section;
}
setInterval(renewLock, wiki.renew_lock_timeout * 1000);
}
YUI().use('io', function(Y) {
function renewLock() {
Y.io('lock.php?' + build_querystring(args), {
method: 'POST'
});
}
setInterval(renewLock, wiki.renew_lock_timeout * 1000);
});
};
M.mod_wiki.history = function(Y, args) {
var compare = false;
var comparewith = false;

3
mod/wiki/tests/behat/preview_page.feature
View file

@ -32,7 +32,8 @@ Feature: Edited wiki pages may be previewed before saving
And I fill the moodle form with:
| HTML format | Student page contents to be previewed |
And I press "Preview"
Then I should see "This is a preview. Changes have not been saved yet"
Then I expand all fieldsets
And I should see "This is a preview. Changes have not been saved yet"
And I should see "Student page contents to be previewed"
And I press "Save"
And I should see "Student page contents to be previewed"