Skip to content

Commit f9fb0f6

Browse files
authored
Merge branch 'develop' into dependabot-npm_and_yarn-typescript-eslint-eslint-plugin-8.49.0
2 parents ff9691b + 2d80a36 commit f9fb0f6

8 files changed

Lines changed: 1402 additions & 1449 deletions

File tree

.github/dependabot.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,11 @@ updates:
1313
# Separate sections of the branch name with a hyphen because docker hub doesn't want slashes
1414
# for example, `dependabot-npm_and_yarn-next_js-acorn-6.4.1`
1515
separator: '-'
16-
versioning-strategy: increase-if-necessary
16+
versioning-strategy: increase-if-necessary
17+
cooldown: # Cooldown: wait before creating PRs for newly released versions
18+
default-days: 1 # fallback wait for all updates
19+
semver-major-days: 30 # waits 30 days for major updates
20+
semver-minor-days: 7 # waits 7 days for minor updates
21+
semver-patch-days: 1 # optional; explicit patch wait (defaults to default-days)
22+
include:
23+
- "*" # apply to all dependencies

Jenkinsfile.runcluster

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pipeline {
5858
string(
5959
name: 'TEST_SETUP_CALL_ID',
6060
description: 'The call id in develop',
61-
defaultValue: '301',
61+
defaultValue: '306',
6262
trim: true
6363
)
6464
string(

package-lock.json

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

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"@babel/preset-env": "^7.28.3",
3838
"@babel/preset-typescript": "^7.27.1",
3939
"@eslint/js": "^9.34.0",
40-
"@graphql-codegen/cli": "^5.0.7",
40+
"@graphql-codegen/cli": "^6.1.0",
4141
"@graphql-codegen/typed-document-node": "^6.0.2",
4242
"@types/k6": "^1.2.0",
4343
"@types/node": "^25.0.3",

run-cluster.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export TEST_SETUP_URL=http://test-setup:8100
88
export K6_PS_VUS=50
99
export K6_PS_ITERATIONS=2
1010
export K6_SETUP_TOTAL_USERS=250
11-
export TEST_SETUP_CALL_ID=301
11+
export TEST_SETUP_CALL_ID=306
1212
export FAP_PROCESS_LOAD_TEST="true"
1313
export FAP_CALL_ID=145
1414
export FAP_INSTRUMENT_ID=37

src/browser-tests/support/isisProposalSubmission.ts

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,23 +82,25 @@ export default async function isisProposalSubmissionTest(
8282

8383
sleep(5);
8484

85-
await page.locator('button[data-cy="add-participant-button"]').click();
86-
const emailInput = page.locator('#Email-input');
85+
await page.locator('button[data-cy="add-participant-button"]').click();
86+
sleep(5);
87+
88+
const emailInput = page.locator('div[data-cy="invite-user-autocomplete"] ');
8789
await emailInput.waitFor({
8890
state: 'visible',
8991
});
92+
emailInput.click();
9093
const piEmail = getRandomUser(sharedData.users, currentUser).email;
91-
emailInput.type(piEmail);
92-
const emailFilledInput = page.locator(`input[value="${piEmail}"]`);
93-
await emailFilledInput.waitFor({
94-
state: 'visible',
95-
});
9694

97-
await page.locator('button[data-cy="findUser"]').click();
95+
sleep(10);
9896

99-
sleep(5);
97+
await page.keyboard.type(piEmail);
98+
99+
sleep(10);
100+
await page.keyboard.press('Enter');
100101

101-
await page.locator('button[data-cy="assign-selected-users"]').click();
102+
sleep(10);
103+
await page.locator('button[data-cy="invite-user-submit-button"]').click();
102104

103105
sleep(5);
104106

src/browser-tests/support/proposalSubmission.ts

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ import { check, fail, sleep } from 'k6';
22
import { browser } from 'k6/browser';
33
import exec from 'k6/execution';
44
import { Counter, Trend } from 'k6/metrics';
5-
import { getRandomUser, randomIntBetween, randomString, randomWords } from '../../utils/helperFunctions';
5+
import {
6+
getRandomUser,
7+
randomIntBetween,
8+
randomString,
9+
randomWords,
10+
} from '../../utils/helperFunctions';
611
import { SharedData } from '../../utils/sharedType';
712

8-
913
const proposalSubmissionDuration = new Trend(
1014
'proposal_submission_duration',
1115
true
@@ -74,22 +78,24 @@ export default async function proposalSubmissionTest(sharedData: SharedData) {
7478
sleep(5);
7579

7680
await page.locator('button[data-cy="add-participant-button"]').click();
77-
const emailInput = page.locator('#Email-input');
81+
sleep(5);
82+
83+
const emailInput = page.locator('div[data-cy="invite-user-autocomplete"] ');
7884
await emailInput.waitFor({
7985
state: 'visible',
8086
});
87+
emailInput.click();
8188
const piEmail = getRandomUser(sharedData.users, currentUser).email;
82-
emailInput.type(piEmail);
83-
const emailFilledInput = page.locator(`input[value="${piEmail}"]`);
84-
await emailFilledInput.waitFor({
85-
state: 'visible',
86-
});
8789

88-
await page.locator('button[data-cy="findUser"]').click();
90+
sleep(10);
8991

90-
sleep(5);
92+
await page.keyboard.type(piEmail);
93+
94+
sleep(10);
95+
await page.keyboard.press('Enter');
9196

92-
await page.locator('button[data-cy="assign-selected-users"]').click();
97+
sleep(10);
98+
await page.locator('button[data-cy="invite-user-submit-button"]').click();
9399

94100
sleep(5);
95101

test-setup/package-lock.json

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

0 commit comments

Comments
 (0)