mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 04:30:15 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dan Poltawski 2013-11-26 14:52:21 +08:00
commit 2bc34d6528
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/tool/behat/tests/behat/basic_actions.feature
View File

@ -18,7 +18,7 @@ Feature: Page contents assertions
When I follow "Overview"
And I wait until the page is ready
And I wait "2" seconds
And I hover ".region-content .generaltable td span" "css_element"
And I hover "#region-main .generaltable td span" "css_element"
Then I should see "I'm the description"
And "Grouping" "select" in the "region-main" "region" should be visible
And "Group" "select" should be visible
@ -26,8 +26,8 @@ Feature: Page contents assertions
And "Change password" "link" should not be visible
And I should see "Filter groups by"
And I should not see "Filter groupssss by"
And I should see "Group members" in the ".region-content table th.c1" "css_element"
And I should not see "Group membersssss" in the ".region-content table th.c1" "css_element"
And I should see "Group members" in the "#region-main table th.c1" "css_element"
And I should not see "Group membersssss" in the "#region-main table th.c1" "css_element"
And I follow "Groups"
And the "#groupeditform #showcreateorphangroupform" "css_element" should be enabled
And the "#groupeditform #showeditgroupsettingsform" "css_element" should be disabled

2
admin/tool/behat/tests/behat/manipulate_forms.feature
View File

@ -32,5 +32,5 @@ Feature: Forms manipulation
Then I should see "Close the quiz"
And I should see "Group mode"
And I should see "Grouping"
And I should not see "Show more..." in the "region-main-box" "region"
And I should not see "Show more..." in the "region-main" "region"
And I should see "Show less..."

2
blocks/tests/behat/configure_block_throughout_site.feature
View File

@ -34,4 +34,4 @@ Feature: Add and configure blocks throughout the site
And I press "Save changes"
And I follow "Course 1"
# The first block matching the pattern should be top-left block
And I should see "Comments" in the "//*[@id='region-pre']/descendant::div[contains(concat(' ', normalize-space(@class), ' '), ' block ')]" "xpath_element"
And I should see "Comments" in the "//*[@id='region-pre' or @id='block-region-side-pre']/descendant::div[contains(concat(' ', normalize-space(@class), ' '), ' block ')]" "xpath_element"

2
blocks/tests/behat/manage_blocks.feature
View File

@ -81,4 +81,4 @@ Feature: Block appearances
| Visible | Yes |
| Region | Right |
And I press "Save changes"
And I should see "Comments" in the "#region-post" "css_element"
And I should see "Comments" in the "//*[@id='region-post' or @id='block-region-side-post']" "xpath_element"

2
course/tests/behat/course_controls.feature
View File

@ -137,7 +137,7 @@ Feature: Course activity controls works as expected
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 should not see "Test forum name 1" in the "#region-main" "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

2
lib/behat/classes/behat_selectors.php
View File

@ -89,7 +89,7 @@ XPATH
.//div[contains(concat(' ', normalize-space(@class), ' '), concat(' ', %locator%, ' '))] | .//div[contains(concat(' ', normalize-space(@class), ' '), ' block ')]/descendant::h2[normalize-space(.) = %locator%]/ancestor::div[contains(concat(' ', normalize-space(@class), ' '), ' block ')]
XPATH
, 'region' => <<<XPATH
.//div[./@id = %locator%]
.//*[self::div | self::section | self::aside][./@id = %locator%]
XPATH
, 'table_row' => <<<XPATH
.//tr[contains(normalize-space(.), %locator%)]

4
mod/wiki/tests/behat/page_history.feature
View File

@ -50,7 +50,7 @@ Feature: A history of each wiki page is available
And I press "Save"
And I follow "History"
# Checking that there are 3 history items (the first one is are th)
And "//div[@class='region-content']/descendant::table/descendant::tr[4]" "xpath_element" should exists
And "//*[@id='region-main']/descendant::table/descendant::tr[4]" "xpath_element" should exists
And I click on "1" "link" in the "Teacher 1" table row
And I should see "First edition"
And I should see "Teacher 1"
@ -61,7 +61,7 @@ Feature: A history of each wiki page is available
And I follow "History"
And I click on "3" "link" in the "Student 2" table row
And I should see "Third edition"
And I should see "Student 2" in the ".region-content" "css_element"
And I should see "Student 2" in the "#region-main" "css_element"
And I follow "History"
And I click on "comparewith" "radio" in the "Student 1" table row
And I click on "compare" "radio" in the "Teacher 1" table row