Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'MDL-39717_25' of git://github.com/dmonllao/moodle into …

…MOODLE_25_STABLE
  • Loading branch information...
commit e3c1bd25935c5e748a5a29a9c6c3895e2bee4734 2 parents 99f5bad + c340dca
Eloy Lafuente (stronk7) stronk7 authored
4 course/tests/behat/behat_course.php
@@ -433,7 +433,7 @@ public function activity_should_be_hidden($activityname) {
433 433 }
434 434
435 435 /**
436   - * Moves the specified activity to the first slot of a section. Editing mode should be on.
  436 + * 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.
437 437 *
438 438 * @Given /^I move "(?P<activity_name_string>(?:[^"]|\\")*)" activity to section "(?P<section_number>\d+)"$/
439 439 * @param string $activityname The activity name
@@ -528,7 +528,7 @@ public function i_indent_left_activity($activityname) {
528 528 }
529 529
530 530 /**
531   - * Deletes the activity or resource specified by it's name. You should be in the course page with editing mode on.
  531 + * 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.
532 532 *
533 533 * @Given /^I delete "(?P<activity_name_string>(?:[^"]|\\")*)" activity$/
534 534 * @param string $activityname
11 course/tests/behat/course_controls.feature
@@ -4,10 +4,10 @@ Feature: Course activity controls works as expected
4 4 As a teacher
5 5 I need to edit, hide, show and indent activities inside course sections
6 6
7   - # This two scenario outlines contains exactly the same steps, the
8   - # only difference is whether JS is enabled or not; we can not use
9   - # Background sections when using Scenario Outlines because of Behat
10   - # framework restrictions.
  7 + # The difference between these two scenario outlines is that one is with
  8 + # JS enabled and the other one with JS disabled, also with JS disabled we
  9 + # add the delete activity checking; we can not use Background sections
  10 + # when using Scenario Outlines because of Behat framework restrictions.
11 11
12 12 # We are testing:
13 13 # * Javascript on and off
@@ -61,9 +61,6 @@ Feature: Course activity controls works as expected
61 61 And "#section-2" "css_element" <should_see_other_sections> exists
62 62 And I click on "Hide" "link" in the "Test forum name 1" activity
63 63 And "#section-2" "css_element" <should_see_other_sections> exists
64   - And I delete "Test forum name 1" activity
65   - And "#section-2" "css_element" <should_see_other_sections> exists
66   - And I should not see "Test forum name 1" in the ".region-content" "css_element"
67 64 And I duplicate "Test forum name 2" activity editing the new copy with:
68 65 | Forum name | Edited test forum name 2 |
69 66 And "#section-2" "css_element" <should_see_other_sections> exists
19 course/tests/behat/move_activities.feature
@@ -27,25 +27,6 @@ Feature: Activities can be moved between sections
27 27 | Forum name | Test forum name |
28 28 | Description | Test forum description |
29 29
30   - @javascript @_cross_browser
31   - Scenario: Move activities in a single page course with Javascript enabled
32   - When I move "Test forum name" activity to section "2"
33   - And I reload the page
34   - Then I should see "Test forum name" in the "#section-2" "css_element"
35   - And I should not see "Test forum name" in the "#section-1" "css_element"
36   -
37   - @javascript @_cross_browser
38   - Scenario: Move activities in the course home with Javascript enabled using paged mode
39   - Given I follow "Edit settings"
40   - And I fill the moodle form with:
41   - | Course layout | Show one section per page |
42   - And I press "Save changes"
43   - When I move "Test forum name" activity to section "2"
44   - # This reload step is added because of drap&drop & yui dd problem
45   - And I reload the page
46   - Then I should see "Test forum name" in the "#section-2" "css_element"
47   - And I should not see "Test forum name" in the "#section-1" "css_element"
48   -
49 30 Scenario: Move activities in a single page course with Javascript disabled
50 31 When I move "Test forum name" activity to section "2"
51 32 Then I should see "Test forum name" in the "#section-2" "css_element"
4 lib/tests/behat/behat_general.php
@@ -83,7 +83,7 @@ public function switch_to_the_main_window() {
83 83 }
84 84
85 85 /**
86   - * Accepts the currently displayed alert dialog.
  86 + * Accepts the currently displayed alert dialog. This step does not work in all the browsers, consider it experimental.
87 87 * @Given /^I accept the currently displayed dialog$/
88 88 */
89 89 public function accept_currently_displayed_alert_dialog() {
@@ -188,7 +188,7 @@ public function i_click_on_in_the_table_row($element, $selectortype, $tablerowte
188 188 }
189 189
190 190 /**
191   - * Drags and drops the specified element to the specified container. This step is experimental.
  191 + * Drags and drops the specified element to the specified container. This step does not work in all the browsers, consider it experimental.
192 192 *
193 193 * The steps definitions calling this step as part of them should
194 194 * manage the wait times by themselves as the times and when the

0 comments on commit e3c1bd2

Please sign in to comment.
Something went wrong with that request. Please try again.