Commit 9c17d3d7 authored by Piers Harding's avatar Piers Harding Committed by Aaron Wells

Bug 1393536: move menus to admin menu

behatnotneeded

Change-Id: I3fc255737f21e4b8f5bc2f06a457f9cdf97e1018
parent 63acb84d
......@@ -128,7 +128,7 @@ $string['missingimplofmeth'] = 'Missing implementation method of "%s"';
$string['cannotfindimplfile'] = 'Cannot find file with external function implementation';
$string['apptokens'] = 'Application connections';
$string['connections'] = 'Connection Manager';
$string['connections'] = 'Connection manager';
$string['servicetokens'] = 'Manage service access tokens';
$string['tokens'] = 'Service access tokens';
$string['users'] = 'Service users';
......@@ -152,6 +152,7 @@ $string['oobinfo'] = 'The following is your verification code that will authoris
$string['instructions'] = 'Instructions';
$string['webservicelogs'] = 'Web services logs';
$string['webservicelogsnav'] = 'Logs';
$string['timetaken'] = 'Time taken';
$string['timelogged'] = 'When';
$string['info'] = 'Info';
......@@ -194,6 +195,7 @@ $string['wsdoc'] = 'Web services documentation';
// testclient
$string['testclient'] = 'Web services test client';
$string['testclientnav'] = 'Test client';
$string['tokenauth'] = 'Token';
$string['userauth'] = 'User';
$string['certauth'] = 'Certificate';
......
......@@ -94,33 +94,33 @@ class PluginAuthWebservice extends PluginAuth {
}
$map = array(
'configextensions/webservices' => array(
'path' => 'configextensions/webservices',
'webservices' => array(
'path' => 'webservices',
'url' => 'webservice/admin/index.php',
'title' => get_string('webservice', 'auth.webservice'),
'weight' => 50,
'weight' => 70,
),
'configextensions/webservices/oauthconfig' => array(
'path' => 'configextensions/webservices/oauthconfig',
'webservices/oauthconfig' => array(
'path' => 'webservices/oauthconfig',
'url' => 'webservice/admin/oauthv1sregister.php',
'title' => get_string('oauth', 'auth.webservice'),
'weight' => 10,
),
'configextensions/webservices/logs' => array(
'path' => 'configextensions/webservices/logs',
'webservices/logs' => array(
'path' => 'webservices/logs',
'url' => 'webservice/admin/webservicelogs.php',
'title' => get_string('webservicelogs', 'auth.webservice'),
'title' => get_string('webservicelogsnav', 'auth.webservice'),
'weight' => 20,
),
'configextensions/webservices/testclient' => array(
'path' => 'configextensions/webservices/testclient',
'webservices/testclient' => array(
'path' => 'webservices/testclient',
'url' => 'webservice/testclient.php',
'title' => get_string('testclient', 'auth.webservice'),
'title' => get_string('testclientnav', 'auth.webservice'),
'weight' => 30,
),
'configextensions/webservices/apps' => array(
'path' => 'configextensions/webservices/apps',
'webservices/apps' => array(
'path' => 'webservices/apps',
'url' => 'webservice/apptokens.php',
'title' => get_string('apptokens', 'auth.webservice'),
'weight' => 40,
......
......@@ -2539,6 +2539,45 @@ function admin_nav() {
'title' => get_string('cleanurls', 'admin'),
'weight' => 40,
),
'webservices' => array(
'path' => 'webservices',
'url' => 'webservice/admin/index.php',
'title' => get_string('webservice', 'auth.webservice'),
'accessibletitle' => get_string('webservice', 'auth.webservice'),
'weight' => 70,
'accesskey' => 'w',
),
'webservices/oauthconfig' => array(
'path' => 'webservices/oauthconfig',
'url' => 'webservice/admin/oauthv1sregister.php',
'title' => get_string('oauth', 'auth.webservice'),
'weight' => 10,
),
'webservices/logs' => array(
'path' => 'webservices/logs',
'url' => 'webservice/admin/webservicelogs.php',
'title' => get_string('webservicelogs', 'auth.webservice'),
'weight' => 20,
),
'webservices/testclient' => array(
'path' => 'webservices/testclient',
'url' => 'webservice/testclient.php',
'title' => get_string('testclient', 'auth.webservice'),
'weight' => 30,
),
'webservices/apps' => array(
'path' => 'webservices/apps',
'url' => 'webservice/apptokens.php',
'title' => get_string('apptokens', 'auth.webservice'),
'weight' => 40,
),
'webservices/connections' => array(
'path' => 'webservices/connections',
'url' => 'webservice/admin/connections.php',
'title' => get_string('connections', 'auth.webservice'),
'weight' => 50,
),
);
// Add the menu items for skins, if that feature is enabled
......
......@@ -102,7 +102,13 @@ Scenario: Clicking randomly around Mahara (Bug: 1426983)
And I choose "HTML filters" in "Extensions"
And I choose "Allowed iframe sources" in "Extensions"
And I choose "Clean URLs" in "Extensions"
And I choose "Web services" in "Extensions"
# Checking Web services Menu and submenu
And I choose "Web services" in "Web services"
And I choose "OAuth" in "Web services"
And I choose "Logs" in "Web services"
And I choose "Test client" in "Web services"
And I choose "Application connections" in "Web services"
And I choose "Connection manager" in "Web services"
# The test should be completed once if Return to site works successfully
And I follow "Return to site"
And I should see "Admin User"
\ No newline at end of file
......@@ -13,7 +13,7 @@ Given the following "users" exist:
Scenario: Turning master switch on
Given I log in as "admin" with password "Kupuhipa1"
And I follow "Administration"
And I choose "Web services" in "Extensions"
And I choose "Web services" in "Web services"
# Turning the master switch on
And I enable the switch "Use web services:"
When I go to "/webservice/testclient.php"
......
......@@ -7,7 +7,7 @@ So I can benefit from the mahara/moodle cross over.
Scenario: Turning Master swtiches and protocol switches on checking test client page is accessible (Bug 1431540)
Given I log in as "admin" with password "Kupuhipa1"
And I follow "Administration"
And I choose "Web services" in "Extensions"
And I choose "Web services" in "Web services"
# Turning the master switch on
And I enable the switch "Use web services:"
# Turning the master switch off so the protocols are disabled
......
......@@ -117,6 +117,7 @@ Scenario: Newly created user can get a copy of the journal (Bug 1472467)
And I set the field "Site journal 1" to "1"
And I select "Others will get their own copy of your journal" from "Block copy permission"
And I press "Save"
And I scroll to the id "main-nav"
And I follow "Share page"
And I select "Registered users" from "accesslist[0][searchtype]"
And I follow "Advanced options"
......
......@@ -129,7 +129,6 @@ Scenario: Checking menu items are available as Admin User (Bug 1467368)
And I should see "HTML filters" in the "#sub-nav" "css_element"
And I should see "Allowed iframe sources" in the "#sub-nav" "css_element"
And I should see "Clean URLs" in the "#sub-nav" "css_element"
And I should see "Web services" in the "#sub-nav" "css_element"
Scenario: Checking menu items are available as Institution Administrator (Bug 1467368)
......
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