From 7daab4016d8ae98b75221eaf8bac317f011578bd Mon Sep 17 00:00:00 2001 From: David Monllao Date: Fri, 17 May 2013 11:23:05 +0800 Subject: [PATCH 1/2] MDL-39717 behat: Add info to experimental steps definitions JS modal dialogs and drag & drop should be considered experimental as the steps are not working as expected in all OS/browser combinations. --- course/tests/behat/behat_course.php | 4 ++-- lib/tests/behat/behat_general.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/course/tests/behat/behat_course.php b/course/tests/behat/behat_course.php index 2bc6c26d35e..c12a9381941 100644 --- a/course/tests/behat/behat_course.php +++ b/course/tests/behat/behat_course.php @@ -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 to section "(?P\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$/ * @param string $activityname diff --git a/lib/tests/behat/behat_general.php b/lib/tests/behat/behat_general.php index babd6af379f..5a2ba31e04a 100644 --- a/lib/tests/behat/behat_general.php +++ b/lib/tests/behat/behat_general.php @@ -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 From 686279d0478af04b40a1a819be9867d793da9daa Mon Sep 17 00:00:00 2001 From: David Monllao Date: Fri, 17 May 2013 11:24:21 +0800 Subject: [PATCH 2/2] MDL-39717 behat: Removing unstable steps and scenarios --- course/tests/behat/course_controls.feature | 11 ++++------- course/tests/behat/move_activities.feature | 19 ------------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/course/tests/behat/course_controls.feature b/course/tests/behat/course_controls.feature index a243ace4fd5..973c2878904 100644 --- a/course/tests/behat/course_controls.feature +++ b/course/tests/behat/course_controls.feature @@ -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" exists And I click on "Hide" "link" in the "Test forum name 1" activity And "#section-2" "css_element" exists - And I delete "Test forum name 1" activity - And "#section-2" "css_element" 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" exists diff --git a/course/tests/behat/move_activities.feature b/course/tests/behat/move_activities.feature index 591e619b282..6f2e56e5070 100644 --- a/course/tests/behat/move_activities.feature +++ b/course/tests/behat/move_activities.feature @@ -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"