From dcbcc94a515b5f9d000a5b8556c17f0ca522007d Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Tue, 7 Mar 2017 11:06:14 +0800 Subject: [PATCH] MDL-58052 behat: user session function - use to edit current profile --- .../tests/behat/manipulate_forms.feature | 3 +- .../behat/tests/behat/nasty_strings.feature | 3 +- badges/tests/behat/award_badge.feature | 3 +- .../tests/behat/navigate_course_list.feature | 3 +- lib/behat/behat_base.php | 18 +++++++ .../tests/behat/accessibilitychecker.feature | 18 +++---- .../tests/behat/accessibilityhelper.feature | 6 +-- .../plugins/align/tests/behat/align.feature | 9 ++-- .../plugins/bold/tests/behat/bold.feature | 6 +-- .../charmap/tests/behat/charmap.feature | 3 +- .../plugins/clear/tests/behat/clear.feature | 3 +- .../collapse/tests/behat/collapse.feature | 3 +- .../equation/tests/behat/equation.feature | 6 +-- .../plugins/html/tests/behat/html.feature | 3 +- .../plugins/image/tests/behat/image.feature | 6 +-- .../plugins/indent/tests/behat/indent.feature | 6 +-- .../plugins/italic/tests/behat/italic.feature | 6 +-- .../plugins/link/tests/behat/link.feature | 3 +- .../tests/behat/orderedlist.feature | 3 +- .../plugins/strike/tests/behat/strike.feature | 3 +- .../subscript/tests/behat/subscript.feature | 6 +-- .../tests/behat/superscript.feature | 6 +-- .../plugins/title/tests/behat/title.feature | 3 +- .../underline/tests/behat/underline.feature | 3 +- .../tests/behat/unorderedlist.feature | 3 +- lib/tests/behat/behat_navigation.php | 48 +++++++++++++++++++ tag/tests/behat/collections.feature | 3 +- tag/tests/behat/standard_tags.feature | 3 +- user/tests/behat/name_fields.feature | 4 ++ 29 files changed, 111 insertions(+), 82 deletions(-) diff --git a/admin/tool/behat/tests/behat/manipulate_forms.feature b/admin/tool/behat/tests/behat/manipulate_forms.feature index 126a800f6bb..e04c0d67ee8 100644 --- a/admin/tool/behat/tests/behat/manipulate_forms.feature +++ b/admin/tool/behat/tests/behat/manipulate_forms.feature @@ -7,8 +7,7 @@ Feature: Forms manipulation @javascript Scenario: Basic forms manipulation Given I log in as "admin" - And I follow "Preferences" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode When I set the field "First name" to "Field value" And I set the field "Select a country" to "Japan" And I set the field "Unmask" to "1" diff --git a/admin/tool/behat/tests/behat/nasty_strings.feature b/admin/tool/behat/tests/behat/nasty_strings.feature index 4b4120d5011..c0605b86698 100644 --- a/admin/tool/behat/tests/behat/nasty_strings.feature +++ b/admin/tool/behat/tests/behat/nasty_strings.feature @@ -10,8 +10,7 @@ Feature: Transform steps arguments | fullname | shortname | category | | Course 1 | C1 | 0 | And I log in as "admin" - And I follow "Preferences" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode Scenario: Use nasty strings on steps arguments When I set the field "Surname" to "$NASTYSTRING1" diff --git a/badges/tests/behat/award_badge.feature b/badges/tests/behat/award_badge.feature index 508fd420c1e..0ce32c02955 100644 --- a/badges/tests/behat/award_badge.feature +++ b/badges/tests/behat/award_badge.feature @@ -31,8 +31,7 @@ Feature: Award badges And I press "Enable access" And I press "Continue" And I click on "Admin User" "link" - And I follow "Profile" in the open menu - And I follow "Edit profile" + And I open my profile in edit mode And I expand all fieldsets And I set the field "Phone" to "123456789" And I press "Update profile" diff --git a/course/tests/behat/navigate_course_list.feature b/course/tests/behat/navigate_course_list.feature index cabeacecbe1..15f003754d7 100644 --- a/course/tests/behat/navigate_course_list.feature +++ b/course/tests/behat/navigate_course_list.feature @@ -33,8 +33,7 @@ Feature: Browse course list and return back from enrolment page @javascript Scenario: A user can return to the previous page from enrolment page by clicking navigation links When I log in as "user2" - And I follow "Preferences" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I expand "Courses" node And I expand "Sample category" node And I follow "Course 1" diff --git a/lib/behat/behat_base.php b/lib/behat/behat_base.php index 3fd7d2b6b39..60b44be6283 100644 --- a/lib/behat/behat_base.php +++ b/lib/behat/behat_base.php @@ -886,4 +886,22 @@ class behat_base extends Behat\MinkExtension\Context\RawMinkContext { // Look for exceptions. $this->look_for_exceptions(); } + + /** + * Get the actual user in the behat session (note $USER does not correspond to the behat session's user). + * @return mixed + * @throws coding_exception + */ + protected function get_session_user() { + global $DB; + $sid = $this->getSession()->getCookie('MoodleSession'); + if (empty($sid)) { + throw new coding_exception('failed to get moodle session'); + } + $userid = $DB->get_field('sessions', 'userid', ['sid' => $sid]); + if (empty($userid)) { + throw new coding_exception('failed to get user from seession id '.$sid); + } + return $DB->get_record('user', ['id' => $userid]); + } } diff --git a/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature b/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature index 478f50e69ad..ffb71fb7462 100644 --- a/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature +++ b/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature @@ -5,8 +5,7 @@ Feature: Atto accessibility checker @javascript Scenario: Images with no alt Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

Some plain text

Some more text

" When I click on "Show more buttons" "button" And I click on "Accessibility checker" "button" @@ -31,8 +30,7 @@ Feature: Atto accessibility checker @javascript Scenario: Low contrast Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

Hard to read

" When I click on "Show more buttons" "button" And I click on "Accessibility checker" "button" @@ -41,8 +39,7 @@ Feature: Atto accessibility checker @javascript Scenario: No headings Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

Sweet roll oat cake jelly-o macaroon donut oat cake. Caramels macaroon cookie sweet roll croissant cheesecake candy jelly-o. Gummies sugar plum sugar plum gingerbread dessert. Tiramisu bonbon jujubes danish marshmallow cookie chocolate cake cupcake tiramisu. Bear claw oat cake chocolate bar croissant. Lollipop cookie topping liquorice croissant. Brownie cookie cupcake lollipop cupcake cupcake. Fruitcake dessert sweet biscuit dragée caramels marzipan brownie. Chupa chups gingerbread apple pie cookie liquorice caramels carrot cake cookie gingerbread. Croissant candy jelly beans. Tiramisu apple pie dessert apple pie macaroon soufflé. Brownie powder carrot cake chocolate. Tart applicake croissant dragée macaroon chocolate donut.

Jelly beans gingerbread tootsie roll. Sugar plum tiramisu cotton candy toffee pie cotton candy tiramisu. Carrot cake chocolate bar sesame snaps cupcake cake dessert sweet fruitcake wafer. Marshmallow cupcake gingerbread pie sweet candy canes powder gummi bears. Jujubes cake muffin marshmallow candy jelly beans tootsie roll pie. Gummi bears applicake chocolate cake sweet jelly sesame snaps lollipop lollipop carrot cake. Marshmallow cake jelly beans. Jelly beans sesame snaps muffin halvah cookie ice cream candy canes carrot cake. Halvah donut marshmallow tiramisu. Cookie dessert gummi bears. Sugar plum apple pie jelly beans gummi bears tart chupa chups. Liquorice macaroon gummi bears gummies macaroon marshmallow sweet roll cake topping. Lemon drops caramels pie icing danish. Chocolate cake oat cake dessert halvah danish carrot cake apple pie.

" When I click on "Show more buttons" "button" And I click on "Accessibility checker" "button" @@ -51,8 +48,7 @@ Feature: Atto accessibility checker @javascript Scenario: Merged cells Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "
Dogs that look good in pants
BreedCoolness
PoodleNOT COOL
Doberman
" When I click on "Show more buttons" "button" And I click on "Accessibility checker" "button" @@ -61,8 +57,7 @@ Feature: Atto accessibility checker @javascript Scenario: Table missing row/column headers Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "
Dogs that look good in pants
BreedCoolness
PoodleNOT COOL
DobermanCOOL
" When I click on "Show more buttons" "button" And I click on "Accessibility checker" "button" @@ -71,8 +66,7 @@ Feature: Atto accessibility checker @javascript Scenario: Table missing caption Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "
BreedCoolness
PoodleNOT COOL
DobermanCOOL
" When I click on "Show more buttons" "button" And I click on "Accessibility checker" "button" diff --git a/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature b/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature index 2bb6bb46210..d97cc1c6581 100644 --- a/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature +++ b/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature @@ -5,8 +5,7 @@ Feature: Atto accessibility helper @javascript Scenario: Images and links Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

Some plain text

Image 1

Some link text

" And I select the text in the "Description" Atto editor When I click on "Show more buttons" "button" @@ -21,8 +20,7 @@ Feature: Atto accessibility helper @javascript Scenario: Styles Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

Some plain text

" When I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor diff --git a/lib/editor/atto/plugins/align/tests/behat/align.feature b/lib/editor/atto/plugins/align/tests/behat/align.feature index f3f724add7b..4ed22550c74 100644 --- a/lib/editor/atto/plugins/align/tests/behat/align.feature +++ b/lib/editor/atto/plugins/align/tests/behat/align.feature @@ -5,8 +5,7 @@ Feature: Atto align text @javascript Scenario: Right align some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

Fascism

" And I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor @@ -22,8 +21,7 @@ Feature: Atto align text @javascript Scenario: Left align some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

Communism

" And I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor @@ -40,8 +38,7 @@ Feature: Atto align text @javascript Scenario: Center align some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

United Future

" And I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor diff --git a/lib/editor/atto/plugins/bold/tests/behat/bold.feature b/lib/editor/atto/plugins/bold/tests/behat/bold.feature index a1d6316a515..7da6988ff13 100644 --- a/lib/editor/atto/plugins/bold/tests/behat/bold.feature +++ b/lib/editor/atto/plugins/bold/tests/behat/bold.feature @@ -5,8 +5,7 @@ Feature: Atto bold button @javascript Scenario: Bold some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "Badger" And I select the text in the "Description" Atto editor When I click on "Bold" "button" @@ -21,8 +20,7 @@ Feature: Atto bold button @javascript Scenario: Unbold some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "Mouse" And I select the text in the "Description" Atto editor When I click on "Bold" "button" diff --git a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature index f7d648169ab..188bbc7dd72 100644 --- a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature +++ b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature @@ -5,8 +5,7 @@ Feature: Atto charmap button @javascript Scenario: Insert symbols Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

1980 Mullet

" And I select the text in the "Description" Atto editor When I click on "Show more buttons" "button" diff --git a/lib/editor/atto/plugins/clear/tests/behat/clear.feature b/lib/editor/atto/plugins/clear/tests/behat/clear.feature index 1915c7bffba..16e9d0e49b2 100644 --- a/lib/editor/atto/plugins/clear/tests/behat/clear.feature +++ b/lib/editor/atto/plugins/clear/tests/behat/clear.feature @@ -5,8 +5,7 @@ Feature: Atto clear button @javascript Scenario: Clear formatting Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "Pisa" And I select the text in the "Description" Atto editor And I click on "Italic" "button" diff --git a/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature b/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature index 5174ded51b9..dfe8a9231e1 100644 --- a/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature +++ b/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature @@ -5,8 +5,7 @@ Feature: Atto collapse button @javascript Scenario: Toggle toolbar Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode When I click on "Show more buttons" "button" Then "Equation editor" "button" should be visible And I click on "Show fewer buttons" "button" diff --git a/lib/editor/atto/plugins/equation/tests/behat/equation.feature b/lib/editor/atto/plugins/equation/tests/behat/equation.feature index a74efe0bfc6..eaf0d09ecbf 100644 --- a/lib/editor/atto/plugins/equation/tests/behat/equation.feature +++ b/lib/editor/atto/plugins/equation/tests/behat/equation.feature @@ -5,8 +5,7 @@ Feature: Atto equation editor @javascript Scenario: Create an equation Given I log in as "admin" - When I follow "Profile" in the user menu - And I follow "Edit profile" + When I open my profile in edit mode And I set the field "Description" to "

Equation test

" # Set field on the bottom of page, so equation editor dialogue is visible. And I expand all fieldsets @@ -24,8 +23,7 @@ Feature: Atto equation editor @javascript Scenario: Edit an equation Given I log in as "admin" - When I follow "Profile" in the user menu - And I follow "Edit profile" + When I open my profile in edit mode And I set the field "Description" to "

\( \pi \)

" # Set field on the bottom of page, so equation editor dialogue is visible. And I expand all fieldsets diff --git a/lib/editor/atto/plugins/html/tests/behat/html.feature b/lib/editor/atto/plugins/html/tests/behat/html.feature index cf4613415a5..5cfcc1bbf16 100644 --- a/lib/editor/atto/plugins/html/tests/behat/html.feature +++ b/lib/editor/atto/plugins/html/tests/behat/html.feature @@ -5,8 +5,7 @@ Feature: Atto edit HTML @javascript Scenario: Edit the html source Given I log in as "admin" - When I follow "Profile" in the user menu - And I follow "Edit profile" + When I open my profile in edit mode And I set the field "Description" to "

Smurf

" And I click on "Show more buttons" "button" And I click on "HTML" "button" diff --git a/lib/editor/atto/plugins/image/tests/behat/image.feature b/lib/editor/atto/plugins/image/tests/behat/image.feature index 744831de47a..cbbdbef29aa 100644 --- a/lib/editor/atto/plugins/image/tests/behat/image.feature +++ b/lib/editor/atto/plugins/image/tests/behat/image.feature @@ -8,8 +8,7 @@ Feature: Add images to Atto And I follow "Manage private files..." And I upload "lib/editor/atto/tests/fixtures/moodle-logo.png" file to "Files" filemanager And I click on "Save changes" "button" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode When I set the field "Description" to "

Image test

" And I select the text in the "Description" Atto editor And I click on "Image" "button" @@ -52,8 +51,7 @@ Feature: Add images to Atto @javascript Scenario: Manually inserting an image Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

Image: .

" And I select the text in the "Description" Atto editor When I click on "Image" "button" diff --git a/lib/editor/atto/plugins/indent/tests/behat/indent.feature b/lib/editor/atto/plugins/indent/tests/behat/indent.feature index 39827b2c0f0..54d50c6fae5 100644 --- a/lib/editor/atto/plugins/indent/tests/behat/indent.feature +++ b/lib/editor/atto/plugins/indent/tests/behat/indent.feature @@ -5,8 +5,7 @@ Feature: Indent text in Atto @javascript Scenario: Indent Given I log in as "admin" - And I follow "Profile" in the user menu - When I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

I need some space.

" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" @@ -22,8 +21,7 @@ Feature: Indent text in Atto @javascript Scenario: Indent and outdent Given I log in as "admin" - And I follow "Profile" in the user menu - When I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "

I need some space.

" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" diff --git a/lib/editor/atto/plugins/italic/tests/behat/italic.feature b/lib/editor/atto/plugins/italic/tests/behat/italic.feature index cd063f069e7..d2fcae15757 100644 --- a/lib/editor/atto/plugins/italic/tests/behat/italic.feature +++ b/lib/editor/atto/plugins/italic/tests/behat/italic.feature @@ -5,8 +5,7 @@ Feature: Atto italic button @javascript Scenario: Italicise some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "Tower of Pisa" And I select the text in the "Description" Atto editor When I click on "Italic" "button" @@ -21,8 +20,7 @@ Feature: Atto italic button @javascript Scenario: Toggle italics in some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "GHD - for hair" And I select the text in the "Description" Atto editor When I click on "Italic" "button" diff --git a/lib/editor/atto/plugins/link/tests/behat/link.feature b/lib/editor/atto/plugins/link/tests/behat/link.feature index 0a0234adaea..93c028d17cc 100644 --- a/lib/editor/atto/plugins/link/tests/behat/link.feature +++ b/lib/editor/atto/plugins/link/tests/behat/link.feature @@ -8,8 +8,7 @@ Feature: Add links to Atto And I follow "Manage private files..." And I upload "lib/editor/atto/tests/fixtures/moodle-logo.png" file to "Files" filemanager And I click on "Save changes" "button" - When I follow "Profile" in the user menu - And I follow "Edit profile" + When I open my profile in edit mode And I set the field "Description" to "Super cool" And I select the text in the "Description" Atto editor And I click on "Link" "button" diff --git a/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature b/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature index 6c0dbd2b1ab..dc94ca758a7 100644 --- a/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature +++ b/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature @@ -5,8 +5,7 @@ Feature: Atto ordered list button @javascript Scenario: Make a list from some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "Have you heard the news everyone's talking
Life is good 'cause everything's awesome
" And I select the text in the "Description" Atto editor When I click on "Ordered list" "button" diff --git a/lib/editor/atto/plugins/strike/tests/behat/strike.feature b/lib/editor/atto/plugins/strike/tests/behat/strike.feature index dba4d44bb07..1613838b1f0 100644 --- a/lib/editor/atto/plugins/strike/tests/behat/strike.feature +++ b/lib/editor/atto/plugins/strike/tests/behat/strike.feature @@ -5,8 +5,7 @@ Feature: Atto strike button @javascript Scenario: Strike some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "MUA" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" diff --git a/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature b/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature index 9569b07569a..3d4fe5ea494 100644 --- a/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature +++ b/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature @@ -5,8 +5,7 @@ Feature: Atto subscript button @javascript Scenario: Subscript some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "Submarine" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" @@ -22,8 +21,7 @@ Feature: Atto subscript button @javascript Scenario: Subscript some text in enclosed in superscript Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "Submarine" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" diff --git a/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature b/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature index 72ce449397a..658c0d6dd55 100644 --- a/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature +++ b/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature @@ -5,8 +5,7 @@ Feature: Atto superscript button @javascript Scenario: Subscript some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "Helicopter" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" @@ -22,8 +21,7 @@ Feature: Atto superscript button @javascript Scenario: Superscript some text that is enclosed in subscript Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "Helicopter" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" diff --git a/lib/editor/atto/plugins/title/tests/behat/title.feature b/lib/editor/atto/plugins/title/tests/behat/title.feature index 4f36ea82ac5..71486f9f107 100644 --- a/lib/editor/atto/plugins/title/tests/behat/title.feature +++ b/lib/editor/atto/plugins/title/tests/behat/title.feature @@ -5,8 +5,7 @@ Feature: Atto title @javascript Scenario: Create a heading Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "How The Rock Has Made the WWE World Heavyweight Title More Important Than Ever" And I select the text in the "Description" Atto editor When I click on "Paragraph styles" "button" diff --git a/lib/editor/atto/plugins/underline/tests/behat/underline.feature b/lib/editor/atto/plugins/underline/tests/behat/underline.feature index f4dd9917ce5..50f4e9ae804 100644 --- a/lib/editor/atto/plugins/underline/tests/behat/underline.feature +++ b/lib/editor/atto/plugins/underline/tests/behat/underline.feature @@ -5,8 +5,7 @@ Feature: Atto underline button @javascript Scenario: Underline some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "Deprecated HTML Tag" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" diff --git a/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature b/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature index 0c8588cbd47..09f6b5fefaf 100644 --- a/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature +++ b/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature @@ -5,8 +5,7 @@ Feature: Atto unordered list button @javascript Scenario: Make a list from some text Given I log in as "admin" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I set the field "Description" to "Things, dogs, clogs, they're awesome
Rocks, clocks, and socks, they're awesome
Figs, and wigs, and twigs, that's awesome
Everything you see or think or say is awesome" And I select the text in the "Description" Atto editor When I click on "Unordered list" "button" diff --git a/lib/tests/behat/behat_navigation.php b/lib/tests/behat/behat_navigation.php index 63c8af53dd6..bab8ba1e011 100644 --- a/lib/tests/behat/behat_navigation.php +++ b/lib/tests/behat/behat_navigation.php @@ -524,4 +524,52 @@ class behat_navigation extends behat_base { $lastnode = array_pop($parentnodes); $this->select_node_in_navigation($lastnode, $parentnodes); } + + /** + * Opens the current users profile page in edit mode. + * + * @Given /^I open my profile in edit mode$/ + * @throws coding_exception + * @return void + */ + public function i_open_my_profile_in_edit_mode() { + global $USER; + $user = $this->get_session_user(); + $globuser = $USER; + $USER = $user; // We need this set to the behat session user so we can call isloggedin. + $systemcontext = context_system::instance(); + $bodynode = $this->find('xpath', 'body'); + $bodyclass = $bodynode->getAttribute('class'); + $matches = []; + if (preg_match('/(?<=^course-|\scourse-)\d/', $bodyclass, $matches) && !empty($matches)) { + $courseid = intval($matches[0]); + } else { + $courseid = SITEID; + } + if (isloggedin() && !isguestuser($user) && !is_mnet_remote_user($user)) { + if (is_siteadmin($user) || has_capability('moodle/user:update', $systemcontext)) { + $url = new moodle_url('/user/editadvanced.php', array('id' => $user->id, 'course' => SITEID, + 'returnto' => 'profile')); + } else if (has_capability('moodle/user:editownprofile', $systemcontext)) { + $userauthplugin = false; + if (!empty($user->auth)) { + $userauthplugin = get_auth_plugin($user->auth); + } + if ($userauthplugin && $userauthplugin->can_edit_profile()) { + $url = $userauthplugin->edit_profile_url(); + if (empty($url)) { + if (empty($course)) { + $url = new moodle_url('/user/edit.php', array('id' => $user->id, 'returnto' => 'profile')); + } else { + $url = new moodle_url('/user/edit.php', array('id' => $user->id, 'course' => $courseid, + 'returnto' => 'profile')); + } + } + } + } + $this->getSession()->visit($this->locate_path($url->out_as_local_url())); + } + // Restore global user variable. + $USER = $globuser; + } } diff --git a/tag/tests/behat/collections.feature b/tag/tests/behat/collections.feature index ad3dd6994e4..bccb3758182 100644 --- a/tag/tests/behat/collections.feature +++ b/tag/tests/behat/collections.feature @@ -85,8 +85,7 @@ Feature: Managers can create and manage tag collections And I log out Scenario: Moving tags when changing tag collections - And I follow "Preferences" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I expand all fieldsets And I set the field "List of interests" to "Swimming, Tag0, Tag3" And I press "Update profile" diff --git a/tag/tests/behat/standard_tags.feature b/tag/tests/behat/standard_tags.feature index ab40ffd8ba8..0636c42dbff 100644 --- a/tag/tests/behat/standard_tags.feature +++ b/tag/tests/behat/standard_tags.feature @@ -89,8 +89,7 @@ Feature: Manager can add standard tags and change the tag type of existing tags @javascript Scenario: Changing standard tags property of tag area When I log in as "manager1" - And I follow "Profile" in the user menu - And I follow "Edit profile" + And I open my profile in edit mode And I expand all fieldsets And I should not see "Manage standard tags" And I set the following fields to these values: diff --git a/user/tests/behat/name_fields.feature b/user/tests/behat/name_fields.feature index 0678a643205..2091c382459 100644 --- a/user/tests/behat/name_fields.feature +++ b/user/tests/behat/name_fields.feature @@ -27,8 +27,12 @@ Feature: Both first name and surname are always available for every user | username | firstname | lastname | email | | foobar | Foo | Bar | foo@bar.com | And I log in as "foobar" + # UI test covering "I open my profile in edit mode" - + # This should be one of the very few places where we directly call these 2 steps to open the current users profile + # in edit mode, the rest of the time you should use "I open my profile in edit mode" as it is faster. And I follow "Profile" in the user menu And I follow "Edit profile" + # End UI test covering "I open my profile in edit mode" When I set the field "First name" to " " And I set the field "Surname" to " " And I click on "Update profile" "button"