diff options
Diffstat (limited to 'client/e2e/src')
-rw-r--r-- | client/e2e/src/app.e2e-spec.ts | 14 | ||||
-rw-r--r-- | client/e2e/src/po/app.po.ts | 12 | ||||
-rw-r--r-- | client/e2e/src/po/login.po.ts | 6 | ||||
-rw-r--r-- | client/e2e/src/po/video-upload.po.ts | 4 | ||||
-rw-r--r-- | client/e2e/src/po/video-watch.po.ts | 46 | ||||
-rw-r--r-- | client/e2e/src/videos.e2e-spec.ts | 38 |
6 files changed, 80 insertions, 40 deletions
diff --git a/client/e2e/src/app.e2e-spec.ts b/client/e2e/src/app.e2e-spec.ts deleted file mode 100644 index 5b648207b..000000000 --- a/client/e2e/src/app.e2e-spec.ts +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | import { AppPage } from './po/app.po' | ||
2 | |||
3 | describe('PeerTube app', () => { | ||
4 | let page: AppPage | ||
5 | |||
6 | beforeEach(() => { | ||
7 | page = new AppPage() | ||
8 | }) | ||
9 | |||
10 | it('Should display the app title', () => { | ||
11 | page.navigateTo() | ||
12 | expect(page.getHeaderTitle()).toEqual('PeerTube') | ||
13 | }) | ||
14 | }) | ||
diff --git a/client/e2e/src/po/app.po.ts b/client/e2e/src/po/app.po.ts deleted file mode 100644 index e3e293d7b..000000000 --- a/client/e2e/src/po/app.po.ts +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | import { browser, by, element } from 'protractor' | ||
2 | |||
3 | export class AppPage { | ||
4 | navigateTo () { | ||
5 | browser.waitForAngularEnabled(false) | ||
6 | return browser.get('/') | ||
7 | } | ||
8 | |||
9 | getHeaderTitle () { | ||
10 | return element(by.css('.instance-name')).getText() | ||
11 | } | ||
12 | } | ||
diff --git a/client/e2e/src/po/login.po.ts b/client/e2e/src/po/login.po.ts index 5a36fd611..40f958d2b 100644 --- a/client/e2e/src/po/login.po.ts +++ b/client/e2e/src/po/login.po.ts | |||
@@ -4,8 +4,10 @@ export class LoginPage { | |||
4 | async loginAsRootUser () { | 4 | async loginAsRootUser () { |
5 | await browser.get('/login') | 5 | await browser.get('/login') |
6 | 6 | ||
7 | await element(by.css('input#username')).sendKeys('root') | 7 | element(by.css('input#username')).sendKeys('root') |
8 | await element(by.css('input#password')).sendKeys('test1') | 8 | element(by.css('input#password')).sendKeys('test1') |
9 | |||
10 | await browser.sleep(1000) | ||
9 | 11 | ||
10 | await element(by.css('form input[type=submit]')).click() | 12 | await element(by.css('form input[type=submit]')).click() |
11 | 13 | ||
diff --git a/client/e2e/src/po/video-upload.po.ts b/client/e2e/src/po/video-upload.po.ts index 741914d2d..1ac696107 100644 --- a/client/e2e/src/po/video-upload.po.ts +++ b/client/e2e/src/po/video-upload.po.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { browser, element, by } from 'protractor' | 1 | import { browser, by, element } from 'protractor' |
2 | import { join } from 'path' | ||
3 | import { FileDetector } from 'selenium-webdriver/remote' | 2 | import { FileDetector } from 'selenium-webdriver/remote' |
3 | import { join } from 'path' | ||
4 | 4 | ||
5 | export class VideoUploadPage { | 5 | export class VideoUploadPage { |
6 | navigateTo () { | 6 | navigateTo () { |
diff --git a/client/e2e/src/po/video-watch.po.ts b/client/e2e/src/po/video-watch.po.ts index b5df1cbc5..0f37e3e33 100644 --- a/client/e2e/src/po/video-watch.po.ts +++ b/client/e2e/src/po/video-watch.po.ts | |||
@@ -1,15 +1,24 @@ | |||
1 | import { by, element, browser } from 'protractor' | 1 | import { by, element, browser } from 'protractor' |
2 | 2 | ||
3 | export class VideoWatchPage { | 3 | export class VideoWatchPage { |
4 | async goOnRecentlyAdded () { | 4 | async goOnVideosList (isIphoneDevice: boolean) { |
5 | const url = '/videos/recently-added' | 5 | let url: string |
6 | |||
7 | if (isIphoneDevice === true) { | ||
8 | // Local testing is buggy :/ | ||
9 | url = 'https://peertube2.cpy.re/videos/local' | ||
10 | } else { | ||
11 | url = '/videos/recently-added' | ||
12 | } | ||
6 | 13 | ||
7 | await browser.get(url) | 14 | await browser.get(url) |
8 | return browser.wait(browser.ExpectedConditions.elementToBeClickable(element(this.getFirstVideoListSelector()))) | 15 | return browser.wait(browser.ExpectedConditions.elementToBeClickable(element(this.getFirstVideoListSelector()))) |
9 | } | 16 | } |
10 | 17 | ||
11 | getVideosListName () { | 18 | getVideosListName () { |
12 | return element.all(this.getFirstVideoListSelector()).getText() | 19 | return element.all(this.getFirstVideoListSelector()) |
20 | .getText() | ||
21 | .then((texts: any) => texts.map(t => t.trim())) | ||
13 | } | 22 | } |
14 | 23 | ||
15 | waitWatchVideoName (videoName: string) { | 24 | waitWatchVideoName (videoName: string) { |
@@ -24,7 +33,19 @@ export class VideoWatchPage { | |||
24 | .then(seconds => parseInt(seconds, 10)) | 33 | .then(seconds => parseInt(seconds, 10)) |
25 | } | 34 | } |
26 | 35 | ||
27 | async pauseVideo (pauseAfterMs: number) { | 36 | async pauseVideo (pauseAfterMs: number, isMobileDevice: boolean, isIphoneDevice: boolean) { |
37 | if (isMobileDevice === true) { | ||
38 | if (isIphoneDevice === false) { | ||
39 | const playButton = element(by.css('.vjs-big-play-button')) | ||
40 | await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton)) | ||
41 | await playButton.click() | ||
42 | } else { | ||
43 | const playButton = element(by.css('video')) | ||
44 | await browser.wait(browser.ExpectedConditions.elementToBeClickable(playButton)) | ||
45 | await playButton.click() | ||
46 | } | ||
47 | } | ||
48 | |||
28 | await browser.wait(browser.ExpectedConditions.invisibilityOf(element(by.css('.vjs-loading-spinner')))) | 49 | await browser.wait(browser.ExpectedConditions.invisibilityOf(element(by.css('.vjs-loading-spinner')))) |
29 | 50 | ||
30 | const el = element(by.css('div.video-js')) | 51 | const el = element(by.css('div.video-js')) |
@@ -32,15 +53,30 @@ export class VideoWatchPage { | |||
32 | 53 | ||
33 | await browser.sleep(pauseAfterMs) | 54 | await browser.sleep(pauseAfterMs) |
34 | 55 | ||
35 | return el.click() | 56 | if (isIphoneDevice === true) { |
57 | // document.webkitCancelFullScreen() | ||
58 | } else { | ||
59 | return el.click() | ||
60 | } | ||
36 | } | 61 | } |
37 | 62 | ||
38 | async clickOnVideo (videoName: string) { | 63 | async clickOnVideo (videoName: string) { |
39 | const video = element(by.css('.videos .video-miniature .video-thumbnail[title="' + videoName + '"]')) | 64 | const video = element(by.css('.videos .video-miniature .video-thumbnail[title="' + videoName + '"]')) |
65 | await browser.wait(browser.ExpectedConditions.elementToBeClickable(video)) | ||
66 | await video.click() | ||
67 | |||
68 | await browser.wait(browser.ExpectedConditions.urlContains('/watch/')) | ||
69 | } | ||
70 | |||
71 | async clickOnFirstVideo () { | ||
72 | const video = element(by.css('.videos .video-miniature:first-child .video-miniature-name')) | ||
73 | await browser.wait(browser.ExpectedConditions.elementToBeClickable(video)) | ||
74 | const textToReturn = video.getText() | ||
40 | 75 | ||
41 | await video.click() | 76 | await video.click() |
42 | 77 | ||
43 | await browser.wait(browser.ExpectedConditions.urlContains('/watch/')) | 78 | await browser.wait(browser.ExpectedConditions.urlContains('/watch/')) |
79 | return textToReturn | ||
44 | } | 80 | } |
45 | 81 | ||
46 | private getFirstVideoListSelector () { | 82 | private getFirstVideoListSelector () { |
diff --git a/client/e2e/src/videos.e2e-spec.ts b/client/e2e/src/videos.e2e-spec.ts index 82cea72b1..c21bc163e 100644 --- a/client/e2e/src/videos.e2e-spec.ts +++ b/client/e2e/src/videos.e2e-spec.ts | |||
@@ -8,18 +8,36 @@ describe('Videos workflow', () => { | |||
8 | let pageUploadPage: VideoUploadPage | 8 | let pageUploadPage: VideoUploadPage |
9 | let loginPage: LoginPage | 9 | let loginPage: LoginPage |
10 | const videoName = new Date().getTime() + ' video' | 10 | const videoName = new Date().getTime() + ' video' |
11 | let isMobileDevice = false | ||
12 | let isIphoneDevice = false | ||
13 | |||
14 | beforeEach(async () => { | ||
15 | browser.waitForAngularEnabled(false) | ||
11 | 16 | ||
12 | beforeEach(() => { | ||
13 | videoWatchPage = new VideoWatchPage() | 17 | videoWatchPage = new VideoWatchPage() |
14 | pageUploadPage = new VideoUploadPage() | 18 | pageUploadPage = new VideoUploadPage() |
15 | loginPage = new LoginPage() | 19 | loginPage = new LoginPage() |
20 | |||
21 | const caps = await browser.getCapabilities() | ||
22 | isMobileDevice = caps.get('realMobile') === 'true' || caps.get('realMobile') === true | ||
23 | isIphoneDevice = caps.get('device') === 'iphone' | ||
16 | }) | 24 | }) |
17 | 25 | ||
18 | it('Should log in', () => { | 26 | it('Should log in', () => { |
27 | if (isMobileDevice) { | ||
28 | console.log('Skipping because we are on a real device and BrowserStack does not support file upload.') | ||
29 | return | ||
30 | } | ||
31 | |||
19 | return loginPage.loginAsRootUser() | 32 | return loginPage.loginAsRootUser() |
20 | }) | 33 | }) |
21 | 34 | ||
22 | it('Should upload a video', async () => { | 35 | it('Should upload a video', async () => { |
36 | if (isMobileDevice) { | ||
37 | console.log('Skipping because we are on a real device and BrowserStack does not support file upload.') | ||
38 | return | ||
39 | } | ||
40 | |||
23 | pageUploadPage.navigateTo() | 41 | pageUploadPage.navigateTo() |
24 | 42 | ||
25 | await pageUploadPage.uploadVideo() | 43 | await pageUploadPage.uploadVideo() |
@@ -27,20 +45,30 @@ describe('Videos workflow', () => { | |||
27 | }) | 45 | }) |
28 | 46 | ||
29 | it('Should list the video', async () => { | 47 | it('Should list the video', async () => { |
30 | await videoWatchPage.goOnRecentlyAdded() | 48 | await videoWatchPage.goOnVideosList(isIphoneDevice) |
49 | |||
50 | if (isMobileDevice) { | ||
51 | console.log('Skipping because we are on a real device and BrowserStack does not support file upload.') | ||
52 | return | ||
53 | } | ||
31 | 54 | ||
32 | const videoNames = videoWatchPage.getVideosListName() | 55 | const videoNames = videoWatchPage.getVideosListName() |
33 | expect(videoNames).toContain(videoName) | 56 | expect(videoNames).toContain(videoName) |
34 | }) | 57 | }) |
35 | 58 | ||
36 | it('Should go on video watch page', async () => { | 59 | it('Should go on video watch page', async () => { |
37 | await videoWatchPage.clickOnVideo(videoName) | 60 | let videoNameToExcept = videoName |
61 | |||
62 | if (isMobileDevice && isIphoneDevice) videoNameToExcept = 'PeerTube_Mobile.v.1' | ||
63 | |||
64 | if (isMobileDevice && isIphoneDevice === false) videoNameToExcept = await videoWatchPage.clickOnFirstVideo() | ||
65 | else await videoWatchPage.clickOnVideo(videoName) | ||
38 | 66 | ||
39 | return videoWatchPage.waitWatchVideoName(videoName) | 67 | return videoWatchPage.waitWatchVideoName(videoNameToExcept) |
40 | }) | 68 | }) |
41 | 69 | ||
42 | it('Should play the video', async () => { | 70 | it('Should play the video', async () => { |
43 | await videoWatchPage.pauseVideo(2500) | 71 | await videoWatchPage.pauseVideo(7000, isMobileDevice, isIphoneDevice) |
44 | expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) | 72 | expect(videoWatchPage.getWatchVideoPlayerCurrentTime()).toBeGreaterThanOrEqual(2) |
45 | }) | 73 | }) |
46 | }) | 74 | }) |