FHB-1113: E2E Automated Tests: Adding Users in Manage as Dfe Admin

src/shared/web-components/src/FamilyHubs.SharedKernel.Razor/Pages/Shared/_SingleTextAreaPage.cshtml

@@ -41,7 +41,7 @@
                 </div>
             </div>
 
-            <button type="submit" class="govuk-button" data-module="govuk-button">
+            <button type="submit" data-testid='buttonContinue' class="govuk-button" data-module="govuk-button">
                 Continue
             </button>
         </form>

src/shared/web-components/src/FamilyHubs.SharedKernel.Razor/Pages/Shared/_SingleTextboxPage.cshtml

@@ -84,10 +84,10 @@
 
                 <input class="govuk-input @(error?.InputClass)" maxlength="@(Model.MaxLength)"
                        name="TextBoxValue" type="@type" value="@Model.TextBoxValue" inputmode="@type"
-                       spellcheck="false" autocomplete="off" id="@textBoxId"
+                       spellcheck="false" autocomplete="off" id="@textBoxId" data-testid="@textBoxId"
                        aria-describedby="@(string.IsNullOrEmpty(Model.HintText) ? "" : "hint ")@error?.InputErrorMessageParaId">
             </div>
-            <button type="submit" class="govuk-button" data-module="govuk-button">
+            <button type="submit" data-testid="buttonContinue" class="govuk-button" data-module="govuk-button">
                 Continue
             </button>
         </form>

src/ui/manage-ui/src/FamilyHubs.ServiceDirectory.Admin.Web/Pages/Shared/_InputPageLayout.cshtml

@@ -44,7 +44,7 @@
 
                 </fieldset>
             </div>
-            <button class="govuk-button" id="buttonContinue">
+            <button class="govuk-button" data-testid="buttonContinue" id="buttonContinue">
                 @Model.SubmitButtonText
             </button>
         </form>

test/manage-e2e-tests/tests/manage-login.spec.ts

@@ -5,7 +5,7 @@ import {
     clickOnTheStartButton,
     isTheManageHomepageDisplayed,
     loginToManage,
-    navigateToManage,
+    navigateToManage
 } from './serenity-tools/manage-index';
 
 describe('Manage Tests', () => {

test/manage-e2e-tests/tests/serenity-tools/page-objects/accounts-page-objects.ts

@@ -22,7 +22,7 @@ export const addServicesUserActivity = () =>
 
 export const laOrganisationInputBox = () =>
     PageElement
-        .located(By.css("[id='LaOrganisationName']"))
+        .located(By.css("[data-testid='LaOrganisationName']"))
         .describedAs('LA Organisation Input Box');
 
 export const laOrganisationInputSuggestion = () =>

test/manage-e2e-tests/tests/serenity-tools/tasks/user-account-tasks.ts

@@ -1,5 +1,5 @@
 import {Answerable, Check, Task} from '@serenity-js/core';
-import {Click, Enter, isVisible} from '@serenity-js/web';
+import {Click, Enter, isVisible, Scroll} from '@serenity-js/web';
 import {
     addServicesUserActivity,
     addUserLink,
@@ -42,17 +42,20 @@ export const selectUserAction = (actionType: Answerable<string>): Task =>
 
 export const selectLocalAuthority = (laName: Answerable<string>): Task =>
     Task.where(`#actor assigns ${laName} local authority to user`,
+        Scroll.to(laOrganisationInputBox()),
         Enter.theValue(laName).into(laOrganisationInputBox()),
         Click.on(laOrganisationInputSuggestion())
     );
 
 export const enterTestEmail = (emailAddress: Answerable<string>): Task =>
     Task.where(`#actor assigns ${emailAddress} email address to user`,
+        Scroll.to(emailAddressInputBox()),
         Enter.theValue(emailAddress).into(emailAddressInputBox())
     );
 
 export const enterFullName = (fullName: Answerable<string>): Task =>
     Task.where(`#actor assigns ${fullName} full name address to user`,
+        Scroll.to(fullNameInputBox()),
         Enter.theValue(fullName).into(fullNameInputBox())
     );
 
@@ -78,6 +81,7 @@ export const searchForUserByName = (fullName: Answerable<string>): Task =>
             .andIfSo(
                 Click.on(showFiltersButton())
             ),
+        Scroll.to(userNameFilterInputBox()),
         Enter.theValue(fullName).into(userNameFilterInputBox()),
         Click.on(applyFilterButton())
     );