changed app.e2e with use protractor.ExpectedConditions

bulktrade · Oct 5, 2016 · 58f2c08 · 58f2c08
1 parent ada4f8d
commit 58f2c08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/modules/admin/src/app/app.e2e.ts b/modules/admin/src/app/app.e2e.ts
@@ -1,5 +1,4 @@
 import { AppTest } from './app.page';
-import { WaitUntil } from './common/waitUntilReady';
 
 describe('App', () => {
     let ptor = protractor.wrapDriver(browser.driver);
@@ -17,17 +16,16 @@ describe('App', () => {
         this.apptest.get();
         let subject = browser.getTitle();
         let result = 'SMSC Admin';
+
         expect(subject).toEqual(result);
     });
 
     it('should have input username', () => {
-        WaitUntil.waitUntil(this.apptest.elemUsername, ptor);
         let result = true;
         expect(this.apptest.isPresentUsername()).toEqual(result);
     });
 
     it('should have input password', () => {
-        WaitUntil.waitUntil(this.apptest.elemPassword, ptor);
         let result = true;
         expect(this.apptest.isPresentPassword()).toEqual(result);
     });

diff --git a/modules/admin/src/app/app.page.ts b/modules/admin/src/app/app.page.ts
@@ -1,3 +1,4 @@
+import { EC } from "./common/expectedConditions";
 export class AppTest {
 
     public elemUsername = element(by.className('username'));
@@ -11,10 +12,12 @@ export class AppTest {
     }
 
     isPresentUsername() {
+        browser.wait(EC.presenceOf(this.elemUsername), 5000);
         return this.elemUsername.isPresent();
     }
 
     isPresentPassword() {
+        browser.wait(EC.presenceOf(this.elemPassword), 5000);
         return this.elemPassword.isPresent();
     }