MDL-49412 User Navigation: Behat fixes for editors

Part of MDL-45774

diff --git a/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature b/lib/editor/atto/plugins/accessibilitychecker/tests/behat/accessibilitychecker.feature
index 3090b0d..fc41ab7 100644 (file)
--- 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 "<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"
@@ -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 "<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"
@@ -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 "<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"
@@ -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 "<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"
@@ -57,7 +61,8 @@ Feature: Atto accessibility checker
   @javascript
   Scenario: Table missing row/column headers
     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 "<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"
@@ -66,7 +71,8 @@ Feature: Atto accessibility checker
   @javascript
   Scenario: Table missing caption
     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 "<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"

diff --git a/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature b/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature
index a633fd2..63fe6af 100644 (file)
--- a/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature
+++ b/lib/editor/atto/plugins/accessibilityhelper/tests/behat/accessibilityhelper.feature
@@ -5,7 +5,8 @@ Feature: Atto accessibility helper
   @javascript
   Scenario: Images and links
     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 "<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"
@@ -20,7 +21,8 @@ Feature: Atto accessibility helper
   @javascript
   Scenario: Styles
     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 "<p>Some plain text</p>"
     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 6095ec5..59b635e 100644 (file)
--- 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 "<p>Fascism</p>"
-    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 "<p>Communism</p>"
-    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 "<p>United Future</p>"
-    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 72d7730..ef5128c 100644 (file)
--- 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 "<b>Badger</b>"
 
   @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 "<b>Mouse</b>"
     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 834babc..38720e4 100644 (file)
--- 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 "<p>1980 Mullet</p>"
     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 b701da3..d285766 100644 (file)
--- 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 "<i>Pisa"
 

diff --git a/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature b/lib/editor/atto/plugins/collapse/tests/behat/collapse.feature
index ab37d18..f72b296 100644 (file)
--- 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 b981c2e..4233ae7 100644 (file)
--- 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 "<p>Equation test</p>"
     # 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 "<p>\( \pi \)</p>"
     # 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 35f02fc..f1b7fbf 100644 (file)
--- 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 "<p style=\"color: blue;\">Smurf</p>"
     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 b7bed96..d0b1ddf 100644 (file)
--- 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 "<p>Image test</p>"
+    And I follow "My profile" in the user menu
+    And I follow "Edit profile"
+    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"
     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 "<p>Image: <img src='/nothing/here'>.</p>"
     And I select the text in the "Description" Atto editor
     When I click on "Image" "button"
@@ -65,4 +67,4 @@ Feature: Add images to Atto
     And the field "Enter URL" matches value "/nothing/again"
     And the field "Width" matches value "123"
     And the field "Height" matches value "456"
-    And the field "Describe this image" matches value "Awesome!"
\ No newline at end of file
+    And the field "Describe this image" matches value "Awesome!"

diff --git a/lib/editor/atto/plugins/indent/tests/behat/indent.feature b/lib/editor/atto/plugins/indent/tests/behat/indent.feature
index 212d7c0..d4123a8 100644 (file)
--- a/lib/editor/atto/plugins/indent/tests/behat/indent.feature
+++ b/lib/editor/atto/plugins/indent/tests/behat/indent.feature
@@ -5,26 +5,34 @@ Feature: Indent text in Atto
   @javascript
   Scenario: Indent
     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 "<p>I need some space.</p>"
-    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 "<p>I need some space.</p>"
-    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 3efcea7..f2c020e 100644 (file)
--- 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 "<i>Tower of Pisa</i>"
 
   @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 "<i>GHD - for hair</i>"
     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 444213b..f42a660 100644 (file)
--- 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</a>"
 

diff --git a/lib/editor/atto/plugins/media/tests/behat/media.feature b/lib/editor/atto/plugins/media/tests/behat/media.feature
index fb5232a..29ce9ab 100644 (file)
--- 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 "<p>Media test</p>"
     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 5e77c79..de98d57 100644 (file)
--- 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<br/> Life is good 'cause everything's awesome<br/>"
-    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 "Ordered list" "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 "<ol><li>Have you heard the news everyone's talking"
 

diff --git a/lib/editor/atto/plugins/strike/tests/behat/strike.feature b/lib/editor/atto/plugins/strike/tests/behat/strike.feature
index f919947..e97d362 100644 (file)
--- a/lib/editor/atto/plugins/strike/tests/behat/strike.feature
+++ b/lib/editor/atto/plugins/strike/tests/behat/strike.feature
@@ -5,13 +5,17 @@ Feature: Atto strike button
   @javascript
   Scenario: Strike 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 "MUA"
-    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"
     When I click on "Strike through" "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 "<strike>MUA</strike>"
 

diff --git a/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature b/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature
index bc59778..1c408dd 100644 (file)
--- a/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature
+++ b/lib/editor/atto/plugins/subscript/tests/behat/subscript.feature
@@ -5,13 +5,17 @@ Feature: Atto subscript button
   @javascript
   Scenario: Subscript 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 "Submarine"
-    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"
     When I click on "Subscript" "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 "<sub>Submarine</sub>"
 

diff --git a/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature b/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature
index 703fd96..8d58f91 100644 (file)
--- a/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature
+++ b/lib/editor/atto/plugins/superscript/tests/behat/superscript.feature
@@ -5,13 +5,17 @@ Feature: Atto superscript button
   @javascript
   Scenario: Subscript 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 "Helicopter"
-    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"
     When I click on "Superscript" "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 "<sup>Helicopter</sup>"
 

diff --git a/lib/editor/atto/plugins/table/tests/behat/table.feature b/lib/editor/atto/plugins/table/tests/behat/table.feature
index 2915445..05c2d23 100644 (file)
--- a/lib/editor/atto/plugins/table/tests/behat/table.feature
+++ b/lib/editor/atto/plugins/table/tests/behat/table.feature
@@ -5,9 +5,8 @@ Feature: Atto tables
   @javascript
   Scenario: Create a table
     Given I log in as "admin"
-    And I am on homepage
-    And I expand "My profile" node
-    And I expand "Blogs" node
+    And 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 "Entry title" to "How to make a table"
     And I set the field "Blog entry body" to "Table test"
@@ -22,9 +21,8 @@ Feature: Atto tables
   @javascript
   Scenario: Edit a table
     Given I log in as "admin"
-    And I am on homepage
-    And I expand "My profile" node
-    And I expand "Blogs" node
+    And 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 "Entry title" to "How to make a table"
     And I set the field "Blog entry body" to "<table><tr><td>Cell</td></tr></table>"

diff --git a/lib/editor/atto/plugins/title/tests/behat/title.feature b/lib/editor/atto/plugins/title/tests/behat/title.feature
index 4a6de33..bb58b70 100644 (file)
--- a/lib/editor/atto/plugins/title/tests/behat/title.feature
+++ b/lib/editor/atto/plugins/title/tests/behat/title.feature
@@ -5,13 +5,17 @@ Feature: Atto title
   @javascript
   Scenario: Create a heading
     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 "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"
     When I click on "Heading (large)" "link"
     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 "<h3>How The Rock"
 

diff --git a/lib/editor/atto/plugins/underline/tests/behat/underline.feature b/lib/editor/atto/plugins/underline/tests/behat/underline.feature
index c2d532b..8bf06d9 100644 (file)
--- a/lib/editor/atto/plugins/underline/tests/behat/underline.feature
+++ b/lib/editor/atto/plugins/underline/tests/behat/underline.feature
@@ -5,13 +5,17 @@ Feature: Atto underline button
   @javascript
   Scenario: Underline 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 "Deprecated HTML Tag"
-    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"
     When I click on "Underline" "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 "<u>Deprecated HTML Tag</u>"
 

diff --git a/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature b/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature
index 30a8b90..590461b 100644 (file)
--- a/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature
+++ b/lib/editor/atto/plugins/unorderedlist/tests/behat/unorderedlist.feature
@@ -5,12 +5,16 @@ Feature: Atto unordered 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 "Things, dogs, clogs, they're awesome<br/> Rocks, clocks, and socks, they're awesome<br/> Figs, and wigs, and twigs, that's awesome<br/> Everything you see or think or say is awesome"
-    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 "Unordered list" "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 "<ul><li>Things, dogs, clogs"
 

diff --git a/lib/editor/tinymce/tests/behat/edit_available_icons.feature b/lib/editor/tinymce/tests/behat/edit_available_icons.feature
index 131749e..c9cbdc7 100644 (file)
--- a/lib/editor/tinymce/tests/behat/edit_available_icons.feature
+++ b/lib/editor/tinymce/tests/behat/edit_available_icons.feature
@@ -1,4 +1,4 @@
-@editor @editor_tinymce
+@editor @editor_tinymce @javascript
 Feature: Add or remove items from the TinyMCE editor toolbar
   In order to customize the TinyMCE editor appearance
   As an admin
@@ -9,16 +9,16 @@ Feature: Add or remove items from the TinyMCE editor toolbar
       | fullname | shortname | category |
       | Course 1 | C1 | 0 |
     And I log in as "admin"
-    And I navigate to "Edit profile" node in "My profile settings"
+    And I follow "My preferences" in the user menu
+    And I follow "Editor preferences"
     And I set the field "Text editor" to "TinyMCE HTML editor"
-    And I press "Update profile"
+    And I press "Save changes"
     And I follow "Home"
 
-  @javascript
   Scenario: Remove icons
     When the following config values are set as admin:
       | customtoolbar | fontselect,fontsizeselect,formatselect,\|,undo,redo,\|,search,replace,\|,fullscreen | editor_tinymce |
-    And I am on homepage
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
     And I add a "Database" to section "1"
@@ -26,11 +26,10 @@ Feature: Add or remove items from the TinyMCE editor toolbar
     And "#id_introeditor_tbl .mce_fullscreen" "css_element" should exist
     And I press "Cancel"
 
-  @javascript
   Scenario: Add icons
     When the following config values are set as admin:
       | customtoolbar | fontselect,fontsizeselect,formatselect,\|,undo,redo,\|,search,replace,\|,fullscreen,anchor | editor_tinymce |
-    And I am on homepage
+    And I am on site homepage
     And I follow "Course 1"
     And I turn editing mode on
     And I add a "Database" to section "1"
@@ -38,14 +37,14 @@ Feature: Add or remove items from the TinyMCE editor toolbar
     And "#id_introeditor_tbl .mce_anchor" "css_element" should exist
     And the following config values are set as admin:
       | customtoolbar | fontselect,fontsizeselect,formatselect,\|,undo,redo,\|,search,replace,\|,fullscreen | editor_tinymce |
-    And I am on homepage
+    And I am on site homepage
     And I follow "Course 1"
     And I add a "Database" to section "1"
     And "#id_introeditor_tbl .mce_anchor" "css_element" should not exist
     And I press "Cancel"
 
-  @javascript
   Scenario: Default icons
+    And I am on site homepage
     Given I follow "Course 1"
     And I turn editing mode on
     When I add a "Database" to section "1"