From 7440a73ca2b6523fc11de695e8ed40a9f8394798 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Wed, 22 Jun 2022 12:43:24 -0400
Subject: [PATCH] Fixes to E2E tests for v5.1.1 (#2169)

---
 e2e/modules/environment.js               | 12 ++++++------
 e2e/specs/focus.test.js                  |  8 ++++----
 e2e/specs/mattermost/back_button.test.js |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/e2e/modules/environment.js b/e2e/modules/environment.js
index 8775b231..abf23a16 100644
--- a/e2e/modules/environment.js
+++ b/e2e/modules/environment.js
@@ -189,12 +189,12 @@ module.exports = {
     },
 
     async loginToMattermost(window) {
-        await window.waitForSelector('#loginId');
-        await window.waitForSelector('#loginPassword');
-        await window.waitForSelector('#loginButton');
-        await window.type('#loginId', 'user-1');
-        await window.type('#loginPassword', 'SampleUs@r-1');
-        await window.click('#loginButton');
+        await window.waitForSelector('#input_loginId');
+        await window.waitForSelector('#input_password-input');
+        await window.waitForSelector('#saveSetting');
+        await window.type('#input_loginId', 'user-1');
+        await window.type('#input_password-input', 'SampleUs@r-1');
+        await window.click('#saveSetting');
     },
 
     addClientCommands(client) {
diff --git a/e2e/specs/focus.test.js b/e2e/specs/focus.test.js
index 3d974831..6faa82b8 100644
--- a/e2e/specs/focus.test.js
+++ b/e2e/specs/focus.test.js
@@ -124,8 +124,8 @@ describe('focus', function desc() {
             await dropdownView.click('.TeamDropdown .TeamDropdown__button:has-text("community")');
             // eslint-disable-next-line dot-notation
             const secondServer = this.serverMap['community___TAB_MESSAGING'].win;
-            await secondServer.waitForSelector('#loginId');
-            await secondServer.focus('#loginId');
+            await secondServer.waitForSelector('#input_loginId');
+            await secondServer.focus('#input_loginId');
 
             await mainView.click('.TeamDropdownButton');
             await dropdownView.click(`.TeamDropdown .TeamDropdown__button:has-text("${config.teams[0].name}")`);
@@ -142,7 +142,7 @@ describe('focus', function desc() {
 
             await mainView.click('.TeamDropdownButton');
             await dropdownView.click('.TeamDropdown .TeamDropdown__button:has-text("community")');
-            const isLoginFocused = await secondServer.$eval('#loginId', (el) => el === document.activeElement);
+            const isLoginFocused = await secondServer.$eval('#input_loginId', (el) => el === document.activeElement);
             isLoginFocused.should.be.true;
 
             // Make sure you can just start typing and it'll go in the post textbox
@@ -150,7 +150,7 @@ describe('focus', function desc() {
             robot.typeString('username');
             await asyncSleep(500);
 
-            const loginString = await secondServer.inputValue('#loginId');
+            const loginString = await secondServer.inputValue('#input_loginId');
             loginString.should.equal('username');
         });
     });
diff --git a/e2e/specs/mattermost/back_button.test.js b/e2e/specs/mattermost/back_button.test.js
index 4b62a46e..7aa76df9 100644
--- a/e2e/specs/mattermost/back_button.test.js
+++ b/e2e/specs/mattermost/back_button.test.js
@@ -68,7 +68,7 @@ describe('back_button', function desc() {
         poweredByOneLogin.should.not.be.null;
 
         await backButton.click();
-        let loginPrompt = await firstServer.waitForSelector('#loginId');
+        let loginPrompt = await firstServer.waitForSelector('#input_loginId');
         loginPrompt.should.not.be.null;
         await mainWindow.waitForSelector('button:has-text("Back")', {state: 'hidden'});
 
@@ -88,7 +88,7 @@ describe('back_button', function desc() {
 
         await backButton.click();
         await backButton.click();
-        loginPrompt = await firstServer.waitForSelector('#loginId');
+        loginPrompt = await firstServer.waitForSelector('#input_loginId');
         loginPrompt.should.not.be.null;
     });
 });