Merge branch 'master' into micheldiz/fixTravis

Author: MichelDiz

.travis.yml

@@ -5,7 +5,7 @@ node_js:
 sudo: required
 dist: trusty
 before_install:
-  - scripts/install_dgraph.sh
+    - scripts/install_dgraph.sh
 script:
-  - scripts/build.sh
+    - scripts/build.sh
 after_success: npm run coveralls

scripts/functions.sh

@@ -14,11 +14,8 @@ function quit {
 
     if pgrep -x dgraph > /dev/null
     then
-        while pgrep dgraph;
-        do
-            echo "Sleeping for 5 secs so that Dgraph can shutdown."
-            sleep 5
-        done
+      echo "Sleeping for 5 secs so that Dgraph can shutdown."
+      sleep 5
     fi
 
     echo "Clean shutdown done."
@@ -27,7 +24,8 @@ function quit {
 
 function start {
     echo -e "Starting Dgraph alpha."
-    dgraph alpha --acl_secret_file ./scripts/hmac-secret -p data/p -w data/w --lru_mb 4096 --zero localhost:5080 > data/alpha.log 2>&1 &
+    head -c 1024 /dev/random > data/acl-secret.txt
+    dgraph alpha -p data/p -w data/w --lru_mb 4096 --zero localhost:5080 --acl_secret_file data/acl-secret.txt > data/server.log 2>&1 &
     # Wait for membership sync to happen.
     sleep $sleepTime
     return 0

src/clientStub.ts

@@ -91,11 +91,10 @@ export class DgraphClientStub {
     }
 
     public query(req: Request): Promise<Response> {
-        /* tslint:disable-next-line */
-        const headers = Object.assign(
-            {},
-            this.options.headers !== undefined ? this.options.headers : {},
-        );
+        const headers =
+            this.options.headers !== undefined
+                ? { ...this.options.headers }
+                : {};
         if (req.vars !== undefined) {
             if (this.legacyApi) {
                 headers["X-Dgraph-Vars"] = JSON.stringify(req.vars);
@@ -227,14 +226,11 @@ export class DgraphClientStub {
         } else {
             return Promise.reject("Mutation has no data");
         }
-        /* tslint:disable-next-line */
-        const headers = Object.assign(
-            {},
-            this.options.headers !== undefined ? this.options.headers : {},
-            {
-                "Content-Type": `application/${usingJSON ? "json" : "rdf"}`,
-            },
-        );
+
+        const headers = {
+            ...(this.options.headers !== undefined ? this.options.headers : {}),
+            "Content-Type": `application/${usingJSON ? "json" : "rdf"}`,
+        };
 
         if (usingJSON && this.legacyApi) {
             headers["X-Dgraph-MutationType"] = "json";