fixed tests

Author: DavertMik

.circleci/test.sh

@@ -4,8 +4,8 @@ set -e
 
 cd test
 
-docker-compose run --rm test-helpers test/helper
-docker-compose run --rm test-helpers test/rest
+docker-compose run --rm test-unit
+docker-compose run --rm test-rest
 docker-compose run --rm test-acceptance.webdriverio
 docker-compose run --rm test-acceptance.nightmare
 docker-compose run --rm test-acceptance.puppeteer

.travis.yml

@@ -29,8 +29,6 @@ before_script:
 - sh -e /etc/init.d/xvfb start
 - chmod -R 777 test/data
 - php -S 127.0.0.1:8000 -t test/data/app >/dev/null 2>&1 &
-- npm run json-server &
-- sleep 10
 script:
 - npm test
 - './node_modules/.bin/mocha test/helper/${HELPER}_test.js'

test/data/rest/db.json

@@ -1 +1 @@
-{"comments":[],"posts":[{"id":1,"title":"json-server","author":"davert"}]}
+{"posts":[{"id":1,"title":"json-server","author":"davert"}],"user":{"name":"davert"}}

test/docker-compose.yml

@@ -9,15 +9,13 @@ services:
       - ..:/codecept
       - node_modules:/codecept/node_modules
 
-  test-helpers:
+  test-rest:
     build: ..
-    entrypoint: /codecept/node_modules/.bin/mocha --invert --fgrep Appium
-    command: test/helper
+    entrypoint: /codecept/node_modules/.bin/mocha
+    command: test/rest
     working_dir: /codecept
     env_file: .env
     depends_on:
-      - selenium.chrome
-      - php
       - json_server
     volumes:
       - ..:/codecept