[arvados-workbench2] updated: 2.6.3-62-ga7c3684d

git repository hosting git at public.arvados.org
Fri Aug 18 19:04:52 UTC 2023


Summary of changes:
 cypress/integration/search.spec.js | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

       via  a7c3684d8a40794db5019f5e141b9ee848755123 (commit)
      from  da02290fe314e60d70d7936d86ddf3c81c62a1b8 (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 a7c3684d8a40794db5019f5e141b9ee848755123
Author: Stephen Smith <stephen at curii.com>
Date:   Fri Aug 18 15:04:24 2023 -0400

    test making home cluster intercept less specific and rearrange intercep order
    
    Arvados-DCO-1.1-Signed-off-by: Stephen Smith <stephen at curii.com>

diff --git a/cypress/integration/search.spec.js b/cypress/integration/search.spec.js
index c707ce7d..3139b7ca 100644
--- a/cypress/integration/search.spec.js
+++ b/cypress/integration/search.spec.js
@@ -165,23 +165,6 @@ describe('Search tests', function() {
         const federatedColName = `Collection ${Math.floor(Math.random() * Math.floor(999999))}`;
         const federatedColUuid = "xxxxx-4zz18-000000000000000";
 
-        // Intercept config to insert remote cluster
-        cy.intercept({method: 'GET', hostname: 'localhost', url: '**/arvados/v1/config?nocache=*'}, (req) => {
-            Cypress.log({ displayName: 'Log message', message: "Intercepted home cluster config" });
-            req.reply((res) => {
-                res.body.RemoteClusters = {
-                    "*": res.body.RemoteClusters["*"],
-                    "xxxxx": {
-                        "ActivateUsers": true,
-                        "Host": "xxxxx.fakecluster.tld",
-                        "Insecure": false,
-                        "Proxy": true,
-                        "Scheme": ""
-                    }
-                };
-            });
-        }).as('homeClusterConfigRequest');
-
         // Fake remote cluster config
         cy.intercept(
           {
@@ -236,7 +219,24 @@ describe('Search tests', function() {
               Workbench: {},
             },
           }
-        );
+        ).as('fakeClusterConfigRequest');
+
+        // Intercept config to insert remote cluster
+        cy.intercept({method: 'GET', hostname: 'localhost', url: '**/arvados/v1/config*'}, (req) => {
+            Cypress.log({ displayName: 'Log message', message: "Intercepted home cluster config" });
+            req.reply((res) => {
+                res.body.RemoteClusters = {
+                    "*": res.body.RemoteClusters["*"],
+                    "xxxxx": {
+                        "ActivateUsers": true,
+                        "Host": "xxxxx.fakecluster.tld",
+                        "Insecure": false,
+                        "Proxy": true,
+                        "Scheme": ""
+                    }
+                };
+            });
+        }).as('homeClusterConfigRequest');
 
         cy.createCollection(adminUser.token, {
             name: colName,

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list