Fix e2e tests

3 files changed, 30 insertions, 0 deletions

diff --git a/client/e2e/fixtures/video.mp4 b/client/e2e/fixtures/video.mp4
index f9c9e2dd6..c9ba8fd04 100644
--- a/client/e2e/fixtures/video.mp4
+++ b/client/e2e/fixtures/video.mp4
diff --git a/client/e2e/src/po/app.po.ts b/client/e2e/src/po/app.po.ts
new file mode 100644
index 000000000..a636e825f
--- /dev/null
+++ b/client/e2e/src/po/app.po.ts
@@ -0,0 +1,21 @@
+import { browser, by, element } from 'protractor'
+
+export class AppPage {
+
+  async closeWelcomeModal () {
+    const firstHandle = await browser.getWindowHandle()
+
+    if (await element(by.css('.configure-instance-button')).isPresent() === false) return
+
+    await element(by.css('.configure-instance-button')).click()
+
+    await browser.switchTo().window(firstHandle)
+
+    await browser.refresh()
+
+    await element(by.css('.form-group-checkbox')).click()
+    await element(by.css('.action-button-cancel')).click()
+
+    await browser.switchTo().window(firstHandle)
+  }
+}
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts
index 27706a506..075add531 100644
--- a/client/e2e/src/videos.e2e-spec.ts
+++ b/client/e2e/src/videos.e2e-spec.ts
@@ -4,6 +4,7 @@ import { LoginPage } from './po/login.po'
 import { browser } from 'protractor'
 import { VideoUpdatePage } from './po/video-update.po'
 import { MyAccountPage } from './po/my-account'
+import { AppPage } from './po/app.po'
 
 async function skipIfUploadNotSupported () {
   if (await isMobileDevice() || await isSafari()) {
@@ -30,6 +31,7 @@ describe('Videos workflow', () => {
   let videoUpdatePage: VideoUpdatePage
   let myAccountPage: MyAccountPage
   let loginPage: LoginPage
+  let appPage: AppPage
 
   let videoName = new Date().getTime() + ' video'
   const video2Name = new Date().getTime() + ' second video'
@@ -42,6 +44,7 @@ describe('Videos workflow', () => {
     videoUpdatePage = new VideoUpdatePage()
     myAccountPage = new MyAccountPage()
     loginPage = new LoginPage()
+    appPage = new AppPage()
 
     if (await isMobileDevice()) {
       console.log('Mobile device detected.')
@@ -61,6 +64,12 @@ describe('Videos workflow', () => {
     return loginPage.loginAsRootUser()
   })
 
+  it('Should close the welcome modal', async () => {
+    if (await skipIfUploadNotSupported()) return
+
+    await appPage.closeWelcomeModal()
+  })
+
   it('Should upload a video', async () => {
     if (await skipIfUploadNotSupported()) return