From d50277d7927431380b8561baa628bf0173932b60 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Mon, 27 Dec 2021 10:18:08 +0100 Subject: [PATCH] No double slash in selenium --- client/webpack.config.js | 1 + lib/galaxy_test/base/testcase.py | 2 +- lib/galaxy_test/driver/integration_util.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/webpack.config.js b/client/webpack.config.js index 0e0c4e1cd71..37d8e2d927d 100644 --- a/client/webpack.config.js +++ b/client/webpack.config.js @@ -25,6 +25,7 @@ module.exports = (env = {}, argv = {}) => { }, output: { path: path.join(__dirname, "../", "/static/dist"), + publicPath: "/static/dist/", filename: "[name].bundled.js", }, resolve: { diff --git a/lib/galaxy_test/base/testcase.py b/lib/galaxy_test/base/testcase.py index 6d45a6ac0d9..2de8150d027 100644 --- a/lib/galaxy_test/base/testcase.py +++ b/lib/galaxy_test/base/testcase.py @@ -32,7 +32,7 @@ class FunctionalTestCase(unittest.TestCase): if server_wrapper: self.host = server_wrapper.host self.port = server_wrapper.port - self.url = f"http://{self.host}:{self.port}{server_wrapper.prefix}/" + self.url = f"http://{self.host}:{self.port}{server_wrapper.prefix.rstrip('/')}/" self.test_data_resolver = TestDataResolver() self.keepOutdir = setup_keep_outdir() diff --git a/lib/galaxy_test/driver/integration_util.py b/lib/galaxy_test/driver/integration_util.py index cf66e536a0a..0f1f3b957c8 100644 --- a/lib/galaxy_test/driver/integration_util.py +++ b/lib/galaxy_test/driver/integration_util.py @@ -117,7 +117,7 @@ class IntegrationInstance(UsesApiTestCaseMixin): host = server_wrapper.host port = server_wrapper.port prefix = server_wrapper.prefix or '' - self.url = f"http://{host}:{port}{prefix}/" + self.url = f"http://{host}:{port}{prefix.rstrip('/')}/" self._setup_interactor() def restart(self, handle_reconfig=None):