Skip to content

Commit a43c124

Browse files
authored
Migrate to intern v4 (#3428)
* update intern package * update browsers drivers * Migrate to theintern.io v4 * packge.json: update test-functional script * add new tests seekPeriod.js * functional tests: use yargs for command line options and default values detect os on local desktop * functional tests: remove unuseful scripts * functional test: fix seek test incase of short contents * functional tests: fix test playFromTime * functional tests: remove browser driver files * functional tests: update --os option choices * functional tests: correct readme
1 parent c8a288b commit a43c124

35 files changed

+3086
-2527
lines changed

package-lock.json

Lines changed: 2036 additions & 1269 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"build": "grunt",
99
"debug-mocha": "iron-node node_modules/mocha/bin/_mocha --require mochahook",
1010
"test": "mocha test/unit --require mochahook",
11-
"test-functional": "node node_modules/intern/runner.js config=test/functional/config.js selenium=remote app=remote",
11+
"test-functional": "node test/functional/runTests.js --selenium=remote --app=remote",
1212
"dev": "grunt dev",
1313
"prepublish": "grunt githooks",
1414
"prepublishOnly": "grunt prepublish",
@@ -44,7 +44,7 @@
4444
"grunt-mocha-istanbul": "^5.0.2",
4545
"grunt-string-replace": "^1.3.1",
4646
"ink-docstrap": "^1.3.2",
47-
"intern": "3.4.6",
47+
"intern": "4.8.7",
4848
"iron-mocha": "^1.0.3",
4949
"iron-node": "^3.0.23",
5050
"istanbul": "^0.4.5",
@@ -54,7 +54,8 @@
5454
"mocha": "^2.3.4",
5555
"sinon": "^7.3.2",
5656
"time-grunt": "^2.0.0",
57-
"uglify-js": "^3.6.0"
57+
"uglify-js": "^3.6.0",
58+
"yargs": "16.0.3"
5859
},
5960
"dependencies": {
6061
"codem-isoboxer": "0.3.6",

test/functional/config.js

Lines changed: 0 additions & 104 deletions
This file was deleted.

test/functional/config/applications.js

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"local" : "http://localhost:3000/samples/functional-tests/index.html",
3+
"remote": "reference.dashif.org/dash.js/nightly/samples/functional-tests/index.html"
4+
}
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"windows" : {
3+
"chrome": {
4+
"browserName": "chrome",
5+
"platform": "WINDOWS",
6+
"os": "WINDOWS",
7+
"os_version": "10",
8+
"keySystems": {
9+
"com.widevine.alpha": true,
10+
"com.microsoft.playready": false,
11+
"org.w3.clearkey": true
12+
},
13+
"goog:chromeOptions": {
14+
"w3c": false
15+
}
16+
},
17+
"firefox": {
18+
"browserName": "firefox",
19+
"platform": "WINDOWS",
20+
"os": "WINDOWS",
21+
"os_version": "10",
22+
"keySystems": {
23+
"com.widevine.alpha": true,
24+
"com.microsoft.playready": false,
25+
"org.w3.clearkey": true
26+
}
27+
},
28+
"edge": {
29+
"browserName": "MicrosoftEdge",
30+
"platform": "WINDOWS",
31+
"keySystems": {
32+
"com.widevine.alpha": false,
33+
"com.microsoft.playready": true,
34+
"org.w3.clearkey": true
35+
},
36+
"ms:edgeOptions": {
37+
"w3c": false
38+
}
39+
}
40+
},
41+
"mac": {
42+
"chrome": {
43+
"browserName": "chrome",
44+
"platform": "MAC",
45+
"keySystems": {
46+
"com.widevine.alpha": true,
47+
"com.microsoft.playready": false,
48+
"org.w3.clearkey": true
49+
}
50+
},
51+
"firefox": {
52+
"browserName": "firefox",
53+
"platform": "MAC",
54+
"keySystems": {
55+
"com.widevine.alpha": true,
56+
"com.microsoft.playready": false,
57+
"org.w3.clearkey": true
58+
}
59+
}
60+
}
61+
}

test/functional/config/browsers/mac.js

Lines changed: 0 additions & 30 deletions
This file was deleted.

test/functional/config/browsers/windows.js

Lines changed: 0 additions & 48 deletions
This file was deleted.

test/functional/config/os.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

test/functional/config/selenium.js

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)