Skip to content

Commit

Permalink
test: timeouts are now 60000 ms (#672). Re-enable bs tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ypavlotsky
ypavlotsky committed Jun 22, 2018
1 parent 69659b8 commit fc81aae
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 40 deletions.
13 changes: 8 additions & 5 deletions .travis.yml
View file
@@ -1,17 +1,20 @@
language: node_js
node_js:
- "node"
- node
dist: trusty
sudo: required
env:
matrix:
- MOZ_HEADLESS=1
global:
secure: byXkN+FuQNpI15xX5TUjFHoZCpEPI4o8Ophb1OvaE10dwlN0tnS7rsFkWJD6u3Ipx7y5VmpTkvxYOtvWYVt3ZbpP8sJTB+bOSsp2zrgX5vByEvZ7z3W2mkDYW1nuwM9zBtv9lkhdKlNCjNNsvw4izoFhOZXoWWsPjMEkanWzkq0=
addons:
chrome: stable
firefox: latest
browserstack:
username: "adsdevrel1"
username: adsdevrel1
access_key:
secure: "CD76OVHjif8tBfkULJASD84oFh0bAoYpZJkRIy6f5+gi46iPS7GA/t2++Fatuxi11XZ6EDH3y0eFrGeXau0/3Ut6Et2br2TWzwpt/TSbfpjkGGXKy6IJb0Jbsy/HMEJrmr8krkF9rALND1geJMgy2RVF9u3ri21JQqA2uMCOpYs="
secure: CD76OVHjif8tBfkULJASD84oFh0bAoYpZJkRIy6f5+gi46iPS7GA/t2++Fatuxi11XZ6EDH3y0eFrGeXau0/3Ut6Et2br2TWzwpt/TSbfpjkGGXKy6IJb0Jbsy/HMEJrmr8krkF9rALND1geJMgy2RVF9u3ri21JQqA2uMCOpYs=
script:
- npm run lint
- npm test
- npm run lint
- npm test
2 changes: 1 addition & 1 deletion README.md
View file
@@ -1,6 +1,6 @@
# IMA SDK Plugin for Video.js

[![Build Status](https://travis-ci.org/googleads/videojs-ima.svg?branch=master)](https://travis-ci.org/googleads/videojs-ima)
-[![Build Status](https://travis-ci.org/googleads/videojs-ima.svg?branch=master)](https://travis-ci.org/googleads/videojs-ima) [![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=N1g3U09HWEhZR09OSVc2YmhiWFlGaExMQmswMmo0Z1F3NVRjT0VvZCtWST0tLUo0QUdnZ1gyMmhJUHZsRGJ3dTBpWWc9PQ==--b8066916a46dd2f255b416f80f40ca7c3518ad46)](https://www.browserstack.com/automate/public-build/N1g3U09HWEhZR09OSVc2YmhiWFlGaExMQmswMmo0Z1F3NVRjT0VvZCtWST0tLUo0QUdnZ1gyMmhJUHZsRGJ3dTBpWWc9PQ==--b8066916a46dd2f255b416f80f40ca7c3518ad46)

## Introduction
The IMA SDK Plugin for Video.js provides a quick and easy IMA SDK integration
Expand Down
43 changes: 25 additions & 18 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Expand Up @@ -54,7 +54,7 @@
"eslint": "^4.11.0",
"eslint-config-google": "^0.9.1",
"eslint-plugin-jsdoc": "^3.2.0",
"geckodriver": "^1.10.0",
"geckodriver": "^1.11.0",
"http-server": "^0.10.0",
"mocha": "^4.0.1",
"npm-run-all": "^4.1.2",
Expand Down
30 changes: 15 additions & 15 deletions test/webdriver/basic.js
View file
Expand Up @@ -49,79 +49,79 @@ browsers.browsers.forEach(function(browser) {
await driver.get('http://localhost:8000/test/webdriver/index.html?ad=linear');
await driver.findElement(By.id('content_video')).click();
let log = await driver.findElement(By.id('log'));
await driver.wait(until.elementTextContains(log, 'start'), 20000);
await driver.wait(until.elementTextContains(log, 'start'), 60000);
await driver.wait(until.elementIsVisible(driver.findElement(
By.id('content_video_ima-controls-div'))), 25000);
By.id('content_video_ima-controls-div'))), 60000);
});

it( 'Hides controls when ad ends ' + browser.name, async function(){
await driver.get('http://localhost:8000/test/webdriver/index.html?ad=linear');
await driver.findElement(By.id('content_video')).click();
let log = await driver.findElement(By.id('log'));
await driver.wait(until.elementTextContains(log, 'start'), 20000);
await driver.wait(until.elementTextContains(log, 'start'), 60000);
await driver.wait(until.elementIsNotVisible(driver.findElement(
By.id('content_video_ima-controls-div'))), 24000);
By.id('content_video_ima-controls-div'))), 60000);
await driver.sleep();
});

it( 'Plays content when ad ends ' + browser.name, async function(){
await driver.get('http://localhost:8000/test/webdriver/index.html?ad=linear');
await driver.findElement(By.id('content_video')).click();
let log = await driver.findElement(By.id('log'));
await driver.wait(until.elementTextContains(log, 'start'), 20000);
await driver.wait(until.elementTextContains(log, 'start'), 60000);
await driver.wait(until.elementIsNotVisible(driver.findElement(
By.id('content_video_ima-controls-div'))), 24000);
await driver.wait(until.elementTextContains(log, 'playing'), 20000);
By.id('content_video_ima-controls-div'))), 60000);
await driver.wait(until.elementTextContains(log, 'playing'), 60000);
await driver.sleep();
});

it( 'Displays skip ad button ' + browser.name, async function(){
await driver.get('http://localhost:8000/test/webdriver/index.html?ad=skippable');
await driver.findElement(By.id('content_video')).click();
let log = driver.findElement(By.id('log'));
await driver.wait(until.elementTextContains(log, 'start'), 20000);
await driver.wait(until.elementTextContains(log, 'start'), 60000);
await driver.switchTo().frame(driver.findElement(
By.css('#content_video_ima-ad-container > div:nth-child(1) > iframe')));
let skipButton = await driver.findElement(
By.css('body > div.videoAdUi > div.videoAdUiSkipContainer.html5-stop-propagation > button'));
await driver.wait(until.elementIsVisible(skipButton), 20000);
await driver.wait(until.elementIsVisible(skipButton), 60000);
await driver.sleep();
});

it( 'VMAP: Preroll ' + browser.name, async function(){
await driver.get('http://localhost:8000/test/webdriver/index.html?ad=vmap_preroll');
await driver.findElement(By.id('content_video')).click();
let log = await driver.findElement(By.id('log'));
await driver.wait(until.elementTextContains(log, 'start'), 20000);
await driver.wait(until.elementTextContains(log, 'start'), 60000);
await driver.wait(until.elementIsVisible(driver.findElement(
By.id('content_video_ima-controls-div'))), 20000);
By.id('content_video_ima-controls-div'))), 60000);
await driver.sleep();
});

it( 'VMAP: Midroll ' + browser.name, async function(){
await driver.get('http://localhost:8000/test/webdriver/index.html?ad=vmap_midroll');
await driver.findElement(By.id('content_video')).click();
await driver.wait(until.elementIsVisible(driver.findElement(
By.id('content_video_ima-controls-div'))), 20000);
By.id('content_video_ima-controls-div'))), 60000);
await driver.sleep();
});

it( 'Nonlinear ' + browser.name, async function(){
await driver.get('http://localhost:8000/test/webdriver/index.html?ad=nonlinear');
await driver.findElement(By.id('content_video')).click();
let log = await driver.findElement(By.id('log'));
await driver.wait(until.elementTextContains(log, 'start'), 20000);
await driver.wait(until.elementTextContains(log, 'start'), 60000);
await driver.switchTo().frame(driver.findElement(
By.css('#content_video_ima-ad-container > div:nth-child(1) > iframe')));
await driver.wait(until.elementIsVisible(driver.findElement(
By.id('GDFP'))), 20000);
By.id('GDFP'))), 60000);
await driver.sleep();
});

it( 'Handles ad error 303: wrappers ' + browser.name, async function(){
await driver.get('http://localhost:8000/test/webdriver/index.html?ad=error_303');
let log = await driver.findElement(By.id('log'));
await driver.wait(until.elementTextContains(log, '303'), 20000);
await driver.wait(until.elementTextContains(log, '303'), 60000);
await driver.sleep();
});
});
Expand Down
22 changes: 22 additions & 0 deletions test/webdriver/content/capabilities.js
View file
Expand Up @@ -45,6 +45,28 @@ var browsers = [
'moz:firefoxOptions' : {args: ['-headless']}
}
},
{
name: 'browserstack-win10-chrome',
server: 'http://hub-cloud.browserstack.com/wd/hub',
capabilities: {
'browserName' : 'Chrome',
'browser_version' : '62.0',
'os' : 'Windows',
'os_version' : '10',
'resolution' : '1024x768',
}
},
{
name: 'browserstack-win10-firefox',
server: 'http://hub-cloud.browserstack.com/wd/hub',
capabilities: {
'browserName' : 'Firefox',
'browser_version' : '58.0',
'os' : 'Windows',
'os_version' : '10',
'resolution' : '1024x768',
}
},
];

for (let browser of browsers) {
Expand Down

0 comments on commit fc81aae

Please sign in to comment.