diff --git a/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature b/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature index 3090b0d552c..fc41ab77c98 100644 --- a/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature +++ b/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature @@ -5,7 +5,8 @@ Feature: Atto accessibility checker @javascript Scenario: Images with no alt Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" 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" @@ -30,7 +31,8 @@ Feature: Atto accessibility checker @javascript Scenario: Low contrast Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" 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" @@ -39,7 +41,8 @@ Feature: Atto accessibility checker @javascript Scenario: No headings Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" 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" @@ -48,7 +51,8 @@ Feature: Atto accessibility checker @javascript Scenario: Merged cells Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" And I set the field "Description" to "| Breed | Coolness |
|---|---|
| Poodle | NOT COOL |
| Doberman |
| Breed | Coolness |
|---|---|
| Poodle | NOT COOL |
| Doberman | COOL |
| Breed | Coolness |
|---|---|
| Poodle | NOT COOL |
| Doberman | COOL |
Some plain text
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 6095ec53b55..59b635e70c3 100644 --- a/lib/editor/atto/plugins/align/tests/behat/align.feature +++ b/lib/editor/atto/plugins/align/tests/behat/align.feature @@ -5,40 +5,52 @@ Feature: Atto align text @javascript Scenario: Right align some text Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" And I set the field "Description" to "Fascism
" - And I set the field "Text editor" to "Plain text area" And I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor When I click on "Right align" "button" And I press "Update profile" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should see "style=\"text-align:right;\"" @javascript Scenario: Left align some text Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" And I set the field "Description" to "Communism
" - And I set the field "Text editor" to "Plain text area" And I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor When I click on "Right align" "button" And I click on "Left align" "button" And I press "Update profile" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should see "style=\"text-align:left;\"" @javascript Scenario: Center align some text Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" And I set the field "Description" to "United Future
" - And I set the field "Text editor" to "Plain text area" And I click on "Show more buttons" "button" And I select the text in the "Description" Atto editor When I click on "Center" "button" And I press "Update profile" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should see "style=\"text-align:center;\"" diff --git a/lib/editor/atto/plugins/bold/tests/behat/bold.feature b/lib/editor/atto/plugins/bold/tests/behat/bold.feature index 72d77306ce9..ef5128c548d 100644 --- a/lib/editor/atto/plugins/bold/tests/behat/bold.feature +++ b/lib/editor/atto/plugins/bold/tests/behat/bold.feature @@ -5,25 +5,33 @@ Feature: Atto bold button @javascript Scenario: Bold some text Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" - And I set the field "Text editor" to "Plain text area" + And I follow "My profile" in the user menu + And I follow "Edit profile" And I set the field "Description" to "Badger" And I select the text in the "Description" Atto editor When I click on "Bold" "button" And I press "Update profile" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should see "Badger" @javascript Scenario: Unbold some text Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" - And I set the field "Text editor" to "Plain text area" + And I follow "My profile" in the user menu + And I follow "Edit profile" And I set the field "Description" to "Mouse" And I select the text in the "Description" Atto editor When I click on "Bold" "button" And I click on "Bold" "button" And I press "Update profile" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should not see "Mouse" And I should see "Mouse" diff --git a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature index 834babcaeb1..38720e45b9b 100644 --- a/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature +++ b/lib/editor/atto/plugins/charmap/tests/behat/charmap.feature @@ -5,13 +5,17 @@ Feature: Atto charmap button @javascript Scenario: Insert symbols Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" - And I set the field "Text editor" to "Plain text area" + And I follow "My profile" in the user menu + And I follow "Edit profile" 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" And I click on "Insert character" "button" And I click on "a - macron" "button" And I press "Update profile" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should see "ā" diff --git a/lib/editor/atto/plugins/clear/tests/behat/clear.feature b/lib/editor/atto/plugins/clear/tests/behat/clear.feature index b701da3bef4..d2857660740 100644 --- a/lib/editor/atto/plugins/clear/tests/behat/clear.feature +++ b/lib/editor/atto/plugins/clear/tests/behat/clear.feature @@ -5,8 +5,8 @@ Feature: Atto clear button @javascript Scenario: Clear formatting Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" - And I set the field "Text editor" to "Plain text area" + And I follow "My profile" in the user menu + And I follow "Edit profile" And I set the field "Description" to "Pisa" And I select the text in the "Description" Atto editor And I click on "Italic" "button" @@ -14,6 +14,10 @@ Feature: Atto clear button And I select the text in the "Description" Atto editor When I click on "Clear formatting" "button" And I press "Update profile" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should not see "Pisa" diff --git a/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature b/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature index ab37d18d6be..f72b296e6a1 100644 --- a/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature +++ b/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature @@ -5,7 +5,8 @@ Feature: Atto collapse button @javascript Scenario: Toggle toolbar Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" 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 b981c2ef0a1..4233ae71803 100644 --- a/lib/editor/atto/plugins/equation/tests/behat/equation.feature +++ b/lib/editor/atto/plugins/equation/tests/behat/equation.feature @@ -5,7 +5,8 @@ Feature: Atto equation editor @javascript Scenario: Create an equation Given I log in as "admin" - When I navigate to "Edit profile" node in "My profile settings" + When I follow "My profile" in the user menu + And I follow "Edit profile" 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 @@ -17,12 +18,14 @@ Feature: Atto equation editor And I click on "\infty" "button" And I click on "Save equation" "button" And I click on "Update profile" "button" + And I follow "My profile" in the user menu Then "\infty" "text" should exist @javascript Scenario: Edit an equation Given I log in as "admin" - When I navigate to "Edit profile" node in "My profile settings" + When I follow "My profile" in the user menu + And I follow "Edit profile" 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 35f02fce40a..f1b7fbfcb73 100644 --- a/lib/editor/atto/plugins/html/tests/behat/html.feature +++ b/lib/editor/atto/plugins/html/tests/behat/html.feature @@ -5,7 +5,8 @@ Feature: Atto edit HTML @javascript Scenario: Edit the html source Given I log in as "admin" - When I navigate to "Edit profile" node in "My profile settings" + When I follow "My profile" in the user menu + And I follow "Edit profile" 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 b7bed96de35..d0b1ddfad8b 100644 --- a/lib/editor/atto/plugins/image/tests/behat/image.feature +++ b/lib/editor/atto/plugins/image/tests/behat/image.feature @@ -5,11 +5,12 @@ Feature: Add images to Atto @javascript Scenario: Insert an image Given I log in as "admin" - And I navigate to "My private files" node in "My profile" + And I follow "Manage my 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 navigate to "Edit profile" node in "My profile settings" - And I set the field "Description" to "Image test
" + And I follow "My profile" in the user menu + And I follow "Edit profile" + 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" And I click on "Browse repositories..." "button" @@ -49,7 +50,8 @@ Feature: Add images to Atto @javascript Scenario: Manually inserting an image Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" And I set the field "Description" to "Image: .
I need some space.
" - And I set the field "Text editor" to "Plain text area" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" And I click on "Indent" "button" And I press "Update profile" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should see "class=\"editor-indent\"" @javascript Scenario: Indent and outdent Given I log in as "admin" - When I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + When I follow "Edit profile" And I set the field "Description" to "I need some space.
" - And I set the field "Text editor" to "Plain text area" And I select the text in the "Description" Atto editor And I click on "Show more buttons" "button" And I click on "Indent" "button" And I click on "Outdent" "button" And I press "Update profile" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should not see "class=\"editor-indent\"" diff --git a/lib/editor/atto/plugins/italic/tests/behat/italic.feature b/lib/editor/atto/plugins/italic/tests/behat/italic.feature index 3efcea7ba40..f2c020e5598 100644 --- a/lib/editor/atto/plugins/italic/tests/behat/italic.feature +++ b/lib/editor/atto/plugins/italic/tests/behat/italic.feature @@ -5,25 +5,33 @@ Feature: Atto italic button @javascript Scenario: Italicise some text Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" And I set the field "Description" to "Tower of Pisa" - And I set the field "Text editor" to "Plain text area" And I select the text in the "Description" Atto editor When I click on "Italic" "button" And I press "Update profile" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should see "Tower of Pisa" @javascript Scenario: Toggle italics in some text Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" And I set the field "Description" to "GHD - for hair" - And I set the field "Text editor" to "Plain text area" And I select the text in the "Description" Atto editor When I click on "Italic" "button" And I click on "Italic" "button" And I press "Update profile" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should not see "GHD - for hair" And I should see "GHD - for hair" diff --git a/lib/editor/atto/plugins/link/tests/behat/link.feature b/lib/editor/atto/plugins/link/tests/behat/link.feature index 444213b165f..f42a6601ebd 100644 --- a/lib/editor/atto/plugins/link/tests/behat/link.feature +++ b/lib/editor/atto/plugins/link/tests/behat/link.feature @@ -5,11 +5,11 @@ Feature: Add links to Atto @javascript Scenario: Insert a links Given I log in as "admin" - And I navigate to "My private files" node in "My profile" + And I follow "Manage my 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 navigate to "Edit profile" node in "My profile settings" - And I set the field "Text editor" to "Plain text area" + When I follow "My profile" in the user menu + And I follow "Edit profile" 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" @@ -18,6 +18,10 @@ Feature: Add links to Atto And I click on "moodle-logo.png" "link" And I click on "Select this file" "button" And I click on "Update profile" "button" + And I follow "My preferences" in the user menu + And I follow "Editor preferences" + And I set the field "Text editor" to "Plain text area" + And I press "Save changes" And I follow "Edit profile" Then I should see "Super cool" diff --git a/lib/editor/atto/plugins/media/tests/behat/media.feature b/lib/editor/atto/plugins/media/tests/behat/media.feature index fb5232aa52f..29ce9ab0d82 100644 --- a/lib/editor/atto/plugins/media/tests/behat/media.feature +++ b/lib/editor/atto/plugins/media/tests/behat/media.feature @@ -5,12 +5,11 @@ Feature: Add media to Atto @javascript Scenario: Insert some media Given I log in as "admin" - And I navigate to "My private files" node in "My profile" + And I follow "Manage my private files..." And I upload "lib/editor/atto/tests/fixtures/moodle-logo.webm" file to "Files" filemanager And I click on "Save changes" "button" - When I am on homepage - And I expand "My profile" node - And I expand "Blogs" node + When I follow "My profile" in the user menu + And I follow "My blog entries" And I follow "Add a new entry" And I set the field "Blog entry body" to "Media test
" And I select the text in the "Blog entry body" Atto editor diff --git a/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature b/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature index 5e77c793d50..de98d572ba7 100644 --- a/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature +++ b/lib/editor/atto/plugins/orderedlist/tests/behat/orderedlist.feature @@ -5,12 +5,16 @@ Feature: Atto ordered list button @javascript Scenario: Make a list from some text Given I log in as "admin" - And I navigate to "Edit profile" node in "My profile settings" + And I follow "My profile" in the user menu + And I follow "Edit profile" And I set the field "Description" to "Have you heard the news everyone's talking| Cell |