Merge pull request #430 from scitran/abao-jsonschema-ref-fix

Abao jsonschema ref fix

bin/runtests.sh

@@ -70,7 +70,7 @@ case "$1-$2" in
       -f test/docker-compose.yml \
       run \
       --rm \
-      --entrypoint "abao /usr/src/raml/api.raml --server=http://scitran-core:8080/api --hookfiles=/usr/src/tests/abao/abao_test_hooks.js" \
+      --entrypoint "/bin/bash -c 'cd /usr/src/raml/schemas/definitions && abao /usr/src/raml/api.raml --server=http://scitran-core:8080/api --hookfiles=/usr/src/tests/abao/abao_test_hooks.js'" \
       integration-test &&
     docker-compose \
       -f test/docker-compose.yml \

raml/schemas/output/config.json

@@ -9,7 +9,7 @@
           "type": "string"
         },
         "ssl_cert": {
-          "type": "null"
+          "type": ["null", "string"]
         },
         "api_url": {
           "type": "string"

test/Dockerfile

@@ -20,7 +20,7 @@ RUN apt-get update && apt-get -y install nodejs
 
 # Install abao: https://github.com/cybertk/abao
 # Using our fork of abao to expand jsonschema refs
-RUN npm install -g git+https://github.com/flywheel-io/abao.git#add-jsonschema-deref
+RUN npm install -g git+https://github.com/flywheel-io/abao.git#better-jsonschema-ref
 
 # Install newman for running postman collection tests from CLI
 RUN npm install -g newman