Skip to content

Commit e94f1ea

Browse files
committed
upgrade runner's jest to 24
1 parent e78d166 commit e94f1ea

File tree

6 files changed

+921
-585
lines changed

6 files changed

+921
-585
lines changed

packages/selenium-ide/src/api/v1/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ router.post('/register', (req, res) => {
3838
version: req.version,
3939
commands: req.commands,
4040
dependencies: req.dependencies,
41+
jest: req.jest,
4142
}
4243
Manager.registerPlugin(plugin)
4344
res(true)

packages/selenium-ide/src/plugin/manager.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,26 @@ class PluginManager {
126126
// IMPORTANT: call this function only after calling validatePluginExport!!
127127
emitDependencies() {
128128
let dependencies = {}
129+
let jest = {
130+
extraGlobals: [],
131+
}
129132
let plugins = this.plugins.filter(plugin => plugin.canEmit).map(plugin => {
130133
Object.assign(dependencies, plugin.dependencies)
134+
if (
135+
plugin.jest &&
136+
plugin.jest.extraGlobals &&
137+
Array.isArray(plugin.jest.extraGlobals)
138+
) {
139+
jest.extraGlobals.push(...plugin.jest.extraGlobals)
140+
}
131141
return {
132142
id: plugin.id,
133143
name: plugin.name,
134144
version: plugin.version,
135145
}
136146
})
137147

138-
return { plugins, dependencies }
148+
return { plugins, dependencies, jest }
139149
}
140150

141151
emitConfiguration(plugin, project) {

packages/selenium-side-runner/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"commander": "^2.12.2",
3232
"glob": "^7.1.2",
3333
"global-npm": "^0.3.0",
34-
"jest": "23.4.2",
34+
"jest": "24.0.0",
3535
"jest-environment-selenium": "2.1.0",
3636
"js-beautify": "^1.7.5",
3737
"js-yaml": "^3.10.0",
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
import jest from 'jest'
2-
3-
jest.run(process.argv.slice(2))
1+
require('jest-cli/bin/jest')

packages/selenium-side-runner/src/index.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,10 +216,14 @@ function runProject(project) {
216216
name: project.name,
217217
version: '0.0.0',
218218
jest: {
219+
extraGlobals:
220+
project.jest && project.jest.extraGlobals
221+
? project.jest.extraGlobals
222+
: [],
219223
modulePaths: [path.join(__dirname, '../node_modules')],
220-
setupTestFrameworkScriptFile: require.resolve(
221-
'jest-environment-selenium/dist/setup.js'
222-
),
224+
setupFilesAfterEnv: [
225+
require.resolve('jest-environment-selenium/dist/setup.js'),
226+
],
223227
testEnvironment: 'jest-environment-selenium',
224228
testEnvironmentOptions: configuration,
225229
},

0 commit comments

Comments
 (0)