From 645ea9356ef315154681d093cd6a42c1a8984e12 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Kuty=C5=82a?= <daniel.kutyla@contractors.roche.com>
Date: Thu, 15 Apr 2021 23:48:47 +0200
Subject: [PATCH] 17415: Fixed port and hostname, added proper test
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>
---
 cypress/integration/collection.spec.js                     | 7 +++++--
 src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js
index fa3ad8e6a3..b3f06d10c8 100644
--- a/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@ -46,10 +46,13 @@ describe('Collection panel tests', function () {
             cy.get('[data-cy=context-menu]').contains('Open as network folder or S3 bucket').click();
             cy.get('[data-cy=download-button').click();
 
-            const filename = path.join(downloadsFolder, `${testCollection.name}.duck`)
+            const filename = path.join(downloadsFolder, `${testCollection.name}.duck`);
+            const expectedValue = '<?xmlversion="1.0"encoding="UTF-8"?><!DOCTYPEplistPUBLIC"-//Apple//DTDPLIST1.0//EN""http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plistversion="1.0"><dict><key>Protocol</key><string>davs</string><key>Provider</key><string>iterateGmbH</string><key>UUID</key><string>zzzzz-4zz18-oehuaangyo2timv</string><key>Hostname</key><string>0.0.0.0</string><key>Port</key><string>40041</string><key>Username</key><string>collectionuser1</string><key>Labels</key><array></array></dict></plist>';
 
             cy.readFile(filename, { timeout: 15000 })
-                .should('have.length.gt', 50)
+                .then((str) => {
+                    expect(str.replaceAll(' ', '').replaceAll('\n', ''), expectedValue);
+                })
                 .then(() => cy.task('clearDownload', { filename }));
         });
     });
diff --git a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
index eec15c49ee..c4d2ede00d 100644
--- a/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
+++ b/src/views-components/webdav-s3-dialog/webdav-s3-dialog.tsx
@@ -59,9 +59,9 @@ const mountainduckTemplate = ({
       <key>UUID</key>
       <string>${uuid}</string>
       <key>Hostname</key>
-      <string>${collectionsUrl.replace('https://', ``).replace('*', uuid)}</string>
+      <string>${collectionsUrl.replace('https://', ``).replace('*', uuid).split(':')[0]}</string>
       <key>Port</key>
-      <string>443</string>
+      <string>${collectionsUrl.split(':')[2] || 443}</string>
       <key>Username</key>
       <string>${username}</string>
       <key>Labels</key>
-- 
2.30.2