use ssl in e2e

cBioPortal · Feb 11, 2019 · 6b3f1b7 · 6b3f1b7
1 parent a3595f8
commit 6b3f1b7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -93,9 +93,10 @@ jobs:
           name: "Install http server"
           command: "yarn add http-server"
       - run:
-          name: "Spin up frontend repo and run end to end tests"
+          name: "Spin up frontend over ssl and run end to end tests"
           command: |
-            ./node_modules/http-server/bin/http-server --cors dist/ -p 3000 & \
+            openssl req -newkey rsa:2048 -new -nodes -x509 -days 1 -keyout key.pem -out cert.pem -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" && \
+            ./node_modules/http-server/bin/http-server -S -C cert.pem --cors dist/ -p 3000 & \
             cd end-to-end-tests && \
             yarn install --frozen-lockfile && \
             ./node_modules/webdriver-manager/bin/webdriver-manager update --versions.chrome '2.42' && \
@@ -108,7 +109,7 @@ jobs:
             sleep 5s && \
             curl $CBIOPORTAL_URL > /dev/null && \
             sleep 20s && \
-            curl http://localhost:3000 > /dev/null && \
+            curl --insecure https://localhost:3000 > /dev/null && \
             sleep 1s && \
             cd end-to-end-tests && \
             yarn run test-webdriver-manager

diff --git a/end-to-end-tests/specs/specUtils.js b/end-to-end-tests/specs/specUtils.js
@@ -30,11 +30,9 @@ function goToUrlAndSetLocalStorage(url) {
     if (!useExternalFrontend) {
         browser.url(url);
     } else {
-        var cleanUrl = url.replace(/^http[s]?:\/\//,''); // remove protocol
         var urlparam = useLocalDist? 'localdist' : 'localdev';
         var prefix = (url.indexOf("?") > 0)? '&' : '?';
-        // always use http
-        browser.url(`http://${cleanUrl}${prefix}${urlparam}=true`);
+        browser.url(`${url}${prefix}${urlparam}=true`);
     }
     browser.setViewportSize({ height: 1600, width: 1000 });
 

diff --git a/end-to-end-tests/wdio/webdriver-manager.conf.js b/end-to-end-tests/wdio/webdriver-manager.conf.js
@@ -50,7 +50,7 @@ exports.config = {
 
         browserName: 'chrome',
         chromeOptions: {
-            args: ['--disable-composited-antialiasing']
+            args: ['--disable-composited-antialiasing','--allow-insecure-localhost']
         }
 
         // chromeOptions: {