[ARVADOS-WORKBENCH2] updated: 2.3.0-211-gec7ef2af
Git user
git at public.arvados.org
Fri Mar 25 20:14:34 UTC 2022
Summary of changes:
cypress/support/commands.js | 53 ++++++++++++++++++++++
.../multi-panel-view/multi-panel-view.tsx | 1 +
src/views/process-panel/process-log-form.tsx | 2 +-
src/views/process-panel/process-panel-root.tsx | 8 ++--
yarn.lock | 7 +--
5 files changed, 60 insertions(+), 11 deletions(-)
via ec7ef2afacf9ca476242b33f2cb8a149905bd086 (commit)
from 29df452fb7b578582f82f613205942422043801f (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 ec7ef2afacf9ca476242b33f2cb8a149905bd086
Author: Lucas Di Pentima <lucas.dipentima at curii.com>
Date: Fri Mar 25 17:13:57 2022 -0300
16672: Adds Cypress tests on process logs viewing.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index cfdfa9ec..5a2428b2 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -133,6 +133,16 @@ Cypress.Commands.add(
}
)
+Cypress.Commands.add(
+ "getCollection", (token, uuid) => {
+ return cy.doRequest('GET', `/arvados/v1/collections/${uuid}`, null, {}, token)
+ .its('body')
+ .then(function (theCollection) {
+ return theCollection;
+ })
+ }
+)
+
Cypress.Commands.add(
"createCollection", (token, data) => {
return cy.createResource(token, 'collections', {
@@ -150,6 +160,49 @@ Cypress.Commands.add(
}
)
+Cypress.Commands.add(
+ 'createContainerRequest', (token, data) => {
+ return cy.createResource(token, 'container_requests', {
+ container_request: JSON.stringify(data),
+ ensure_unique_name: true
+ })
+ }
+)
+
+Cypress.Commands.add(
+ "updateContainerRequest", (token, uuid, data) => {
+ return cy.updateResource(token, 'container_requests', uuid, {
+ container_request: JSON.stringify(data)
+ })
+ }
+)
+
+Cypress.Commands.add(
+ "createLog", (token, data) => {
+ return cy.createResource(token, 'logs', {
+ log: JSON.stringify(data)
+ })
+ }
+)
+
+Cypress.Commands.add(
+ "logsForContainer", (token, uuid, logType, logTextArray = []) => {
+ let logs = [];
+ for (const logText of logTextArray) {
+ logs.push(cy.createLog(token, {
+ object_uuid: uuid,
+ event_type: logType,
+ properties: {
+ text: logText
+ }
+ }).as('lastLogRecord'))
+ }
+ cy.getAll('@lastLogRecord').then(function () {
+ return logs;
+ })
+ }
+)
+
Cypress.Commands.add(
"createVirtualMachine", (token, data) => {
return cy.createResource(token, 'virtual_machines', {
diff --git a/src/components/multi-panel-view/multi-panel-view.tsx b/src/components/multi-panel-view/multi-panel-view.tsx
index de824990..2bff28cb 100644
--- a/src/components/multi-panel-view/multi-panel-view.tsx
+++ b/src/components/multi-panel-view/multi-panel-view.tsx
@@ -33,6 +33,7 @@ const styles: StyleRulesCallback<CssRules> = theme => ({
},
content: {
overflow: 'auto',
+ display: 'contents',
},
});
diff --git a/src/views/process-panel/process-log-form.tsx b/src/views/process-panel/process-log-form.tsx
index 6a8e5221..1f63e28d 100644
--- a/src/views/process-panel/process-log-form.tsx
+++ b/src/views/process-panel/process-log-form.tsx
@@ -40,7 +40,7 @@ type ProcessLogFormProps = ProcessLogFormDataProps & ProcessLogFormActionProps &
export const ProcessLogForm = withStyles(styles)(
({ classes, selectedFilter, onChange, filters }: ProcessLogFormProps) =>
- <form autoComplete="off">
+ <form autoComplete="off" data-cy="process-logs-filter">
<FormControl className={classes.formControl}>
<Select
value={selectedFilter.value}
diff --git a/src/views/process-panel/process-panel-root.tsx b/src/views/process-panel/process-panel-root.tsx
index 3e695a2f..416faec7 100644
--- a/src/views/process-panel/process-panel-root.tsx
+++ b/src/views/process-panel/process-panel-root.tsx
@@ -58,7 +58,7 @@ export const ProcessPanelRoot = withStyles(styles)(
({ process, processLogsPanel, ...props }: ProcessPanelRootProps) =>
process
? <MPVContainer className={props.classes.root} spacing={8} panelStates={panelsData} justify-content="flex-start" direction="column" wrap="nowrap">
- <MPVPanelContent forwardProps xs="auto">
+ <MPVPanelContent forwardProps xs="auto" data-cy="process-info">
<ProcessInformationCard
process={process}
onContextMenu={event => props.onContextMenu(event, process)}
@@ -68,10 +68,10 @@ export const ProcessPanelRoot = withStyles(styles)(
cancelProcess={props.cancelProcess}
/>
</MPVPanelContent>
- <MPVPanelContent forwardProps xs="auto">
+ <MPVPanelContent forwardProps xs="auto" data-cy="process-details">
<ProcessDetailsCard process={process} />
</MPVPanelContent>
- <MPVPanelContent forwardProps xs maxHeight='50%'>
+ <MPVPanelContent forwardProps xs maxHeight='50%' data-cy="process-logs">
<ProcessLogsCard
onCopy={props.onLogCopyToClipboard}
process={process}
@@ -87,7 +87,7 @@ export const ProcessPanelRoot = withStyles(styles)(
navigateToLog={props.navigateToLog}
/>
</MPVPanelContent>
- <MPVPanelContent forwardProps xs maxHeight='50%'>
+ <MPVPanelContent forwardProps xs maxHeight='50%' data-cy="process-children">
<SubprocessPanel />
</MPVPanelContent>
</MPVContainer>
diff --git a/yarn.lock b/yarn.lock
index 2c05d579..d1ffb3a6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3570,16 +3570,11 @@ caniuse-api@^3.0.0:
lodash.memoize "^4.1.2"
lodash.uniq "^4.5.0"
-caniuse-lite at 1.0.30001299:
+caniuse-lite at 1.0.30001299, caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
version "1.0.30001299"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz#d753bf6444ed401eb503cbbe17aa3e1451b5a68c"
integrity sha512-iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw==
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
- version "1.0.30001299"
- resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001299.tgz"
- integrity sha512-iujN4+x7QzqA2NCSrS5VUy+4gLmRd4xv6vbBBsmfVqTx8bLAD8097euLqQgKxSVLvxjSDcvF1T/i9ocgnUFexw==
-
capture-exit@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list