Skip to content

Commit

Permalink
Merge branch 'master' of github.com:inmanta/web-console into issue/60…
Browse files Browse the repository at this point in the history
…37-multiple-default-embedded
  • Loading branch information
matborowczyk committed Nov 20, 2024
2 parents 8f47f46 + ad81aba commit 7bab095
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 16 deletions.
5 changes: 5 additions & 0 deletions changelogs/unreleased/6045-dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
change-type: patch
description: 'Build(deps-dev): Bump @testing-library/jest-dom from 6.4.8 to 6.6.3'
destination-branches:
- master
sections: {}
5 changes: 5 additions & 0 deletions changelogs/unreleased/6055-dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
change-type: patch
description: 'Build(deps): Bump @eslint/plugin-kit from 0.2.2 to 0.2.3'
destination-branches:
- master
sections: {}
5 changes: 5 additions & 0 deletions changelogs/unreleased/6057-dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
change-type: patch
description: 'Build(deps): Bump cross-spawn from 7.0.3 to 7.0.6'
destination-branches:
- master
sections: {}
9 changes: 6 additions & 3 deletions cypress/e2e/scenario-2.1-basic-service.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ if (Cypress.env("edition") === "iso") {
forceUpdateEnvironment();
});

it("2.1.1 Add Instance Cancel form", () => {
it.only("2.1.1 Add Instance Cancel form", () => {
// Go from Home page to Service Inventory of Basic-service
cy.visit("/console/");

Expand Down Expand Up @@ -109,7 +109,7 @@ if (Cypress.env("edition") === "iso") {
cy.get('[aria-label="ServiceInventory-Empty"]').should("to.be.visible");
});

it("2.1.2 Add Instance Submit form, INVALID form, EDIT form, VALID form", () => {
it.only("2.1.2 Add Instance Submit form, INVALID form, EDIT form, VALID form", () => {
// Go from Home page to Service Inventory of Basic-service
cy.visit("/console/");
cy.get('[aria-label="Environment card"]')
Expand Down Expand Up @@ -151,7 +151,10 @@ if (Cypress.env("edition") === "iso") {
cy.get('[aria-label="InstanceRow-Intro"]').should("have.length", 1);

// check whether there are two options available in the dropdown to copy the id/identifier.
cy.get('[aria-label="IdentityCell-basic-service"]').click();
cy.get('[aria-label="IdentityCell-basic-service"]').within(() => {
cy.get('[aria-label="Copy to clipboard"]').click();
});

cy.get('[role="menuitem"]').should("have.length", 2);
});

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@eslint/js": "^9.14.0",
"@stylistic/eslint-plugin-ts": "^2.6.1",
"@testing-library/dom": "^10.4.0",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/jest-dom": "^6.6.3",
"@testing-library/react": "^15.0.7",
"@testing-library/user-event": "^14.5.2",
"@types/backbone": "^1.4.19",
Expand Down
23 changes: 11 additions & 12 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1062,11 +1062,11 @@ __metadata:
linkType: hard

"@eslint/plugin-kit@npm:^0.2.0":
version: 0.2.2
resolution: "@eslint/plugin-kit@npm:0.2.2"
version: 0.2.3
resolution: "@eslint/plugin-kit@npm:0.2.3"
dependencies:
levn: "npm:^0.4.1"
checksum: 10/19ce7b8c991c7d17269044d64cd1f8e207b5ddf31290de65950cdaf4c78387467759ad0ca275708c11b85d90e649faf65618255ad310a532ef6dea7fe6326bf1
checksum: 10/0d0653ef840823fd5c0354ef8f1937e7763dbe830173eb6d2d55a19374bf04a06dff0e5214330c10a9425cf38655f632bb0d7d0666249b366e506ae291d82f7e
languageName: node
linkType: hard

Expand Down Expand Up @@ -1155,7 +1155,7 @@ __metadata:
"@tanstack/react-query": "npm:^5.37.1"
"@tanstack/react-query-devtools": "npm:^5.56.2"
"@testing-library/dom": "npm:^10.4.0"
"@testing-library/jest-dom": "npm:^6.4.8"
"@testing-library/jest-dom": "npm:^6.6.3"
"@testing-library/react": "npm:^15.0.7"
"@testing-library/user-event": "npm:^14.5.2"
"@types/backbone": "npm:^1.4.19"
Expand Down Expand Up @@ -2127,19 +2127,18 @@ __metadata:
languageName: node
linkType: hard

"@testing-library/jest-dom@npm:^6.4.8":
version: 6.4.8
resolution: "@testing-library/jest-dom@npm:6.4.8"
"@testing-library/jest-dom@npm:^6.6.3":
version: 6.6.3
resolution: "@testing-library/jest-dom@npm:6.6.3"
dependencies:
"@adobe/css-tools": "npm:^4.4.0"
"@babel/runtime": "npm:^7.9.2"
aria-query: "npm:^5.0.0"
chalk: "npm:^3.0.0"
css.escape: "npm:^1.5.1"
dom-accessibility-api: "npm:^0.6.3"
lodash: "npm:^4.17.21"
redent: "npm:^3.0.0"
checksum: 10/011e5a309e2cfc0c5cee6454427030d9a5d690df212bedcc78c15ee8d23218c3e51be32617ca879f060445ba0ba38e1b8d224b5ab11444ee076c37ed8c1c123a
checksum: 10/1f3427e45870eab9dcc59d6504b780d4a595062fe1687762ae6e67d06a70bf439b40ab64cf58cbace6293a99e3764d4647fdc8300a633b721764f5ce39dade18
languageName: node
linkType: hard

Expand Down Expand Up @@ -5143,13 +5142,13 @@ __metadata:
linkType: hard

"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
version: 7.0.3
resolution: "cross-spawn@npm:7.0.3"
version: 7.0.6
resolution: "cross-spawn@npm:7.0.6"
dependencies:
path-key: "npm:^3.1.0"
shebang-command: "npm:^2.0.0"
which: "npm:^2.0.1"
checksum: 10/e1a13869d2f57d974de0d9ef7acbf69dc6937db20b918525a01dacb5032129bd552d290d886d981e99f1b624cb03657084cc87bd40f115c07ecf376821c729ce
checksum: 10/0d52657d7ae36eb130999dffff1168ec348687b48dd38e2ff59992ed916c88d328cf1d07ff4a4a10bc78de5e1c23f04b306d569e42f7a2293915c081e4dfee86
languageName: node
linkType: hard

Expand Down

0 comments on commit 7bab095

Please sign in to comment.