Commit 473efd8d authored by Dan Poltawski's avatar Dan Poltawski
Browse files

Merge branch 'MDL-58052_behat_get_session_user' of https://github.com/gthomas2/moodle

parents d04310cb 353e7876
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
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 "New password" to "TestPass"
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
Scenario: Use nasty strings on steps arguments
When I set the field "Surname" to "$NASTYSTRING1"
......
......@@ -30,9 +30,7 @@ Feature: Award badges
And I should not see "Criteria for this badge have not been set up yet."
And I press "Enable access"
And I press "Continue"
And I click on "Admin User" "link"
And I choose "Profile" in the open action menu
And I click on "Edit profile" "link" in the "region-main" "region"
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"
......
......@@ -42,8 +42,7 @@ Feature: Browse course list and return back from enrolment page
And I press "Save changes"
And I log out
When I log in as "user2"
And I follow "Preferences" in the user menu
And I click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I expand "Courses" node
And I expand "Sample category" node
And I follow "Course 1"
......
......@@ -925,4 +925,23 @@ 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]);
}
}
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<p>Some plain text</p><img src='/broken-image' width='1' height='1'/><p>Some more text</p>"
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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<p style='color: #7c7cff; background-color: #ffffff;'>Hard to read</p>"
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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<p>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.</p><p>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.</p>"
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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<table><caption>Dogs that look good in pants</caption><tr><th>Breed</th><th>Coolness</th></tr><tr><td>Poodle</td><td rowspan='2'>NOT COOL</td></tr><tr><td>Doberman</td></tr></table>"
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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<table><caption>Dogs that look good in pants</caption><tr><th>Breed</th><td>Coolness</td></tr><tr><td>Poodle</td><td>NOT COOL</td></tr><tr><td>Doberman</td><td>COOL</td></tr></table>"
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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<table><tr><th>Breed</th><th>Coolness</th></tr><tr><td>Poodle</td><td>NOT COOL</td></tr><tr><td>Doberman</td><td>COOL</td></tr></table>"
When I click on "Show more buttons" "button"
And I click on "Accessibility checker" "button"
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<p>Some plain text</p><img src='/broken-image' alt='Image 1'/><p><a href='#fsd'>Some link text</a></p>"
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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<p>Some plain text</p>"
When I click on "Show more buttons" "button"
And I select the text in the "Description" Atto editor
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<p>Fascism</p>"
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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<p>Communism</p>"
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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<p>United Future</p>"
And I click on "Show more buttons" "button"
And I select the text in the "Description" Atto editor
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
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 click on "Edit profile" "link" in the "region-main" "region"
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"
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<p>1980 Mullet</p>"
And I select the text in the "Description" Atto editor
When I click on "Show more buttons" "button"
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
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"
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
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"
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
When I open my profile in edit mode
And I set the field "Description" to "<p>Equation test</p>"
# 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 click on "Edit profile" "link" in the "region-main" "region"
When I open my profile in edit mode
And I set the field "Description" to "<p>\( \pi \)</p>"
# Set field on the bottom of page, so equation editor dialogue is visible.
And I expand all fieldsets
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
When I open my profile in edit mode
And I set the field "Description" to "<p style=\"color: blue;\">Smurf</p>"
And I click on "Show more buttons" "button"
And I click on "HTML" "button"
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
When I set the field "Description" to "<p>Image test</p>"
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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<p>Image: <img src='/nothing/here'>.</p>"
And I select the text in the "Description" Atto editor
When I click on "Image" "button"
......
......@@ -22,8 +22,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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "<p>I need some space.</p>"
And I select the text in the "Description" Atto editor
And I click on "Show more buttons" "button"
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
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 click on "Edit profile" "link" in the "region-main" "region"
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"
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
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"
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
And I open my profile in edit mode
And I set the field "Description" to "Have you heard the news everyone's talking<br/> Life is good 'cause everything's awesome<br/>"
And I select the text in the "Description" Atto editor
When I click on "Ordered list" "button"
......
......@@ -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 click on "Edit profile" "link" in the "region-main" "region"
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"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment