From 3bce2bb66f8e636dd0b9c174107519e94dbc1d38 Mon Sep 17 00:00:00 2001
From: Mark <mark@openappstack.net>
Date: Tue, 5 Nov 2019 17:44:15 +0100
Subject: [PATCH] Refactor tests
---
frontend/test/e2e/admin.test.js | 10 +++++-----
frontend/test/e2e/guest.test.js | 3 +--
frontend/test/e2e/user.test.js | 10 ++++++----
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/frontend/test/e2e/admin.test.js b/frontend/test/e2e/admin.test.js
index bfff45f..ee203a7 100644
--- a/frontend/test/e2e/admin.test.js
+++ b/frontend/test/e2e/admin.test.js
@@ -1,14 +1,11 @@
module.exports = {
'Login' : function (browser) {
const index = browser.page.index();
- const navbar = index.section.navbar;
const login = browser.page.login()
-
index
.navigate()
.waitForElementVisible('@loginButton')
.click("@loginButton")
-
login
.waitForElementVisible('@loginButton')
.click("@loginButton")
@@ -16,10 +13,13 @@ module.exports = {
.setValue('input[name=username]', browser.globals.adminUsername)
.setValue('input[name=password]', browser.globals.adminPassword)
.click('input[name=submit]')
-
index
.waitForElementVisible('@logoutButton')
-
+ },
+ 'Index page layout after login with admin user' : function (browser) {
+ const index = browser.page.index();
+ const navbar = index.section.navbar;
+ index.navigate()
navbar
.assert.elementPresent('@oidc')
.assert.elementPresent('@users')
diff --git a/frontend/test/e2e/guest.test.js b/frontend/test/e2e/guest.test.js
index 62e6ac4..0eca953 100644
--- a/frontend/test/e2e/guest.test.js
+++ b/frontend/test/e2e/guest.test.js
@@ -8,11 +8,10 @@ module.exports = {
.assert.containsText('@banner', 'Welcome to OpenAppStack')
navbar
- .assert.containsText('@loginButton', 'Login')
.assert.containsText('@loginButton', 'Login')
.end();
},
- 'Login screen' : function (browser) {
+ 'Navigate to login screen' : function (browser) {
const login = browser.page.login()
const index = browser.page.index();
index.navigate()
diff --git a/frontend/test/e2e/user.test.js b/frontend/test/e2e/user.test.js
index a044c85..ba4754a 100644
--- a/frontend/test/e2e/user.test.js
+++ b/frontend/test/e2e/user.test.js
@@ -1,8 +1,6 @@
module.exports = {
'Login' : function (browser) {
const index = browser.page.index();
- const navbar = index.section.navbar;
- const usermenu = navbar.section.usermenu;
const login = browser.page.login()
index.navigate()
.waitForElementVisible('@loginButton')
@@ -18,13 +16,17 @@ module.exports = {
index
.waitForElementVisible('@logoutButton')
.assert.containsText('@logoutButton', 'Logout')
-
+ },
+ 'Index page layout after login' : function (browser) {
+ const index = browser.page.index();
+ const navbar = index.section.navbar;
+ const usermenu = navbar.section.usermenu;
+ index.navigate()
usermenu
.assert.containsText("@userNameLabel", browser.globals.userUsername)
.assert.elementNotPresent("@logoutButton")
.click("@userNameLabel")
.assert.visible("@logoutButton")
-
navbar
.assert.elementPresent('@oidc')
.assert.elementNotPresent('@users')
--
GitLab