jhipster · pascalgrimaud · Sep 13, 2018 · Aug 31, 2018 · Aug 31, 2018 · Aug 31, 2018
diff --git a/generators/client/templates/angular/package.json.ejs b/generators/client/templates/angular/package.json.ejs
@@ -61,16 +61,26 @@
     "@angular/cli": "6.1.2",
     "@angular/compiler-cli": "6.1.0",
     "@ngtools/webpack": "6.0.0",
+    <%_ if (protractorTests) { _%>
+    "@types/chai": "4.1.4",
+    <%_ } _%>
     "@types/jest": "22.2.3",
+    <%_ if (protractorTests) { _%>
+    "@types/mocha": "5.2.5",
+    <%_ } _%>
     "@types/node": "9.4.7",
-    "angular-router-loader": "0.8.5",
     <%_ if (protractorTests) { _%>
     "@types/selenium-webdriver": "3.0.8",
     <%_ } _%>
+    "angular-router-loader": "0.8.5",
     "angular2-template-loader": "0.6.2",
     "browser-sync": "2.24.6",
     "browser-sync-webpack-plugin": "2.2.2",
     "cache-loader": "1.2.2",
+    <%_ if (protractorTests) { _%>
+    "chai": "4.1.2",
+    "chai-as-promised": "7.1.1",
+    <%_ } _%>
     "codelyzer": "4.2.1",
     "copy-webpack-plugin": "4.5.1",
     "css-loader": "0.28.10",
@@ -88,22 +98,21 @@
     "jest-junit": "5.1.0",
     "jest-preset-angular": "5.2.2",
     "jest-sonar-reporter": "2.0.0",
-    <%_ if (protractorTests) { _%>
-    "jasmine-reporters": "2.2.1",
-    <%_ } _%>
     <%_ if(!skipCommitHook) { _%>
     "lint-staged": "7.0.0",
     <%_ } _%>
     <%_ if (enableTranslation) { _%>
     "merge-jsons-webpack-plugin": "1.0.14",
     <%_ } _%>
+    <%_ if (protractorTests) { _%>
+    "mocha": "5.2.0",
+    <%_ } _%>
     "mini-css-extract-plugin": "0.4.2",
     "moment-locales-webpack-plugin": "1.0.5",
     "optimize-css-assets-webpack-plugin": "5.0.1",
     "prettier": "1.11.1",
     <%_ if (protractorTests) { _%>
     "protractor": "5.4.0",
-    "protractor-jasmine2-screenshot-reporter": "0.4.0",
     <%_ } _%>
     "proxy-middleware": "0.15.0",
     "raw-loader": "0.5.1",

diff --git a/generators/client/templates/angular/src/test/javascript/e2e/account/account.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/e2e/account/account.spec.ts.ejs
@@ -25,6 +25,8 @@ if (enableTranslation) {
     elementGetter = `getAttribute('jhiTranslate')`;
 } _%>
 
+const expect = chai.expect;
+
 describe('account', () => {
 
     let navBarPage: NavBarPage;
@@ -34,42 +36,42 @@ describe('account', () => {
     let settingsPage: SettingsPage;
     <%_ } _%>
 
-    beforeAll(async () => {
+    before(async () => {
         await browser.get('/');
         navBarPage = new NavBarPage(true);
     });
 
     it('should fail to login with bad password', async () => {
         <%_ if (enableTranslation) { _%>
-        const expect1 = /home.title/;
+        const expect1 = 'home.title';
         <%_ } else { _%>
-        const expect1 = /Welcome, Java Hipster!/;
+        const expect1 = 'Welcome, Java Hipster!';
         <%_ } _%>
         const value1 = await element(by.css('h1')).<%- elementGetter %>;
-        expect(value1).toMatch(expect1);
+        expect(value1).to.eq(expect1);
     <%_ if (authenticationType !== 'oauth2') { _%>
         signInPage = await navBarPage.getSignInPage();
         await signInPage.autoSignInUsing('admin', 'foo');
 
         <%_ if (enableTranslation) { _%>
-        const expect2 = /login.messages.error.authentication/;
+        const expect2 = 'login.messages.error.authentication';
         <%_ } else { _%>
-        const expect2 = /Failed to sign in!/;
+        const expect2 = 'Failed to sign in! Please check your credentials and try again.';
         <%_ } _%>
         const value2 = await element(by.css('.alert-danger')).<%- elementGetter %>;
-        expect(value2).toMatch(expect2);
+        expect(value2).to.eq(expect2);
     <%_ } else { _%>
         signInPage = await navBarPage.getSignInPage();
         await signInPage.loginWithOAuth('admin', 'foo');
 
         // Keycloak
         const alert = element(by.css('.alert-error'));
         if (await alert.isPresent()) {
-            expect(await alert.getText()).toMatch('Invalid username or password.');
+            expect(await alert.getText()).to.eq('Invalid username or password.');
         } else {
             // Okta
             const error = element(by.css('.infobox-error'));
-            expect(await error.getText()).toMatch('Sign in failed!');
+            expect(await error.getText()).to.eq('Sign in failed!');
         }
     <%_ } _%>
     });
@@ -80,60 +82,61 @@ describe('account', () => {
         signInPage = await navBarPage.getSignInPage();
 
         <%_ if (enableTranslation) { _%>
-        const expect1 = /global.form.username/;
+        const expect1 = 'global.form.username';
         <%_ } else { _%>
-        const expect1 = /Login/;
+        const expect1 = 'Login';
         <%_ } _%>
         const value1 = await element(by.className('username-label')).<%- elementGetter %>;
-        expect(value1).toMatch(expect1);
+        expect(value1).to.eq(expect1);
         await signInPage.autoSignInUsing('admin', 'admin');
         <%_ } else {_%>
         await signInPage.loginWithOAuth('', 'admin');
         <%_ } _%>
 
         <%_ if (enableTranslation) { _%>
-        const expect2 = /home.logged.message/;
+        const expect2 = 'home.logged.message';
         <%_ } else { _%>
-        const expect2 = /You are logged in as user "admin"/;
+        const expect2 = 'You are logged in as user "admin".';
         <%_ } _%>
-        const value2 = element(by.id('home-logged-message'));
-        await browser.wait(ec.visibilityOf(value2), 5000);
-        expect(await value2.<%- elementGetter %>).toMatch(expect2);
-    
+        await browser.wait(ec.visibilityOf(element(by.id('home-logged-message'))));
+        const value2 = await element(by.id('home-logged-message')).<%- elementGetter %>;
+        expect(value2).to.eq(expect2);
+
         <%_ if (authenticationType === 'oauth2') { _%>
         await navBarPage.autoSignOut();
         <%_ } _%>
     });
-    
+
 <%_ if (authenticationType !== 'oauth2') { _%>
     it('should be able to update settings', async () => {
         settingsPage = await navBarPage.getSettingsPage();
 
         <%_ if (enableTranslation) { _%>
-        const expect1 = /settings.title/;
+        const expect1 = 'settings.title';
         <%_ } else { _%>
-        const expect1 = /User settings for \[admin\]/;
+        const expect1 = 'User settings for [admin]';
         <%_ } _%>
         const value1 = await settingsPage.getTitle();
-        expect(value1).toMatch(expect1);
+        expect(value1).to.eq(expect1);
         await settingsPage.save();
 
         <%_ if (enableTranslation) { _%>
-        const expect2 = /settings.messages.success/;
+        const expect2 = 'settings.messages.success';
         <%_ } else { _%>
-        const expect2 = /Settings saved!/;
+        const expect2 = 'Settings saved!';
         <%_ } _%>
-        const value2 = await element(by.css('.alert-success')).<%- elementGetter %>;
-        expect(value2).toMatch(expect2);
+        const alert = element(by.css('.alert-success'));
+        const value2 = await alert.<%- elementGetter %>;
+        expect(value2).to.eq(expect2);
     });
 
     it('should fail to update password when using incorrect current password', async () => {
         passwordPage = await navBarPage.getPasswordPage();
 
         <%_ if (enableTranslation) { _%>
-        expect(await passwordPage.getTitle()).toMatch(/password.title/);
+        expect(await passwordPage.getTitle()).to.eq('password.title');
         <%_ } else { _%>
-        expect(await passwordPage.getTitle()).toMatch(/Password for \[admin\]/);
+        expect(await passwordPage.getTitle()).to.eq('Password for [admin]');
         <%_ } _%>
 
         await passwordPage.setCurrentPassword('wrong_current_password');
@@ -142,22 +145,23 @@ describe('account', () => {
         await passwordPage.save();
 
         <%_ if (enableTranslation) { _%>
-        const expect2 = /password.messages.error/;
+        const expect2 = 'password.messages.error';
         <%_ } else { _%>
-        const expect2 = /An error has occurred! The password could not be changed./;
+        const expect2 = 'An error has occurred! The password could not be changed.';
         <%_ } _%>
-        const value2 = await element(by.css('.alert-danger')).<%- elementGetter %>;
-        expect(value2).toMatch(expect2);
+        const alert = element(by.css('.alert-danger'));
+        const value2 = await alert.<%- elementGetter %>;
+        expect(value2).to.eq(expect2);
         settingsPage = await navBarPage.getSettingsPage();
     });
 
     it('should be able to update password', async () => {
         passwordPage = await navBarPage.getPasswordPage();
 
         <%_ if (enableTranslation) { _%>
-        expect(await passwordPage.getTitle()).toMatch(/password.title/);
+        expect(await passwordPage.getTitle()).to.eq('password.title');
         <%_ } else { _%>
-        expect(await passwordPage.getTitle()).toMatch(/Password for \[admin\]/);
+        expect(await passwordPage.getTitle()).to.eq('Password for [admin]');
         <%_ } _%>
 
         await passwordPage.setCurrentPassword('admin');
@@ -166,12 +170,13 @@ describe('account', () => {
         await passwordPage.save();
 
         <%_ if (enableTranslation) { _%>
-        const expect2 = /password.messages.success/;
+        const expect2 = 'password.messages.success';
         <%_ } else { _%>
-        const expect2 = /Password changed!/;
+        const expect2 = 'Password changed!';
         <%_ } _%>
-        const value2 = await element(by.css('.alert-success')).<%- elementGetter %>;
-        expect(value2).toMatch(expect2);
+        const alert = element(by.css('.alert-success'));
+        const value2 = await alert.<%- elementGetter %>;
+        expect(value2).to.eq(expect2);
         await navBarPage.autoSignOut();
         await navBarPage.goToSignInPage();
         await signInPage.autoSignInUsing('admin', 'newpassword');
@@ -184,7 +189,7 @@ describe('account', () => {
         await passwordPage.save();
     });
 
-    afterAll(async () => {
+    after(async () => {
         await navBarPage.autoSignOut();
     });
 <%_ } _%>

diff --git a/generators/client/templates/angular/src/test/javascript/e2e/admin/administration.spec.ts.ejs b/generators/client/templates/angular/src/test/javascript/e2e/admin/administration.spec.ts.ejs
@@ -25,12 +25,14 @@ if (enableTranslation) {
     elementGetter = `getAttribute('jhiTranslate')`;
 } _%>
 
+const expect = chai.expect;
+
 describe('administration', () => {
 
     let navBarPage: NavBarPage;
     let signInPage: SignInPage;
 
-    beforeAll(async () => {
+    before(async () => {
         await browser.get('/');
         navBarPage = new NavBarPage(true);
         signInPage = await navBarPage.getSignInPage();
@@ -44,78 +46,78 @@ describe('administration', () => {
     beforeEach(async () => {
         await navBarPage.clickOnAdminMenu();
     });
-    
+
     <%_ if (authenticationType !== 'oauth2') { _%>
     it('should load user management', async () => {
         await navBarPage.clickOnAdmin('user-management');
         <%_ if (enableTranslation) { _%>
-        const expect1 = /userManagement.home.title/;
+        const expect1 = 'userManagement.home.title';
         <%_ } else { _%>
-        const expect1 = /Users/;
+        const expect1 = 'Users';
         <%_ } _%>
         const value1 = await element(by.id('user-management-page-heading')).<%- elementGetter %>;
-        expect(value1).toMatch(expect1);
+        expect(value1).to.eq(expect1);
     });
     <%_ } _%>
 
     it('should load metrics', async () => {
         await navBarPage.clickOnAdmin('<%= jhiPrefixDashed %>-metrics');
         <%_ if (enableTranslation) { _%>
-        const expect1 = /metrics.title/;
+        const expect1 = 'metrics.title';
         <%_ } else { _%>
-        const expect1 = /Application Metrics/;
+        const expect1 = 'Application Metrics';
         <%_ } _%>
         const value1 = await element(by.id('metrics-page-heading')).<%- elementGetter %>;
-        expect(value1).toMatch(expect1);
+        expect(value1).to.eq(expect1);
     });
 
     it('should load health', async () => {
         await navBarPage.clickOnAdmin('<%= jhiPrefixDashed %>-health');
         <%_ if (enableTranslation) { _%>
-        const expect1 = /health.title/;
+        const expect1 = 'health.title';
         <%_ } else { _%>
-        const expect1 = /Health Checks/;
+        const expect1 = 'Health Checks';
         <%_ } _%>
         const value1 = await element(by.id('health-page-heading')).<%- elementGetter %>;
-        expect(value1).toMatch(expect1);
+        expect(value1).to.eq(expect1);
     });
 
     it('should load configuration', async () => {
         await navBarPage.clickOnAdmin('<%= jhiPrefixDashed %>-configuration');
         <%_ if (enableTranslation) { _%>
-        const expect1 = /configuration.title/;
+        const expect1 = 'configuration.title';
         <%_ } else { _%>
-        const expect1 = /Configuration/;
+        const expect1 = 'Configuration';
         <%_ } _%>
         const value1 = await element(by.id('configuration-page-heading')).<%- elementGetter %>;
-        expect(value1).toMatch(expect1);
+        expect(value1).to.eq(expect1);
     });
 
 <%_ if (databaseType !== 'no' && databaseType !== 'cassandra') { _%>
     it('should load audits', async () => {
         await navBarPage.clickOnAdmin('audits');
         <%_ if (enableTranslation) { _%>
-        const expect1 = /audits.title/;
+        const expect1 = 'audits.title';
         <%_ } else { _%>
-        const expect1 = /Audits/;
+        const expect1 = 'Audits';
         <%_ } _%>
         const value1 = await element(by.id('audits-page-heading')).<%- elementGetter %>;
-        expect(value1).toMatch(expect1);
+        expect(value1).to.eq(expect1);
     });
 
 <%_ } _%>
     it('should load logs', async () => {
         await navBarPage.clickOnAdmin('logs');
         <%_ if (enableTranslation) { _%>
-        const expect1 = /logs.title/;
+        const expect1 = 'logs.title';
         <%_ } else { _%>
-        const expect1 = /Logs/;
+        const expect1 = 'Logs';
         <%_ } _%>
         const value1 = await element(by.id('logs-page-heading')).<%- elementGetter %>;
-        expect(value1).toMatch(expect1);
+        expect(value1).to.eq(expect1);
     });
 
-    afterAll(async () => {
+    after(async () => {
         await navBarPage.autoSignOut();
     });
 });