Merge branch 'develop' into staging

TrueCar · Jan 15, 2019 · 71386ca · 71386ca
2 parents d16169a + f04310c
commit 71386ca
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -137,7 +137,7 @@ jobs:
       - run: git config --global user.name "CircleCI"
       - run: ssh-keyscan github.com >> ~/.ssh/known_hosts
 
-      - run: docker pull node:8-slim
+      - run: docker pull node:8-jessie-slim
       - run: docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
       - run: BRANCH=$CIRCLE_BRANCH npm run publish -- $CIRCLE_TAG  
 

diff --git a/packages/gluestick/shared/lib/__tests__/getHttpClient.test.js b/packages/gluestick/shared/lib/__tests__/getHttpClient.test.js
@@ -139,10 +139,12 @@ describe('lib/getHttpClient', () => {
   });
 
   it('should set baseURL with https if req.secure is true', () => {
+    const host = 'hola.com:332211';
     const req = {
+      hostname: host,
       headers: {
         cookie: 'name=Lincoln',
-        host: 'hola.com:332211',
+        host,
       },
       secure: true,
     };
@@ -153,10 +155,12 @@ describe('lib/getHttpClient', () => {
   });
 
   it('should set baseURL with http if req.secure is false', () => {
+    const host = 'hola.com:332211';
     const req = {
+      hostname: host,
       headers: {
         cookie: 'name=Lincoln',
-        host: 'hola.com:332211',
+        host,
       },
       secure: false,
     };

diff --git a/packages/gluestick/shared/lib/getHttpClient.js b/packages/gluestick/shared/lib/getHttpClient.js
@@ -47,7 +47,7 @@ export default function getHttpClient(
   // If a request object is provided, then we want to merge the custom headers
   // with the headers that we sent from the browser in the request.
   client = httpClient.create({
-    baseURL: protocol + req.headers.host,
+    baseURL: protocol + req.hostname,
     headers: {
       ...headers,
     },