[ARVADOS-WORKBENCH2] updated: 2.1.0-146-g07f6b343

[Git user]

Summary of changes:
 cypress/integration/collection-panel.spec.js | 4 ++++
 src/views/main-panel/main-panel-root.tsx     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

       via  07f6b3436c07bba13c33d66862c9d6d65aef3d24 (commit)
      from  c88c5188fa28a72042dc7baf461db4ff6751eaee (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 07f6b3436c07bba13c33d66862c9d6d65aef3d24
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Jan 8 14:28:20 2021 -0500

    Add test guards to wait for progress bar to complete before continuing
    
    no issue #
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/cypress/integration/collection-panel.spec.js b/cypress/integration/collection-panel.spec.js
index 23ba682e..b86ff2a7 100644
--- a/cypress/integration/collection-panel.spec.js
+++ b/cypress/integration/collection-panel.spec.js
@@ -52,6 +52,7 @@ describe('Collection panel tests', function() {
                     })
                     cy.visit(`/collections/${this.testCollection.uuid}`);
                     // Check that name & uuid are correct.
+                    cy.get('[data-cy=linear-progress]').should('not.exist');
                     cy.get('[data-cy=collection-info-panel]')
                         .should('contain', this.testCollection.name)
                         .and('contain', this.testCollection.uuid)
@@ -146,6 +147,7 @@ describe('Collection panel tests', function() {
                 ['I ❤️ ⛵️', '...']
             ];
             nameTransitions.forEach(([from, to]) => {
+                cy.get('[data-cy=linear-progress]').should('not.exist');
                 cy.get('[data-cy=collection-files-panel]')
                     .contains(`${from}`).rightclick();
                 cy.get('[data-cy=context-menu]')
@@ -175,6 +177,7 @@ describe('Collection panel tests', function() {
             cy.loginAs(activeUser);
             cy.visit(`/collections/${this.testCollection.uuid}`);
             // Rename 'bar' to 'subdir/foo'
+            cy.get('[data-cy=linear-progress]').should('not.exist');
             cy.get('[data-cy=collection-files-panel]')
                 .contains('bar').rightclick();
             cy.get('[data-cy=context-menu]')
@@ -231,6 +234,7 @@ describe('Collection panel tests', function() {
                 ['//foo', 'Empty dir name not allowed']
             ]
             illegalNamesFromUI.forEach(([name, errMsg]) => {
+                cy.get('[data-cy=linear-progress]').should('not.exist');
                 cy.get('[data-cy=collection-files-panel]')
                     .contains('bar').rightclick();
                 cy.get('[data-cy=context-menu]')
diff --git a/src/views/main-panel/main-panel-root.tsx b/src/views/main-panel/main-panel-root.tsx
index acaa43ad..8f41ff3d 100644
--- a/src/views/main-panel/main-panel-root.tsx
+++ b/src/views/main-panel/main-panel-root.tsx
@@ -48,7 +48,7 @@ export const MainPanelRoot = withStyles(styles)(
                     uuidPrefix={uuidPrefix}
                     siteBanner={siteBanner}>
                     {working
-                        ? <LinearProgress color="secondary" />
+                        ? <LinearProgress color="secondary" data-cy="linear-progress" />
                         : null}
                 </MainAppBar>}
                 <Grid container direction="column" className={classes.root}>

-----------------------------------------------------------------------


hooks/post-receive
--