[arvados-workbench2] updated: 2.6.3-37-g756e585f

[git repository hosting]

Summary of changes:
 Makefile                       | 9 ++++++---
 src/common/redirect-to.test.ts | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

       via  756e585f2c1c50ed550d88c7becfe757dd9d8401 (commit)
       via  a5c8f799e1bd90a3d7a61d2c88215bf380508d84 (commit)
      from  84161e969c13b42451752bd5f134b968d15c1001 (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 756e585f2c1c50ed550d88c7becfe757dd9d8401
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Jul 31 16:00:45 2023 -0400

    20688: Update test for uri encoding/decoding of PDH
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/src/common/redirect-to.test.ts b/src/common/redirect-to.test.ts
index 0168fd80..adb52f4b 100644
--- a/src/common/redirect-to.test.ts
+++ b/src/common/redirect-to.test.ts
@@ -10,7 +10,7 @@ describe('redirect-to', () => {
         keepWebServiceUrl: 'http://localhost',
         keepWebServiceInlineUrl: 'http://localhost-inline'
     };
-    const redirectTo = '/test123';
+    const redirectTo = 'c=acbd18db4cc2f85cedef654fccc4a4d8%2B3/foo';
     const locationTemplate = {
         hash: '',
         hostname: '',
@@ -51,7 +51,7 @@ describe('redirect-to', () => {
             storeRedirects();
 
             // then
-            expect(window.localStorage.setItem).toHaveBeenCalledWith('redirectToDownload', redirectTo);
+            expect(window.localStorage.setItem).toHaveBeenCalledWith('redirectToDownload', decodeURIComponent(redirectTo));
         });
     });
 

commit a5c8f799e1bd90a3d7a61d2c88215bf380508d84
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Mon Jul 31 15:24:00 2023 -0400

    20688: Make sure ARVADOS_DIRECTORY is set when it is needed
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/Makefile b/Makefile
index 07c3b200..0b1b2381 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ clean-node-modules:
 
 clean: clean-rpm clean-deb clean-node-modules
 
-arvados-server-install:
+arvados-server-install: check-arvados-directory
 	cd $(ARVADOS_DIRECTORY)
 	go mod download
 	cd cmd/arvados-server
@@ -77,13 +77,16 @@ yarn-install: arvados-server-install
 unit-tests: yarn-install
 	yarn test --no-watchAll --bail --ci
 
-integration-tests: yarn-install
+integration-tests: yarn-install check-arvados-directory
 	yarn run cypress install
 	$(WORKSPACE)/tools/run-integration-tests.sh -a $(ARVADOS_DIRECTORY)
 
-integration-tests-in-docker: workbench2-build-image
+integration-tests-in-docker: workbench2-build-image check-arvados-directory
 	docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make integration-tests
 
+unit-tests-in-docker: workbench2-build-image check-arvados-directory
+	docker run -ti -v$(PWD):/usr/src/workbench2 -v$(ARVADOS_DIRECTORY):/usr/src/arvados -w /usr/src/workbench2 -e ARVADOS_DIRECTORY=/usr/src/arvados workbench2-build make unit-tests
+
 test: unit-tests integration-tests
 
 build: yarn-install

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


hooks/post-receive
--