Skip to content

Commit 1af94a0

Browse files
authored
Merge branch 'dev' into bug/QCG/OGUI-1763/scrolling-resets-on-object-tree
2 parents f04ccfa + 0a6b618 commit 1af94a0

7 files changed

Lines changed: 25 additions & 42 deletions

File tree

Framework/package-lock.json

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

Framework/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
"mysql": "^2.18.1",
4040
"openid-client": "^5.6.0",
4141
"winston": "3.19.0",
42-
"ws": "^8.18.0",
42+
"ws": "^8.19.0",
4343
"protobufjs": "^7.5.0"
4444
},
4545
"devDependencies": {
4646
"@eslint/js": "^9.39.1",
4747
"@stylistic/eslint-plugin": "^5.6.1",
4848
"eslint": "^9.39.1",
4949
"eslint-plugin-jsdoc": "^61.5.0",
50-
"globals": "^16.5.0",
50+
"globals": "^17.0.0",
5151
"mocha": "^11.7.0",
5252
"nock": "15.0.0",
5353
"nyc": "^17.1.0",

InfoLogger/package-lock.json

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

InfoLogger/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@stylistic/eslint-plugin": "^5.6.1",
3939
"eslint": "^9.39.1",
4040
"eslint-plugin-jsdoc": "^61.5.0",
41-
"globals": "^16.5.0",
41+
"globals": "^17.0.0",
4242
"mocha": "^11.7.0",
4343
"nyc": "^17.1.0",
4444
"puppeteer": "^24.34.0",

QualityControl/package-lock.json

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

QualityControl/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@stylistic/eslint-plugin-js": "^4.4.0",
5353
"eslint": "^9.39.1",
5454
"eslint-plugin-jsdoc": "^61.5.0",
55-
"globals": "^16.5.0",
55+
"globals": "^17.0.0",
5656
"nock": "^15.0.0",
5757
"puppeteer": "^24.34.0",
5858
"sequelize-cli": "^6.6.2",

QualityControl/test/public/features/filterTest.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ export const filterTests = async (url, page, timeout = 5000, testParent) => {
3232
strictEqual(location.href.includes('RunNumber=0'), true, 'URL should contain RunNumber=0');
3333

3434
//Naviagte to object view
35-
await extendTree(3, 5);
36-
await page.locator('tr:last-of-type td').click();
35+
await extendTree(3, 4);
36+
await page.locator('tbody tr:nth-child(4) td').click();
3737
await page.waitForSelector('#fullscreen-button');
3838
await page.locator('#fullscreen-button').click();
3939
await page.waitForSelector('#runNumberFilter', { visible: true });

0 commit comments

Comments
 (0)