Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to intern v4 #3428

Merged
merged 12 commits into from
Nov 6, 2020
3,305 changes: 2,036 additions & 1,269 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "grunt",
"debug-mocha": "iron-node node_modules/mocha/bin/_mocha --require mochahook",
"test": "mocha test/unit --require mochahook",
"test-functional": "node node_modules/intern/runner.js config=test/functional/config.js selenium=remote app=remote",
"test-functional": "node test/functional/runTests.js --selenium=remote --app=remote",
"dev": "grunt dev",
"prepublish": "grunt githooks",
"prepublishOnly": "grunt prepublish",
Expand Down Expand Up @@ -44,7 +44,7 @@
"grunt-mocha-istanbul": "^5.0.2",
"grunt-string-replace": "^1.3.1",
"ink-docstrap": "^1.3.2",
"intern": "3.4.6",
"intern": "4.8.7",
"iron-mocha": "^1.0.3",
"iron-node": "^3.0.23",
"istanbul": "^0.4.5",
Expand All @@ -54,7 +54,8 @@
"mocha": "^2.3.4",
"sinon": "^7.3.2",
"time-grunt": "^2.0.0",
"uglify-js": "^3.6.0"
"uglify-js": "^3.6.0",
"yargs": "16.0.3"
},
"dependencies": {
"codem-isoboxer": "0.3.6",
Expand Down
104 changes: 0 additions & 104 deletions test/functional/config.js

This file was deleted.

4 changes: 0 additions & 4 deletions test/functional/config/applications.js

This file was deleted.

4 changes: 4 additions & 0 deletions test/functional/config/applications.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"local" : "http://localhost:3000/samples/functional-tests/index.html",
"remote": "reference.dashif.org/dash.js/nightly/samples/functional-tests/index.html"
}
61 changes: 61 additions & 0 deletions test/functional/config/browsers.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"windows" : {
"chrome": {
"browserName": "chrome",
"platform": "WINDOWS",
"os": "WINDOWS",
"os_version": "10",
"keySystems": {
"com.widevine.alpha": true,
"com.microsoft.playready": false,
"org.w3.clearkey": true
},
"goog:chromeOptions": {
"w3c": false
}
},
"firefox": {
"browserName": "firefox",
"platform": "WINDOWS",
"os": "WINDOWS",
"os_version": "10",
"keySystems": {
"com.widevine.alpha": true,
"com.microsoft.playready": false,
"org.w3.clearkey": true
}
},
"edge": {
"browserName": "MicrosoftEdge",
"platform": "WINDOWS",
"keySystems": {
"com.widevine.alpha": false,
"com.microsoft.playready": true,
"org.w3.clearkey": true
},
"ms:edgeOptions": {
"w3c": false
}
}
},
"mac": {
"chrome": {
"browserName": "chrome",
"platform": "MAC",
"keySystems": {
"com.widevine.alpha": true,
"com.microsoft.playready": false,
"org.w3.clearkey": true
}
},
"firefox": {
"browserName": "firefox",
"platform": "MAC",
"keySystems": {
"com.widevine.alpha": true,
"com.microsoft.playready": false,
"org.w3.clearkey": true
}
}
}
}
30 changes: 0 additions & 30 deletions test/functional/config/browsers/mac.js

This file was deleted.

48 changes: 0 additions & 48 deletions test/functional/config/browsers/windows.js

This file was deleted.

29 changes: 0 additions & 29 deletions test/functional/config/os.js

This file was deleted.

48 changes: 0 additions & 48 deletions test/functional/config/selenium.js

This file was deleted.

Loading