[ARVADOS-WORKBENCH2] created: 2.1.0-309-gba850047

Git user git at public.arvados.org
Mon Apr 19 18:45:56 UTC 2021


        at  ba850047c085520c9604ffa6cb2e763b5500d135 (commit)


commit ba850047c085520c9604ffa6cb2e763b5500d135
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Mon Apr 19 15:29:57 2021 -0300

    17500: Fixes page-not-found failing cypress test.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/src/views/workbench/workbench.tsx b/src/views/workbench/workbench.tsx
index 78ec3c87..dc02bdd6 100644
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@ -205,7 +205,7 @@ export const WorkbenchPanel =
                         </Grid>
                         <Grid item xs className={props.classes.content}>
                             <Switch>
-                                {routes}
+                                {routes.props.children}
                                 <Route path={Routes.NO_MATCH} component={NotFoundPanel} />
                             </Switch>
                         </Grid>

commit 88f1aeb385795a545cefe26534045466d6195323
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Fri Apr 16 17:20:12 2021 -0300

    17500: Avoids multi-slash URLs usage.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 8dc003fe..2a7f350a 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -36,7 +36,7 @@ Cypress.Commands.add(
         token = systemToken, auth = false, followRedirect = true) => {
     return cy.request({
         method: method,
-        url: `${controllerURL}/${path}`,
+        url: `${controllerURL.replace(/\/+$/, '')}/${path.replace(/^\/+/, '')}`,
         body: data,
         qs: auth ? qs : Object.assign({ api_token: token }, qs),
         auth: auth ? { bearer: `${token}` } : undefined,

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list