From 741700db7afc5a45073ef1bcabe33ef6511ff676 Mon Sep 17 00:00:00 2001
From: jasson99 <jasmine.baral@hotmail.com>
Date: Thu, 15 Oct 2020 19:29:19 +0545
Subject: [PATCH] admin login stepdefinition moved from addUsersContext file to
 loginContext file

---
 nightwatch.conf.js                                 | 2 +-
 test/acceptance/pageObjects/loginPage.js           | 3 ++-
 test/acceptance/stepDefinitions/addUsersContext.js | 8 +-------
 test/acceptance/stepDefinitions/loginContext.js    | 6 ++++++
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/nightwatch.conf.js b/nightwatch.conf.js
index eca78329a5a..e72febea918 100644
--- a/nightwatch.conf.js
+++ b/nightwatch.conf.js
@@ -20,7 +20,7 @@ module.exports = {
 				chromeOptions : {
 					args : ['disable-gpu', 'window-size=1280,1024'],
 					w3c : false
-				},
+				}
 			}
 		}
 	}
diff --git a/test/acceptance/pageObjects/loginPage.js b/test/acceptance/pageObjects/loginPage.js
index 75195cc3746..b95fd1645ab 100644
--- a/test/acceptance/pageObjects/loginPage.js
+++ b/test/acceptance/pageObjects/loginPage.js
@@ -26,7 +26,8 @@ module.exports = {
 			},
 
 			userIsLoggedIn: async function (login) {
-				await this.useXpath()
+				await this.waitForElementNotPresent('@loginTable')
+					.useXpath()
 					.waitForElementVisible('@userLogin')
 					.expect.element('@userLogin')
 					.text.to.equal(login);
diff --git a/test/acceptance/stepDefinitions/addUsersContext.js b/test/acceptance/stepDefinitions/addUsersContext.js
index 385f731b8f7..076c5d24226 100644
--- a/test/acceptance/stepDefinitions/addUsersContext.js
+++ b/test/acceptance/stepDefinitions/addUsersContext.js
@@ -5,12 +5,6 @@ const assert = require('assert');
 let response;
 let Login = {};
 
-Given('the administrator has logged in using the webUI', async function () {
-    await client.page.loginPage().navigate().waitForLoginPage();
-    await client.page.loginPage().userLogsInWithUsernameAndPassword(client.globals.adminUsername, client.globals.adminPassword);
-    return client.page.loginPage().userIsLoggedIn(client.globals.adminUsername);
-});
-
 Given('the administrator has browsed to the new users page', function () {
     return client.page.homePage().browsedToNewUserPage();
 });
@@ -153,4 +147,4 @@ const getResponseMessage = async function (expectedResponseMessage) {
     const actualResponseMessage = json_response['error']['0'];
     return assert.strictEqual(actualResponseMessage, expectedResponseMessage,
         `the expected response message was ${expectedResponseMessage} but got ${actualResponseMessage}`);
-};
\ No newline at end of file
+};
diff --git a/test/acceptance/stepDefinitions/loginContext.js b/test/acceptance/stepDefinitions/loginContext.js
index 428fd7b5dc7..ea9aa07949b 100644
--- a/test/acceptance/stepDefinitions/loginContext.js
+++ b/test/acceptance/stepDefinitions/loginContext.js
@@ -1,6 +1,12 @@
 const { Given, When, Then } = require('cucumber')
 const { client } = require('nightwatch-api')
 
+Given('the administrator has logged in using the webUI', async function () {
+	await client.page.loginPage().navigate().waitForLoginPage();
+	await client.page.loginPage().userLogsInWithUsernameAndPassword(client.globals.adminUsername, client.globals.adminPassword);
+	return client.page.loginPage().userIsLoggedIn(client.globals.adminUsername);
+});
+
 Given('the user has browsed to the login page', function () {
 	return client.page.loginPage().navigate();
 });