Commit 07f73600 authored by Rebecca Blundell's avatar Rebecca Blundell

Bug 1667526: Change "Edit this page" to "Edit"

...and change tests that used "Edit this page" too

Change-Id: I5e3e71f880b536af59da6d348384d2de15758e88
parent 1e54fdc4
...@@ -262,7 +262,7 @@ $string['groupviewurltaken'] = 'A page with this URL already exists.'; ...@@ -262,7 +262,7 @@ $string['groupviewurltaken'] = 'A page with this URL already exists.';
$string['editblockspagedescription'] = '<p>Drag and drop content blocks from the tabs below to create your page.</p>'; $string['editblockspagedescription'] = '<p>Drag and drop content blocks from the tabs below to create your page.</p>';
$string['displayview'] = 'Display page'; $string['displayview'] = 'Display page';
$string['editthisview'] = 'Edit this page'; $string['editthisview'] = 'Edit';
$string['expandcontract'] = 'Expand / Contract list of block types'; $string['expandcontract'] = 'Expand / Contract list of block types';
$string['returntoviews'] = 'Return to pages and collections'; $string['returntoviews'] = 'Return to pages and collections';
$string['returntoinstitutionportfolios'] = 'Return to institution pages and collections'; $string['returntoinstitutionportfolios'] = 'Return to institution pages and collections';
......
...@@ -26,7 +26,7 @@ Scenario: Testing that views & collections are collated properly ...@@ -26,7 +26,7 @@ Scenario: Testing that views & collections are collated properly
Given I log in as "UserA" with password "Kupuhipa1" Given I log in as "UserA" with password "Kupuhipa1"
And I choose "Pages and collections" in "Portfolio" from main menu And I choose "Pages and collections" in "Portfolio" from main menu
And I follow "Page UserA_01" And I follow "Page UserA_01"
And I follow "Edit this page" And I follow "Edit"
And I follow "Settings" in the "Toolbar buttons" property And I follow "Settings" in the "Toolbar buttons" property
And I set the following fields to these values: And I set the following fields to these values:
| Anonymise | 1 | | Anonymise | 1 |
......
...@@ -23,6 +23,6 @@ Scenario: Activate page themes setting and edit a page (Bug 1591304) ...@@ -23,6 +23,6 @@ Scenario: Activate page themes setting and edit a page (Bug 1591304)
# Now set a theme as a user and confirm logo changes # Now set a theme as a user and confirm logo changes
Given I log in as "UserA" with password "Kupuhipa1" Given I log in as "UserA" with password "Kupuhipa1"
And I follow "Page UserA_01" And I follow "Page UserA_01"
And I follow "Edit this page" And I follow "Edit"
And I select "Modern" from "viewtheme" And I select "Modern" from "viewtheme"
Then the "div#logo-area" element should contain "/theme/modern/images/site-logo" Then the "div#logo-area" element should contain "/theme/modern/images/site-logo"
...@@ -28,7 +28,7 @@ Scenario: Showing contextual help for pages under menu "Portfolio" (Bug 809297). ...@@ -28,7 +28,7 @@ Scenario: Showing contextual help for pages under menu "Portfolio" (Bug 809297).
And I follow "Close help" And I follow "Close help"
# Pages # Pages
And I follow "Page 01" And I follow "Page 01"
And I follow "Edit this page" And I follow "Edit"
And I click on "Help" And I click on "Help"
Then I should see "Designing your page layout enables you to personalise the way in which your resources and information can be displayed." Then I should see "Designing your page layout enables you to personalise the way in which your resources and information can be displayed."
And I follow "Close help" And I follow "Close help"
......
...@@ -110,7 +110,7 @@ The list of shared pages must take into account of access date (Bug 1374163) ...@@ -110,7 +110,7 @@ The list of shared pages must take into account of access date (Bug 1374163)
Given I log in as "admin" with password "Kupuhipa1" Given I log in as "admin" with password "Kupuhipa1"
And I choose "Groups" from main menu And I choose "Groups" from main menu
And I follow "GroupB" And I follow "GroupB"
And I follow "Edit this page" And I follow "Edit"
And I scroll to the id "column-container" And I scroll to the id "column-container"
And I configure the block "Group portfolios" And I configure the block "Group portfolios"
When I set the following fields to these values: When I set the following fields to these values:
......
...@@ -13,7 +13,7 @@ Scenario: Accessing annotation block (Bug 1443730) ...@@ -13,7 +13,7 @@ Scenario: Accessing annotation block (Bug 1443730)
Given I log in as "admin" with password "Kupuhipa1" Given I log in as "admin" with password "Kupuhipa1"
# Checking if annotation block is available by default # Checking if annotation block is available by default
And I follow "Page admin_01" And I follow "Page admin_01"
And I follow "Edit this page" And I follow "Edit"
And I expand "General" node And I expand "General" node
And I should not see "Annotation" And I should not see "Annotation"
And I display the page And I display the page
......
...@@ -33,7 +33,7 @@ Scenario: When a collection is shared and a page is deleted from the collection ...@@ -33,7 +33,7 @@ Scenario: When a collection is shared and a page is deleted from the collection
# Share page to the group # Share page to the group
And I choose "Pages and collections" in "Portfolio" from main menu And I choose "Pages and collections" in "Portfolio" from main menu
And I follow "Collection UserA_01" And I follow "Collection UserA_01"
And I follow "Edit this page" And I follow "Edit"
And I follow "Share" And I follow "Share"
And I select "GroupA" from "accesslist[0][searchtype]" And I select "GroupA" from "accesslist[0][searchtype]"
And I press "Save" And I press "Save"
......
...@@ -34,7 +34,7 @@ Scenario: Create groups and limit display on profile page (Bug 1426983) ...@@ -34,7 +34,7 @@ Scenario: Create groups and limit display on profile page (Bug 1426983)
# Changing the amount of groups seen in My groups block # Changing the amount of groups seen in My groups block
And I choose "Portfolio" from main menu And I choose "Portfolio" from main menu
And I follow "Profile page" And I follow "Profile page"
And I follow "Edit this page" And I follow "Edit"
And I configure the block "My groups" And I configure the block "My groups"
And I set the following fields to these values: And I set the following fields to these values:
| Maximum number of groups to display | 3 | | Maximum number of groups to display | 3 |
......
...@@ -58,4 +58,4 @@ Scenario: Uploading groups via CSV and editing as an admin (Bug 1420590) ...@@ -58,4 +58,4 @@ Scenario: Uploading groups via CSV and editing as an admin (Bug 1420590)
And I choose "Groups" from main menu And I choose "Groups" from main menu
And I follow "Group awesome sauce" And I follow "Group awesome sauce"
# Making sure I can't edit a group I am not owner of # Making sure I can't edit a group I am not owner of
And I should not see "Edit this page" And I should not see "Edit"
...@@ -42,7 +42,7 @@ Scenario: Copying a group page retains title (Bug 1519374) ...@@ -42,7 +42,7 @@ Scenario: Copying a group page retains title (Bug 1519374)
Scenario: Group homepage basic settings and skins can't be edited - Bug 1718806 Scenario: Group homepage basic settings and skins can't be edited - Bug 1718806
Given I log in as "UserC" with password "Kupuhipa1" Given I log in as "UserC" with password "Kupuhipa1"
When I go to group "GroupA" When I go to group "GroupA"
And I follow "Edit this page" And I follow "Edit"
And I should not see "Settings" And I should not see "Settings"
When I follow "Edit layout" When I follow "Edit layout"
And I should see "Layout" And I should see "Layout"
......
...@@ -33,7 +33,7 @@ Feature: Mahara user permissions in institutions ...@@ -33,7 +33,7 @@ Feature: Mahara user permissions in institutions
Given I log in as "admin" with password "Kupuhipa1" Given I log in as "admin" with password "Kupuhipa1"
And I choose "Pages and collections" in "Institutions" from administration menu And I choose "Pages and collections" in "Institutions" from administration menu
And I follow "Page InstOne_01" And I follow "Page InstOne_01"
And I follow "Edit this page" And I follow "Edit"
And I follow "Share" in the "Toolbar buttons" property And I follow "Share" in the "Toolbar buttons" property
Then the "accesslist[0][searchtype]" select box should contain "Institution One" Then the "accesslist[0][searchtype]" select box should contain "Institution One"
And the "accesslist[0][searchtype]" select box should not contain "Institution Two" And the "accesslist[0][searchtype]" select box should not contain "Institution Two"
...@@ -47,7 +47,7 @@ Feature: Mahara user permissions in institutions ...@@ -47,7 +47,7 @@ Feature: Mahara user permissions in institutions
Given I log in as "UserB" with password "Kupuhipa1" Given I log in as "UserB" with password "Kupuhipa1"
And I choose "Pages and collections" in "Institutions" from administration menu And I choose "Pages and collections" in "Institutions" from administration menu
And I follow "Page InstOne_01" And I follow "Page InstOne_01"
And I follow "Edit this page" And I follow "Edit"
And I follow "Share" in the "Toolbar buttons" property And I follow "Share" in the "Toolbar buttons" property
Then the "accesslist[0][searchtype]" select box should contain "Institution One" Then the "accesslist[0][searchtype]" select box should contain "Institution One"
And the "accesslist[0][searchtype]" select box should contain "Institution Two" And the "accesslist[0][searchtype]" select box should contain "Institution Two"
......
...@@ -91,7 +91,7 @@ Background: ...@@ -91,7 +91,7 @@ Background:
And I should not see "Note" And I should not see "Note"
#Check tags can be deleted from a page - Bug 1715491 #Check tags can be deleted from a page - Bug 1715491
Given I follow "Page UserA_02" Given I follow "Page UserA_02"
And I follow "Edit this page" And I follow "Edit"
And I click on "Settings" in the "Toolbar buttons" property And I click on "Settings" in the "Toolbar buttons" property
And I clear value "orange (1)" from select2 field "settings_tags" And I clear value "orange (1)" from select2 field "settings_tags"
And I press "Save" And I press "Save"
......
...@@ -14,7 +14,7 @@ And the following "pages" exist: ...@@ -14,7 +14,7 @@ And the following "pages" exist:
Scenario: Use content from another note (Bug 1710988) Scenario: Use content from another note (Bug 1710988)
Given I log in as "UserA" with password "Kupuhipa1" Given I log in as "UserA" with password "Kupuhipa1"
And I follow "Page UserA_01" And I follow "Page UserA_01"
And I follow "Edit this page" And I follow "Edit"
And I expand "General" node And I expand "General" node
And I follow "Note" in the "blocktype sidebar" property And I follow "Note" in the "blocktype sidebar" property
And I press "Add" And I press "Add"
......
...@@ -21,7 +21,7 @@ Scenario: Enable/disable external resources in mahara pages ...@@ -21,7 +21,7 @@ Scenario: Enable/disable external resources in mahara pages
And I attach the file "Image2.png" to "files_filebrowser_userfile" And I attach the file "Image2.png" to "files_filebrowser_userfile"
And I choose "Pages and collections" in "Portfolio" from main menu And I choose "Pages and collections" in "Portfolio" from main menu
And I follow "Page UserA_01" And I follow "Page UserA_01"
And I follow "Edit this page" And I follow "Edit"
# Add a "Text" block with an image from file area # Add a "Text" block with an image from file area
And I follow "Text" And I follow "Text"
......
...@@ -64,7 +64,7 @@ Scenario: Creating a Journal, publishing a draft, using tagged entry block ...@@ -64,7 +64,7 @@ Scenario: Creating a Journal, publishing a draft, using tagged entry block
And I press "Save" And I press "Save"
Then I should see "My diary entry two" Then I should see "My diary entry two"
And I go to portfolio page "Page UserA_01" And I go to portfolio page "Page UserA_01"
And I follow "Edit this page" And I follow "Edit"
And I follow "Share" in the "Toolbar buttons" property And I follow "Share" in the "Toolbar buttons" property
And I select "Public" from "accesslist[0][searchtype]" And I select "Public" from "accesslist[0][searchtype]"
And I press "Save" And I press "Save"
......
...@@ -8,7 +8,7 @@ Scenario: Clicking ID's (Bug 1428456) ...@@ -8,7 +8,7 @@ Scenario: Clicking ID's (Bug 1428456)
Given I log in as "admin" with password "Kupuhipa1" Given I log in as "admin" with password "Kupuhipa1"
And I choose "Portfolio" from main menu And I choose "Portfolio" from main menu
And I follow "Profile page" And I follow "Profile page"
And I follow "Edit this page" And I follow "Edit"
# Checking if we can add a block # Checking if we can add a block
And I follow "Text" And I follow "Text"
...@@ -46,7 +46,7 @@ Scenario: Clicking ID's (Bug 1428456) ...@@ -46,7 +46,7 @@ Scenario: Clicking ID's (Bug 1428456)
# Checking that we can delete more than one block (Bug #1511536) # Checking that we can delete more than one block (Bug #1511536)
# We need to leave and return to the page for this # We need to leave and return to the page for this
And I display the page And I display the page
And I follow "Edit this page" And I follow "Edit"
When I delete the block "The Sun Also Rises" When I delete the block "The Sun Also Rises"
Then I should not see "Robert Cohn" Then I should not see "Robert Cohn"
When I delete the block "1984" When I delete the block "1984"
...@@ -87,7 +87,7 @@ Scenario: Profile and dashboard pages basic settings and skins can't be edited - ...@@ -87,7 +87,7 @@ Scenario: Profile and dashboard pages basic settings and skins can't be edited -
# Profile page # Profile page
And I choose "Portfolio" from main menu And I choose "Portfolio" from main menu
And I follow "Profile page" And I follow "Profile page"
And I follow "Edit this page" And I follow "Edit"
And I should not see "Settings" And I should not see "Settings"
And I should see "Edit layout" And I should see "Edit layout"
When I follow "Edit layout" When I follow "Edit layout"
......
...@@ -76,7 +76,7 @@ Scenario: Creating a Journal entry ...@@ -76,7 +76,7 @@ Scenario: Creating a Journal entry
# Adding journal blocks to a page # Adding journal blocks to a page
And I choose "Pages and collections" in "Portfolio" from main menu And I choose "Pages and collections" in "Portfolio" from main menu
And I follow "Page admin_01" And I follow "Page admin_01"
And I follow "Edit this page" And I follow "Edit"
And I expand "Journals" node in the "blocktype sidebar" property And I expand "Journals" node in the "blocktype sidebar" property
And I follow "Tagged journal entries" in the "blocktype sidebar" property And I follow "Tagged journal entries" in the "blocktype sidebar" property
And I press "Add" And I press "Add"
......
Markdown is supported
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