Commit fa46b9e6 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Bug 1866528: Re-order site options page"

parents 92229b13 2ba786b2
This diff is collapsed.
......@@ -360,7 +360,7 @@ $string['siteadminsonly'] = 'Site administrators only';
$string['adminsonly'] = 'Administrators only';
$string['adminsandstaffonly'] = 'Administrators and staff only';
$string['advanced'] = 'Advanced';
$string['allowpublicviews'] = 'Allow public pages';
$string['allowpublicviews1'] = 'Allow public portfolios';
$string['allowpublicviewsdescription2'] = 'People can create portfolios that are accessible to the public rather than only to registered people.';
$string['allowinstitutionpublicviews1'] = 'Allow public institution portfolios';
$string['allowinstitutionpublicviewsdescription3'] = 'Allow institution members to create portfolios that are accessible to the public rather than only to registered people.';
......@@ -1257,13 +1257,13 @@ $string['Advanced'] = 'Advanced';
//admin option fieldset legends
$string['sitesettingslegend'] = 'Site settings';
$string['usersettingslegend'] = 'User settings';
$string['accesssettingslegend'] = 'Access settings';
$string['groupsettingslegend'] = 'Group settings';
$string['searchsettingslegend'] = 'Search settings';
$string['institutionsettingslegend'] = 'Institution settings';
$string['accountsettingslegend'] = 'Account settings';
$string['securitysettingslegend'] = 'Security settings';
$string['generalsettingslegend'] = 'General settings';
$string['sideblocksettingslegend'] = 'Side block settings';
$string['loggingsettingslegend'] = 'Logging settings';
$string['groupname'] = 'Group name';
......
......@@ -13,7 +13,7 @@ defined('INTERNAL') || die();
// Strings for statistics
$string['allowpublicprofiles'] = 'Allow public profiles';
$string['allowpublicviews'] = 'Allow public pages';
$string['allowpublicviews1'] = 'Allow public portfolios';
$string['artefact_type_academicgoal'] = 'Artefact: Academic goals';
$string['artefact_type_academicskill'] = 'Artefact: Academic skills';
$string['artefact_type_address'] = 'Artefact: Postal address';
......
......@@ -1121,6 +1121,34 @@ EOF;
}
}
/**
* Checks, that the first specified element appears before the second one within a container.
*
* @Given :preelement :preselectortype should appear before :postelement :postselectortype within :containelement :containselectortype
* @throws ExpectationException
* @param string $preelement The locator of the preceding element
* @param string $preselectortype The locator of the preceding element
* @param string $postelement The locator of the following element
* @param string $postselectortype The selector type of the following element
* @param string $containelement The locator of the container element
* @param string $containselectortype The selector type of the container element
*/
public function should_appear_before_within($preelement, $preselectortype, $postelement, $postselectortype, $containelement, $containselectortype) {
// Getting the container where the text elements should be found.
$container = $this->get_selected_node($containselectortype, $containelement);
$prexpath = $this->get_node_in_container($preselectortype, $preelement, $containselectortype, $containelement)->getXpath();
$postxpath = $this->get_node_in_container($postselectortype, $postelement, $containselectortype, $containelement)->getXpath();
// Using following xpath axe to find it.
$msg = '"' . $preelement . '" "' . $preselectortype . '" does not appear before "' . $postelement . '" "' . $postselectortype . '" within "' . $containelement . '" "' . $containselectortype . '"';
$xpath = $prexpath . '/following::*[contains(., ' . $postxpath . ')]';
if (!$this->getSession()->getDriver()->find($xpath)) {
throw new ExpectationException($msg, $this->getSession());
}
}
/**
* Checks, that the first specified element appears after the second one.
*
......
......@@ -16,7 +16,7 @@ Scenario: Testing that views & collections are collated properly
# Turn on anonymous pages
Given I log in as "admin" with password "Kupuh1pa!"
And I go to "admin/site/options.php"
And I follow "General settings"
And I follow "Account settings"
And I set the following fields to these values:
| Allow anonymous pages | 1 |
And I press "Update site options"
......
......@@ -88,19 +88,17 @@ Scenario: Admin logs in and checks notification settings (Bug 1388682)
And I choose "Site options" in "Configure site" from administration menu
And I click on "Notification settings"
#see the notification settings in alphabetical order.
# @TODO Need to target the check to the 'notifications' section
# only now that there are two places 'Contact us' appears on the page
# And "Comment" "text" should appear before "Contact us" "text"
And "Contact us" "text" should appear before "Feedback on annotations" "text"
And "Feedback on annotations" "text" should appear before "Group message" "text"
And "Group message" "text" should appear before "Institution message" "text"
And "Institution message" "text" should appear before "Message from other people" "text"
And "Message from other people" "text" should appear before "New forum post" "text"
And "New forum post" "text" should appear before "New page access" "text"
And "New page access" "text" should appear before "Objectionable content" "text"
And "Objectionable content" "text" should appear before "Objectionable content in forum" "text"
And "Objectionable content in forum" "text" should appear before "Repeat virus upload" "text"
And "Repeat virus upload" "text" should appear before "System message" "text"
And "System message" "text" should appear before "Virus flag release" "text"
And "Virus flag release" "text" should appear before "Wall post" "text"
And "Wall post" "text" should appear before "Watchlist" "text"
And "Comment" "text" should appear before "Contact us" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "Contact us" "text" should appear before "Feedback on annotations" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "Feedback on annotations" "text" should appear before "Group message" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "Group message" "text" should appear before "Institution message" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "Institution message" "text" should appear before "Message from other people" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "Message from other people" "text" should appear before "New forum post" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "New forum post" "text" should appear before "New page access" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "New page access" "text" should appear before "Objectionable content" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "Objectionable content" "text" should appear before "Objectionable content in forum" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "Objectionable content in forum" "text" should appear before "Repeat virus upload" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "Repeat virus upload" "text" should appear before "System message" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "System message" "text" should appear before "Virus flag release" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "Virus flag release" "text" should appear before "Wall post" "text" within "#siteoptions_notificationsettings_open" "css_element"
And "Wall post" "text" should appear before "Watchlist" "text" within "#siteoptions_notificationsettings_open" "css_element"
......@@ -19,11 +19,11 @@ Background:
Given I log in as "admin" with password "Kupuh1pa!"
And I choose "Site options" in "Configure site" from administration menu
And I expand the section "User settings"
And I expand the section "Side block settings"
And I enable the switch "Show profile completion"
And I press "Update site options"
Scenario Outline: 1) site admin enables profile completion for the site admin menu > configure site > site options . user settings
Scenario Outline: 1) Site admin enables the side block 'Profile completion' in Admin menu > Configure site > Site options > Side block settings
2) site admin verify sections on the profile completion page
3) site admin verify field options for profile section
4) site admin enable 4 fields
......
......@@ -36,7 +36,7 @@ Scenario: Turning the switches on and off on the "Site options" page (Bug 143156
| SURBL URL blacklist | 1 |
| Disable external resources in HTML | 1 |
| reCAPTCHA on account registration / contact us forms | 1 |
| Allow public pages | 0 |
| Allow public portfolios | 0 |
| Allow public profiles | 0 |
| Allow anonymous pages | 1 |
| Sitemap | 0 |
......
......@@ -16,7 +16,7 @@ Scenario: Activate page themes setting and edit a page (Bug 1591304)
Given I log in as "admin" with password "Kupuh1pa!"
And I choose "Configure site" from administration menu
# I set the page themes option
And I expand the section "User settings"
And I expand the section "Account settings"
And I enable the switch "Authors can choose page themes"
And I press "Update site options"
And I log out
......
......@@ -12,7 +12,7 @@ Background:
Scenario: Making adjustments to the mathslate plugin for mahara (Bug 1472446)
Given I log in as "admin" with password "Kupuh1pa!"
And I choose "Site options" in "Configure site" from administration menu
And I follow "General settings"
And I follow "Site settings"
And I enable the switch "Enable MathJax"
And I press "Update site options"
And I choose "Pages and collections" in "Configure site" from administration menu
......
@javascript @core @blocktype @blocktype_newviews
Feature: Looking at the "Latest Pages" (newviews) block on my dashboard
Feature: Looking at the "Latest changes I can view" (newviews) block on my dashboard
In order to see new pages across the site
So I can know what people are up to
......
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