[arvados] updated: 2.7.0-6056-g78ba2ad766
git repository hosting
git at public.arvados.org
Tue Mar 5 22:26:41 UTC 2024
Summary of changes:
services/workbench2/cypress.config.ts | 4 ++++
services/workbench2/cypress/e2e/project.cy.js | 28 +++++++++++++++------------
services/workbench2/cypress/e2e/search.cy.js | 4 +++-
services/workbench2/package.json | 4 ++--
services/workbench2/yarn.lock | 24 +++++++++++------------
5 files changed, 37 insertions(+), 27 deletions(-)
via 78ba2ad766885dd8ed2f75c4b4466d894b328dbf (commit)
via d12b46657b3e3e341676ce48932c0cc961763abb (commit)
via 50b990c78fe3c2855c0f2eb6706997724b3d346a (commit)
via e04151fe6963fa8dde5c19b8e3007fdddbb452ae (commit)
from 65e6fa3de6c5e921e30044c66ed494456d965c59 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 78ba2ad766885dd8ed2f75c4b4466d894b328dbf
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Tue Mar 5 19:25:31 2024 -0300
21461: Improves memory management when running tests in "open" mode.
This couple of settings improve both Electron & Firefox behaviors when
running in "interactive" (open) mode.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/services/workbench2/cypress.config.ts b/services/workbench2/cypress.config.ts
index aaeb876784..d5698b0bfb 100644
--- a/services/workbench2/cypress.config.ts
+++ b/services/workbench2/cypress.config.ts
@@ -18,5 +18,8 @@ export default defineConfig({
},
baseUrl: 'https://localhost:3000/',
experimentalRunAllSpecs: true,
+ // The 2 options below make Electron crash a lot less and Firefox behave better
+ experimentalMemoryManagement: true,
+ numTestsKeptInMemory: 0,
},
})
commit d12b46657b3e3e341676ce48932c0cc961763abb
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Tue Mar 5 18:37:27 2024 -0300
21461: Makes properties' test behave better on Firefox.
Also, only enable clipboard-related tests on electron.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/services/workbench2/cypress/e2e/project.cy.js b/services/workbench2/cypress/e2e/project.cy.js
index a7e7002759..4aeb59bc75 100644
--- a/services/workbench2/cypress/e2e/project.cy.js
+++ b/services/workbench2/cypress/e2e/project.cy.js
@@ -39,20 +39,22 @@ describe("Project tests", function () {
cy.get("[data-cy=form-dialog]").should("not.contain", "Color: Magenta");
cy.get("[data-cy=resource-properties-form]").within(() => {
cy.get("[data-cy=property-field-key]").within(() => {
- cy.get("input").type("Color");
+ cy.get("input").type("Color").blur();
});
cy.get("[data-cy=property-field-value]").within(() => {
- cy.get("input").type("Magenta");
+ cy.get("input").type("Magenta").blur();
});
- cy.root().submit();
+ cy.get("[data-cy=property-add-btn]").click();
+
cy.get("[data-cy=property-field-value]").within(() => {
- cy.get("input").type("Pink");
+ cy.get("input").type("Pink").blur();
});
- cy.root().submit();
+ cy.get("[data-cy=property-add-btn]").click();
+
cy.get("[data-cy=property-field-value]").within(() => {
- cy.get("input").type("Yellow");
+ cy.get("input").type("Yellow").blur();
});
- cy.root().submit();
+ cy.get("[data-cy=property-add-btn]").click();
});
// Confirm proper vocabulary labels are displayed on the UI.
cy.get("[data-cy=form-dialog]").should("contain", "Color: Magenta");
@@ -95,14 +97,14 @@ describe("Project tests", function () {
// Add another property
cy.get("[data-cy=resource-properties-form]").within(() => {
cy.get("[data-cy=property-field-key]").within(() => {
- cy.get("input").type("Animal");
+ cy.get("input").type("Animal").blur();
});
cy.get("[data-cy=property-field-value]").within(() => {
- cy.get("input").type("Dog");
+ cy.get("input").type("Dog").blur();
});
- cy.root().submit();
+ cy.get("[data-cy=property-add-btn]").click();
});
- cy.get("[data-cy=form-submit-btn]").click({ force: true });
+ cy.get("[data-cy=form-submit-btn]").click();
// Reopen edit via breadcrumbs and verify properties
cy.get("[data-cy=breadcrumbs]").contains(projName).rightclick();
cy.get("[data-cy=context-menu]").contains("Edit").click();
@@ -612,7 +614,9 @@ describe("Project tests", function () {
});
});
- it("copies project URL to clipboard", () => {
+ // The following test is enabled on Electron only, as Chromium and Firefox
+ // require permissions to access the clipboard.
+ it("copies project URL to clipboard", { browser: 'electron' }, () => {
const projectName = `Test project (${Math.floor(999999 * Math.random())})`;
cy.loginAs(activeUser);
diff --git a/services/workbench2/cypress/e2e/search.cy.js b/services/workbench2/cypress/e2e/search.cy.js
index 4411c9ffb4..1bf2b5c3ef 100644
--- a/services/workbench2/cypress/e2e/search.cy.js
+++ b/services/workbench2/cypress/e2e/search.cy.js
@@ -160,7 +160,9 @@ describe("Search tests", function () {
});
});
- it("shows search context menu", function () {
+ // The following test is enabled on Electron only, as Chromium and Firefox
+ // require permissions to access the clipboard.
+ it("shows search context menu", { browser: 'electron' } , function () {
const colName = `Home Collection ${Math.floor(Math.random() * Math.floor(999999))}`;
const federatedColName = `Federated Collection ${Math.floor(Math.random() * Math.floor(999999))}`;
const federatedColUuid = "xxxxx-4zz18-000000000000000";
commit 50b990c78fe3c2855c0f2eb6706997724b3d346a
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Tue Mar 5 18:36:41 2024 -0300
21461: Upgrades Cypress & caniuse-lite to latest.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/services/workbench2/package.json b/services/workbench2/package.json
index e3d5c1471c..03819ec13c 100644
--- a/services/workbench2/package.json
+++ b/services/workbench2/package.json
@@ -85,7 +85,7 @@
"uuid": "3.3.2"
},
"scripts": {
- "start": "react-scripts start",
+ "start": "BROWSER=none react-scripts start",
"build": "REACT_APP_VERSION=$VERSION REACT_APP_BUILD_NUMBER=$BUILD_NUMBER REACT_APP_GIT_COMMIT=$GIT_COMMIT react-scripts build",
"build-local": "react-scripts build",
"test": "CI=true react-scripts test",
@@ -113,7 +113,7 @@
"@types/sinon": "7.5",
"@types/uuid": "3.4.4",
"axios-mock-adapter": "1.17.0",
- "cypress": "^13.6.4",
+ "cypress": "^13.6.6",
"cypress-wait-until": "^3.0.1",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6",
diff --git a/services/workbench2/yarn.lock b/services/workbench2/yarn.lock
index a35ba73783..fa846de967 100644
--- a/services/workbench2/yarn.lock
+++ b/services/workbench2/yarn.lock
@@ -3857,7 +3857,7 @@ __metadata:
caniuse-lite: 1.0.30001299
classnames: 2.2.6
cwlts: 1.15.29
- cypress: ^13.6.4
+ cypress: ^13.6.6
cypress-wait-until: ^3.0.1
date-fns: ^2.28.0
debounce: 1.2.0
@@ -4860,7 +4860,7 @@ __metadata:
languageName: node
linkType: hard
-"buffer at npm:^5.6.0":
+"buffer at npm:^5.7.1":
version: 5.7.1
resolution: "buffer at npm:5.7.1"
dependencies:
@@ -5144,9 +5144,9 @@ __metadata:
linkType: hard
"caniuse-lite at npm:^1.0.0, caniuse-lite at npm:^1.0.30000981, caniuse-lite at npm:^1.0.30001035, caniuse-lite at npm:^1.0.30001109, caniuse-lite at npm:^1.0.30001541":
- version: 1.0.30001570
- resolution: "caniuse-lite at npm:1.0.30001570"
- checksum: 460be2c7a9b1c8a83b6aae4226661c276d9dada6c84209dee547699cf4b28030b9d1fc29ddd7626acee77412b6401993878ea0ef3eadbf3a63ded9034896ae20
+ version: 1.0.30001593
+ resolution: "caniuse-lite at npm:1.0.30001593"
+ checksum: 3e2b19075563c3222101c8d5e6ab2f6e1ba99c3ad03b8d2449f9ee7ed03e9d3dac0b1fb24c129e9a5d89fdde4abb97392280c0abb113c0c60250a2b49f378c60
languageName: node
linkType: hard
@@ -6360,9 +6360,9 @@ __metadata:
languageName: node
linkType: hard
-"cypress at npm:^13.6.4":
- version: 13.6.4
- resolution: "cypress at npm:13.6.4"
+"cypress at npm:^13.6.6":
+ version: 13.6.6
+ resolution: "cypress at npm:13.6.6"
dependencies:
"@cypress/request": ^3.0.0
"@cypress/xvfb": ^1.2.4
@@ -6371,7 +6371,7 @@ __metadata:
arch: ^2.2.0
blob-util: ^2.0.2
bluebird: ^3.7.2
- buffer: ^5.6.0
+ buffer: ^5.7.1
cachedir: ^2.3.0
chalk: ^4.1.0
check-more-types: ^2.24.0
@@ -6389,7 +6389,7 @@ __metadata:
figures: ^3.2.0
fs-extra: ^9.1.0
getos: ^3.2.1
- is-ci: ^3.0.0
+ is-ci: ^3.0.1
is-installed-globally: ~0.4.0
lazy-ass: ^1.6.0
listr2: ^3.8.3
@@ -6408,7 +6408,7 @@ __metadata:
yauzl: ^2.10.0
bin:
cypress: bin/cypress
- checksum: 39daef291ccd18d7d724d7f8c1f5a2ed2b3d24c5c1eab1e00642c5db232fcc4dbd3fd30db3a2dce4e8b737d510355d135eb43034d800198d2867ecde4cdd696a
+ checksum: 8a7db7d2941ea9fd698b9311b4f23fb6491038fe57e4c19b29a1ee58a25f9d98646674f876c1068a97428c2e81548bb0dd8701cd08e84c6b17ed75f9c2266908
languageName: node
linkType: hard
@@ -9958,7 +9958,7 @@ __metadata:
languageName: node
linkType: hard
-"is-ci at npm:^3.0.0":
+"is-ci at npm:^3.0.1":
version: 3.0.1
resolution: "is-ci at npm:3.0.1"
dependencies:
commit e04151fe6963fa8dde5c19b8e3007fdddbb452ae
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Wed Feb 28 19:33:43 2024 -0300
21461: Adds config to enable the 'run all tests' option in the UI.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/services/workbench2/cypress.config.ts b/services/workbench2/cypress.config.ts
index 75c8db0a46..aaeb876784 100644
--- a/services/workbench2/cypress.config.ts
+++ b/services/workbench2/cypress.config.ts
@@ -17,5 +17,6 @@ export default defineConfig({
return require('./cypress/plugins/index.js')(on, config)
},
baseUrl: 'https://localhost:3000/',
+ experimentalRunAllSpecs: true,
},
})
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list