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

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

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-05-21 00:44:05 +02:00
commit 5e1a48df97
4 changed files with 8 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
course/tests/behat/behat_course.php
View file

@ -433,7 +433,7 @@ class behat_course extends behat_base {
}
/**
* Moves the specified activity to the first slot of a section. Editing mode should be on.
* Moves the specified activity to the first slot of a section. This step is experimental when using it in Javascript tests. Editing mode should be on.
*
* @Given /^I move "(?P<activity_name_string>(?:[^"]|\\")*)" activity to section "(?P<section_number>\d+)"$/
* @param string $activityname The activity name
@ -528,7 +528,7 @@ class behat_course extends behat_base {
}
/**
* Deletes the activity or resource specified by it's name. You should be in the course page with editing mode on.
* Deletes the activity or resource specified by it's name. This step is experimental when using it in Javascript tests. You should be in the course page with editing mode on.
*
* @Given /^I delete "(?P<activity_name_string>(?:[^"]|\\")*)" activity$/
* @param string $activityname

11
course/tests/behat/course_controls.feature
View file

@ -4,10 +4,10 @@ Feature: Course activity controls works as expected
As a teacher
I need to edit, hide, show and indent activities inside course sections
# This two scenario outlines contains exactly the same steps, the
# only difference is whether JS is enabled or not; we can not use
# Background sections when using Scenario Outlines because of Behat
# framework restrictions.
# The difference between these two scenario outlines is that one is with
# JS enabled and the other one with JS disabled, also with JS disabled we
# add the delete activity checking; we can not use Background sections
# when using Scenario Outlines because of Behat framework restrictions.
# We are testing:
# * Javascript on and off
@ -61,9 +61,6 @@ Feature: Course activity controls works as expected
And "#section-2" "css_element" <should_see_other_sections> exists
And I click on "Hide" "link" in the "Test forum name 1" activity
And "#section-2" "css_element" <should_see_other_sections> exists
And I delete "Test forum name 1" activity
And "#section-2" "css_element" <should_see_other_sections> exists
And I should not see "Test forum name 1" in the ".region-content" "css_element"
And I duplicate "Test forum name 2" activity editing the new copy with:
| Forum name | Edited test forum name 2 |
And "#section-2" "css_element" <should_see_other_sections> exists

19
course/tests/behat/move_activities.feature
View file

@ -27,25 +27,6 @@ Feature: Activities can be moved between sections
| Forum name | Test forum name |
| Description | Test forum description |
@javascript @_cross_browser
Scenario: Move activities in a single page course with Javascript enabled
When I move "Test forum name" activity to section "2"
And I reload the page
Then I should see "Test forum name" in the "#section-2" "css_element"
And I should not see "Test forum name" in the "#section-1" "css_element"
@javascript @_cross_browser
Scenario: Move activities in the course home with Javascript enabled using paged mode
Given I follow "Edit settings"
And I fill the moodle form with:
| Course layout | Show one section per page |
And I press "Save changes"
When I move "Test forum name" activity to section "2"
# This reload step is added because of drap&drop & yui dd problem
And I reload the page
Then I should see "Test forum name" in the "#section-2" "css_element"
And I should not see "Test forum name" in the "#section-1" "css_element"
Scenario: Move activities in a single page course with Javascript disabled
When I move "Test forum name" activity to section "2"
Then I should see "Test forum name" in the "#section-2" "css_element"

4
lib/tests/behat/behat_general.php
View file

@ -83,7 +83,7 @@ class behat_general extends behat_base {
}
/**
* Accepts the currently displayed alert dialog.
* Accepts the currently displayed alert dialog. This step does not work in all the browsers, consider it experimental.
* @Given /^I accept the currently displayed dialog$/
*/
public function accept_currently_displayed_alert_dialog() {
@ -188,7 +188,7 @@ class behat_general extends behat_base {
}
/**
* Drags and drops the specified element to the specified container. This step is experimental.
* Drags and drops the specified element to the specified container. This step does not work in all the browsers, consider it experimental.
*
* The steps definitions calling this step as part of them should
* manage the wait times by themselves as the times and when the