Skip to content

Commit a6b656f

Browse files
authored
Merge pull request #457 from ccheraa/update-dependencies
Update dependencies
2 parents fa8128e + 732575a commit a6b656f

File tree

5 files changed

+632
-586
lines changed

5 files changed

+632
-586
lines changed

cypress/plugins/index.js

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,45 @@
1818
module.exports = (on, config) => {
1919
// `on` is used to hook into various events Cypress emits
2020
// `config` is the resolved Cypress config
21+
config.process = {
22+
chrome: process.chrome,
23+
defaultApp: process.defaultApp,
24+
electron: process.electron,
25+
isMainFrame: process.isMainFrame,
26+
mas: process.mas,
27+
noAsar: process.noAsar,
28+
noDeprecation: process.noDeprecation,
29+
resourcesPath: process.resourcesPath,
30+
sandboxed: process.sandboxed,
31+
throwDeprecation: process.throwDeprecation,
32+
traceDeprecation: process.traceDeprecation,
33+
traceProcessWarnings: process.traceProcessWarnings,
34+
type: process.type,
35+
stdout: process.stdout,
36+
stderr: process.stderr,
37+
stdin: process.stdin,
38+
argv: process.argv,
39+
argv0: process.argv0,
40+
execArgv: process.execArgv,
41+
execPath: process.execPath,
42+
debugPort: process.debugPort,
43+
env: process.env,
44+
exitCode: process.exitCode,
45+
version: process.version,
46+
versions: process.versions,
47+
config: process.config,
48+
pid: process.pid,
49+
ppid: process.ppid,
50+
title: process.title,
51+
arch: process.arch,
52+
platform: process.platform,
53+
memoryUsage: process.memoryUsage,
54+
release: process.release,
55+
features: process.features,
56+
hrtime: process.hrtime,
57+
connected: process.connected,
58+
report: process.report,
59+
traceDeprecation: process.traceDeprecation,
60+
};
61+
return config;
2162
}

cypress/support/commands.js

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,28 @@
1616
// populate localStorage with a default connection, automatically cleared before each spec
1717
// assumes default 'admin' user and '' password
1818
// actual server URL is retrieved via ENV
19-
Cypress.Commands.add("connect", () => {
19+
Cypress.Commands.add("connect", () => {
2020
// conn_val mimics actual app behavior, its value is inconsequential for establishing a connection
2121
let conn_val = 'admin@' + Cypress.env('API_HOST')
22-
let nested = {"name":"localhost","server": Cypress.env('API_HOST'),"username":"admin","password":"","users":[],"groups":[]}
22+
let nested = { "name": "localhost", "server": Cypress.env('API_HOST'), "username": "admin", "password": "", "users": [], "groups": [] }
2323
let obj = {}
2424
obj[conn_val] = nested
2525

26-
localStorage.setItem('connections', JSON.stringify(obj))
26+
localStorage.setItem('connections', JSON.stringify(obj))
2727

28-
})
28+
})
29+
Cypress.Commands.overwrite('visit', (orig, url, options) => {
30+
// this is a fix to include the process variable when using the Electron browser
31+
return orig(url, Cypress.isBrowser('electron') ? {
32+
...options,
33+
onBeforeLoad(win) {
34+
win.process = Cypress.config('process');
35+
if (options?.onBeforeLoad) {
36+
options.onBeforeLoad(win);
37+
}
38+
}
39+
} : options);
40+
})
2941
//
3042
//
3143
// -- This is a child command --

fusion-studio-extension/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
"dependencies": {
1717
"@theia/core": "^1.15.0",
1818
"awesomplete": "1.1.5",
19-
"filesize": "6.3.0",
19+
"filesize": "7.0.0",
2020
"mimetype": "^0.0.8",
2121
"moment": "2.29.1",
2222
"ripemd160": "2.0.2",
23-
"typescript": "4.2.4",
23+
"typescript": "4.3.5",
2424
"uuid": "^8.3.2"
2525
},
2626
"devDependencies": {

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
"devDependencies": {
2020
"@4tw/cypress-drag-drop": "https://github.com/ccheraa/cypress-drag-drop",
2121
"chai": "^4.3.4",
22-
"cypress": "8.0.0",
22+
"cypress": "^8.0.0",
2323
"lerna": "4.0.0",
24-
"mocha": "^8.4.0",
24+
"mocha": "^9.0.2",
2525
"node-sass": "6.0.1",
26-
"sinon": "^10.0.0",
27-
"ts-node": "^9.1.1"
26+
"sinon": "^11.1.1",
27+
"ts-node": "^10.1.0"
2828
},
2929
"resolutions": {
3030
"node-gyp": "^7.0.0"

0 commit comments

Comments
 (0)