浏览代码

admin login stepdefinition moved from addUsersContext file to loginContext file

jasson99 4 年之前
父节点
当前提交
741700db7a

+ 1 - 1
nightwatch.conf.js

@@ -20,7 +20,7 @@ module.exports = {
 				chromeOptions : {
 					args : ['disable-gpu', 'window-size=1280,1024'],
 					w3c : false
-				},
+				}
 			}
 		}
 	}

+ 2 - 1
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);

+ 1 - 7
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}`);
-};
+};

+ 6 - 0
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();
 });