Merge branch 'release/3.2.0' into develop

[github/Chocobozzz/PeerTube.git] / client / e2e / src / po / login.po.ts

diff --git a/client/e2e/src/po/login.po.ts b/client/e2e/src/po/login.po.ts
index 5a36fd611f4c731f7c076d3c6669e0f28a8819e4..20412ee0d5a3b1a629d122f6821b60d4119b6d92 100644 (file)
--- a/client/e2e/src/po/login.po.ts
+++ b/client/e2e/src/po/login.po.ts
@@ -4,11 +4,20 @@ export class LoginPage {
   async loginAsRootUser () {
     await browser.get('/login')
 
-    await element(by.css('input#username')).sendKeys('root')
-    await element(by.css('input#password')).sendKeys('test1')
+    await browser.executeScript(`window.localStorage.setItem('no_instance_config_warning_modal', 'true')`)
+    await browser.executeScript(`window.localStorage.setItem('no_welcome_modal', 'true')`)
+
+    element(by.css('input#username')).sendKeys('root')
+    element(by.css('input#password')).sendKeys('test1')
+
+    await browser.sleep(1000)
 
     await element(by.css('form input[type=submit]')).click()
 
-    return browser.wait(browser.ExpectedConditions.urlContains('/videos/'))
+    expect(this.getLoggedInInfo().getText()).toContain('root')
+  }
+
+  private getLoggedInInfo () {
+    return element(by.css('.logged-in-display-name'))
   }
 }