Skip to content

Commit 4d93143

Browse files
duncan-at-hiveitduncan-at-hiveit
committed
EES-5838 - replaced admin-specific navigation keywords with generic ones.
1 parent 849c8ea commit 4d93143

12 files changed

+40
-44
lines changed

‎tests/robot-tests/tests/admin/authentication/expired_invitation.robot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Invite user to the service with an unexpired invite via the API
1717
... Analyst
1818

1919
Check that the invite appears on the Invite Users page
20-
user navigates to admin frontend %{ADMIN_URL}/administration/users/invites
20+
user navigates to %{ADMIN_URL}/administration/users/invites
2121
user waits until page contains Invited users
2222
user checks page contains %{EXPIRED_INVITE_USER_EMAIL}
2323

@@ -35,7 +35,7 @@ Check that the invite does not appear on the Invite Users page
3535

3636
Login with an expired invite and assert that the user is redirected to the expired invite page
3737
user opens the browser %{ADMIN_URL}
38-
user navigates to admin frontend
38+
user navigates to admin homepage
3939
user waits until h1 is visible Sign in
4040
user clicks element id:signin-button
4141
user logs in via identity provider
@@ -48,5 +48,5 @@ Check that the user is on the Expired Invite page
4848
user waits until page contains [email protected]
4949

5050
Check that the expired invite is now removed
51-
user navigates to admin frontend
51+
user navigates to admin homepage
5252
user waits until h1 is visible No invitation %{WAIT_MEDIUM}

‎tests/robot-tests/tests/admin/authentication/login_and_logout.robot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Force Tags Admin Local Dev
1111

1212
*** Test Cases ***
1313
Log in as BAU and check the dashboard is looking OK and the sign out buttons are available
14-
user navigates to admin frontend %{ADMIN_URL}/dashboard
14+
user navigates to %{ADMIN_URL}/dashboard
1515
user waits until h1 is visible Sign in
1616
user clicks element id:signin-button
1717
user logs in via identity provider
@@ -26,7 +26,7 @@ Log out using the button in the page header
2626
user waits until page contains title Signed out
2727

2828
Check that logging out via the header link has successfully removed the ability to access the dashboard
29-
user navigates to admin frontend %{ADMIN_URL}/dashboard
29+
user navigates to %{ADMIN_URL}/dashboard
3030
user waits until page contains title Sign in
3131

3232
Log in again and log out using the button in the dashboard
@@ -41,7 +41,7 @@ Log in again and log out using the button in the dashboard
4141
user waits until page contains title Signed out
4242

4343
Check that logging out with the dashboard link has successfully removed the ability to access the dashboard
44-
user navigates to admin frontend %{ADMIN_URL}/dashboard
44+
user navigates to %{ADMIN_URL}/dashboard
4545
user waits until page contains title Sign in
4646

4747
Switch users in the same browser

‎tests/robot-tests/tests/admin/authentication/no_invitation.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Force Tags Admin Local Dev
1111

1212
*** Test Cases ***
1313
Login with a user without any invite or user record and assert that the user is redirected to the No Invitation page
14-
user navigates to admin frontend
14+
user navigates to admin homepage
1515
user waits until h1 is visible Sign in
1616
user clicks element id:signin-button
1717
user logs in via identity provider

‎tests/robot-tests/tests/admin/authentication/redirect_after_login.robot

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Force Tags Admin Local Dev
1111

1212
*** Test Cases ***
1313
Check that a user is redirected to a protected page after being forced to sign in
14-
user navigates to admin frontend %{ADMIN_URL}/administration
14+
user navigates to %{ADMIN_URL}/administration
1515
user waits until h1 is visible Sign in
1616
user clicks element id:signin-button
1717
user logs in via identity provider
@@ -22,7 +22,7 @@ Check that a user is redirected to a protected page after being forced to sign i
2222
Check that a user is redirected to the dashboard if coming directly from the Sign In page
2323
user closes the browser
2424
user opens the browser
25-
user navigates to admin frontend %{ADMIN_URL}/sign-in
25+
user navigates to %{ADMIN_URL}/sign-in
2626
user waits until h1 is visible Sign in
2727
user clicks element id:signin-button
2828
user logs in via identity provider
@@ -33,7 +33,7 @@ Check that a user is redirected to the dashboard if coming directly from the Sig
3333
Check that a user is redirected to the dashboard if coming from the dashboard originally
3434
user closes the browser
3535
user opens the browser
36-
user navigates to admin frontend %{ADMIN_URL}/dashboard
36+
user navigates to %{ADMIN_URL}/dashboard
3737
user waits until h1 is visible Sign in
3838
user clicks element id:signin-button
3939
user logs in via identity provider
@@ -44,7 +44,7 @@ Check that a user is redirected to the dashboard if coming from the dashboard or
4444
Check that a user is shown a Forbidden page if redirected to a protected page that they cannot access after login
4545
user closes the browser
4646
user opens the browser
47-
user navigates to admin frontend %{ADMIN_URL}/administration
47+
user navigates to %{ADMIN_URL}/administration
4848
user waits until h1 is visible Sign in
4949
user clicks element id:signin-button
5050
user logs in via identity provider
@@ -55,7 +55,7 @@ Check that a user is shown a Forbidden page if redirected to a protected page th
5555
Check that a user is shown a Page Not Found page if redirected to a non-existent page after login
5656
user closes the browser
5757
user opens the browser
58-
user navigates to admin frontend %{ADMIN_URL}/sign-in?returnUrl=%2Fnon-existent-page
58+
user navigates to %{ADMIN_URL}/sign-in?returnUrl=%2Fnon-existent-page
5959
user waits until h1 is visible Sign in
6060
user clicks element id:signin-button
6161
user logs in via identity provider

‎tests/robot-tests/tests/admin/authentication/register.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ user closes the browser and delete test user
9797

9898
user opens browser and logs in via Identity Provider
9999
user opens the browser
100-
user navigates to admin frontend
100+
user navigates to admin homepage
101101
user waits until h1 is visible Sign in
102102
user clicks element id:signin-button
103103
user logs in via identity provider

‎tests/robot-tests/tests/admin/bau/adopt_methodology.robot

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ Get pre-release url
127127

128128
Validate methodology appears in prerelease for analyst1
129129
user changes to analyst1
130-
user navigates to admin frontend ${PRERELEASE_URL}
130+
user navigates to ${PRERELEASE_URL}
131131

132132
user clicks link Methodologies
133133
user waits until h1 is visible Methodologies
@@ -151,7 +151,7 @@ Drop adopted Methodology
151151

152152
Validate adopted methodology no longer appears in prerelease
153153
user changes to analyst1
154-
user navigates to admin frontend ${PRERELEASE_URL}
154+
user navigates to ${PRERELEASE_URL}
155155

156156
user clicks link Methodologies
157157
user waits until h1 is visible Methodologies

‎tests/robot-tests/tests/admin/bau/create_data_block_with_chart.robot

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ Validate line chart embeds correctly
598598
user checks chart tooltip item contains ${datablock} 1 Admission Numbers (Nailsea Youngwood): 4,198
599599

600600
Configure basic vertical bar chart
601-
user navigates to admin frontend ${DATABLOCK_URL}
601+
user navigates to ${DATABLOCK_URL}
602602

603603
user waits until h2 is visible ${DATABLOCK_NAME} %{WAIT_MEDIUM}
604604
user waits until page finishes loading
@@ -693,7 +693,7 @@ Save and validate vertical bar chart embeds correctly
693693
user checks chart tooltip item contains ${datablock} 1 Admissions: 4,198
694694

695695
Configure basic horizontal bar chart
696-
user navigates to admin frontend ${DATABLOCK_URL}
696+
user navigates to ${DATABLOCK_URL}
697697
user waits until h2 is visible ${DATABLOCK_NAME} %{WAIT_SMALL}
698698
user waits until page finishes loading
699699

@@ -775,7 +775,7 @@ Save and validate horizontal bar chart embeds correctly
775775
user checks chart tooltip item contains ${datablock} 1 Admissions: 4,198
776776

777777
Configure basic geographic chart
778-
user navigates to admin frontend ${DATABLOCK_URL}
778+
user navigates to ${DATABLOCK_URL}
779779
user waits until h2 is visible ${DATABLOCK_NAME} %{WAIT_SMALL}
780780
user waits until page finishes loading
781781

@@ -932,7 +932,7 @@ Save and validate geographic chart embeds correctly
932932
user checks map chart indicator tile contains ${datablock} Admissions in 2014 9,854
933933

934934
Configure basic infographic chart
935-
user navigates to admin frontend ${DATABLOCK_URL}
935+
user navigates to ${DATABLOCK_URL}
936936

937937
user waits until h2 is visible ${DATABLOCK_NAME}
938938
user waits until page finishes loading
@@ -972,7 +972,7 @@ Delete embedded data block
972972
user clicks button Confirm
973973

974974
Delete chart from data block
975-
user navigates to admin frontend ${DATABLOCK_URL}
975+
user navigates to ${DATABLOCK_URL}
976976
user waits until h2 is visible ${DATABLOCK_NAME}
977977
user waits until page finishes loading
978978
user clicks link Chart

‎tests/robot-tests/tests/admin/bau/manage_users_page.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ${RELEASE_2_NAME}= Academic year 2000/01
2020

2121
*** Test Cases ***
2222
Navigate to manage users page as bau1
23-
user navigates to admin frontend %{ADMIN_URL}/administration/users
23+
user navigates to %{ADMIN_URL}/administration/users
2424
user checks table column heading contains 1 1 Name
2525
user checks table column heading contains 1 2 Email
2626
user checks table column heading contains 1 3 Role

‎tests/robot-tests/tests/admin/bau/prerelease.robot

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ Navigate to prerelease page
133133
${current_url}= get location
134134
${RELEASE_URL}= remove substring from right of string ${current_url} /status
135135
set suite variable ${RELEASE_URL}
136-
user navigates to admin frontend ${RELEASE_URL}/prerelease/content
136+
user navigates to ${RELEASE_URL}/prerelease/content
137137

138138
Validate prerelease has not started
139139
user waits until h1 is visible Pre-release access is not yet available
@@ -148,7 +148,7 @@ Validate prerelease has not started
148148
... Pre-release access will be available from ${start_date} at 00:00 until it is published on ${end_date}.
149149

150150
Go to prerelease access page
151-
user navigates to admin frontend ${RELEASE_URL}/prerelease-access
151+
user navigates to ${RELEASE_URL}/prerelease-access
152152
user waits until h2 is visible Manage pre-release user access
153153

154154
Check the invite emails field is required
@@ -240,7 +240,7 @@ Invite a further list of new users but mixed with existing invitees and accepted
240240

241241
Validate prerelease has not started for Analyst user
242242
user changes to analyst1
243-
user navigates to admin frontend ${RELEASE_URL}/prerelease/content
243+
user navigates to ${RELEASE_URL}/prerelease/content
244244

245245
user waits until h1 is visible Pre-release access is not yet available
246246
user checks breadcrumb count should be 2
@@ -259,7 +259,7 @@ Start prerelease
259259
${month}= get london month date offset_days=1
260260
${month_word}= get london month word offset_days=1
261261
${year}= get london year offset_days=1
262-
user navigates to admin frontend ${RELEASE_URL}/status
262+
user navigates to ${RELEASE_URL}/status
263263
user clicks button Edit release status
264264
user enters text into element id:releaseStatusForm-publishScheduled-day ${day}
265265
user enters text into element id:releaseStatusForm-publishScheduled-month ${month}
@@ -276,7 +276,7 @@ Validate prerelease has started
276276
${current_url}= get location
277277
${RELEASE_URL}= remove substring from right of string ${current_url} /status
278278
set suite variable ${RELEASE_URL}
279-
user navigates to admin frontend ${RELEASE_URL}/prerelease/content
279+
user navigates to ${RELEASE_URL}/prerelease/content
280280

281281
user checks breadcrumb count should be 2
282282
user checks nth breadcrumb contains 1 Home
@@ -394,7 +394,7 @@ Create and validate methodology
394394

395395
approve methodology from methodology view
396396

397-
user navigates to admin frontend ${RELEASE_URL}/prerelease/methodologies
397+
user navigates to ${RELEASE_URL}/prerelease/methodologies
398398
user waits until h1 is visible Methodologies
399399
user waits until page contains ${PUBLICATION_NAME} (Owned)
400400
user clicks link ${PUBLICATION_NAME} (Owned)
@@ -403,7 +403,7 @@ Create and validate methodology
403403

404404
Validate prerelease has started for Analyst user
405405
user changes to analyst1
406-
user navigates to admin frontend ${RELEASE_URL}/prerelease/content
406+
user navigates to ${RELEASE_URL}/prerelease/content
407407

408408
user checks breadcrumb count should be 2
409409
user checks nth breadcrumb contains 1 Home
@@ -515,7 +515,7 @@ Unschedule release
515515
# EES-2826 Cancel scheduled publishing because ReleaseStatus row in table storage isn't removed
516516
# by test theme teardown. Unscheduling prevents an error when the scheduled publishing begins.
517517
user changes to bau1
518-
user navigates to admin frontend ${RELEASE_URL}/status
518+
user navigates to ${RELEASE_URL}/status
519519
user puts release into draft expected_next_release_date=January 2001
520520

521521

‎tests/robot-tests/tests/admin/bau/prerelease_and_amend.robot

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Validate prerelease has not started for Analyst user during amendment as it is s
201201
... /prerelease-access#preReleaseAccess-publicList
202202
set suite variable ${RELEASE_URL}
203203
user changes to analyst1
204-
user navigates to admin frontend ${RELEASE_URL}/prerelease/content
204+
user navigates to ${RELEASE_URL}/prerelease/content
205205
user waits until h1 is visible Forbidden
206206

207207
Approve amendment for a scheduled release and check warning text
@@ -210,7 +210,7 @@ Approve amendment for a scheduled release and check warning text
210210
${month}= get london month date offset_days=2
211211
${month_word}= get london month word offset_days=2
212212
${year}= get london year offset_days=2
213-
user navigates to admin frontend ${RELEASE_URL}/status
213+
user navigates to ${RELEASE_URL}/status
214214
user clicks button Edit release status
215215
user clicks radio Approved for publication
216216
user enters text into element id:releaseStatusForm-internalReleaseNote Approved by prerelease UI tests
@@ -233,7 +233,7 @@ Approve amendment for a scheduled release and check warning text
233233

234234
Validate prerelease window is not yet open for Analyst user
235235
user changes to analyst1
236-
user navigates to admin frontend ${RELEASE_URL}/prerelease/content
236+
user navigates to ${RELEASE_URL}/prerelease/content
237237

238238
user waits until h1 is visible Pre-release access is not yet available
239239
user checks breadcrumb count should be 2
@@ -252,7 +252,7 @@ Start prerelease
252252
${month}= get london month date offset_days=1
253253
${month_word}= get london month word offset_days=1
254254
${year}= get london year offset_days=1
255-
user navigates to admin frontend ${RELEASE_URL}/status
255+
user navigates to ${RELEASE_URL}/status
256256
user clicks button Edit release status
257257
user clicks radio On a specific date
258258
user checks page contains ${SCHEDULED_PRERELEASE_WARNING}
@@ -269,7 +269,7 @@ Start prerelease
269269

270270
Validate prerelease has started for Analyst user after amendment
271271
user changes to analyst1
272-
user navigates to admin frontend ${RELEASE_URL}/prerelease/content
272+
user navigates to ${RELEASE_URL}/prerelease/content
273273

274274
user checks breadcrumb count should be 2
275275
user checks nth breadcrumb contains 1 Home

0 commit comments

Comments
 (0)