fix login-screen.spec error message, organize e2e tests

jhipster · Sep 23, 2019 · 93a4d85 · 93a4d85
1 parent baf5ca2
commit 93a4d85
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/...rplate/e2e/change-password-screen.spec.js → ...2e/account/change-password-screen.spec.js b/...rplate/e2e/change-password-screen.spec.js → ...2e/account/change-password-screen.spec.js
@@ -1,4 +1,4 @@
-const Utils = require('./utils')
+const Utils = require('../utils')
 
 describe('Change Password Screen Tests', () => {
   before(async () => {

diff --git a/boilerplate/e2e/login-screen.spec.js → boilerplate/e2e/account/login-screen.spec.js b/boilerplate/e2e/login-screen.spec.js → boilerplate/e2e/account/login-screen.spec.js
@@ -1,4 +1,4 @@
-const Utils = require('./utils')
+const Utils = require('../utils')
 
 describe('Login Screen Tests', () => {
   beforeEach(async () => {
@@ -16,7 +16,7 @@ describe('Login Screen Tests', () => {
     await element(by.id('loginScreenUsername')).replaceText('invalid')
     await element(by.id('loginScreenPassword')).replaceText('invalid')
     await element(by.id('loginScreenLoginButton')).tap()
-    await expect(element(by.text('Invalid login'))).toBeVisible()
+    await expect(element(by.text('Bad credentials'))).toBeVisible()
     await element(by.text('OK')).tap()
     await element(by.id('loginScreenCancelButton')).tap()
   })

diff --git a/boilerplate/e2e/settings-screen.spec.js → ...plate/e2e/account/settings-screen.spec.js b/boilerplate/e2e/settings-screen.spec.js → ...plate/e2e/account/settings-screen.spec.js
@@ -1,4 +1,4 @@
-const Utils = require('./utils')
+const Utils = require('../utils')
 
 describe('Settings Screen Tests', () => {
   before(async () => {

diff --git a/boilerplate/e2e/chat-screen.spec.js → ...rplate/e2e/websockets/chat-screen.spec.js b/boilerplate/e2e/chat-screen.spec.js → ...rplate/e2e/websockets/chat-screen.spec.js
@@ -1,4 +1,4 @@
-const Utils = require('./utils')
+const Utils = require('../utils')
 
 describe('Chat Screen Tests', () => {
   before(async () => {

diff --git a/src/boilerplate/files.js b/src/boilerplate/files.js
@@ -58,13 +58,11 @@ module.exports = async function (context, props, jhipsterConfig) {
     })
     // remove account files if oauth is used
     if (props.authType === 'oauth2') {
-      await filesystem.remove(`${process.cwd()}/e2e/login-screen.spec.js`)
-      await filesystem.remove(`${process.cwd()}/e2e/settings-screen.spec.js`)
-      await filesystem.remove(`${process.cwd()}/e2e/change-password-screen.spec.js`)
+      await filesystem.remove(`${process.cwd()}/e2e/account`)
     }
     // remove websocket ChatScreen test if unused
     if (!props.websockets) {
-      await filesystem.remove(`${process.cwd()}/e2e/chat-screen.spec.js`)
+      await filesystem.remove(`${process.cwd()}/e2e/websockets`)
     }
   }
   spinner.stop()