[WIP] Feature/remove codeception container (jdorn#726)

* removed Codecept container; use as dev package, added test pages (demo,_template)

* updated travis config

* start node container in tests

* updated CI commands

* updated docs

* simplyfied template

Author: schmunk42

.travis.yml

@@ -11,8 +11,8 @@ stages:
 _before_script_reference: &before_script_reference
   - npm install
   - cd tests
-  - docker-compose run --rm node npm run build
-  - docker-compose up -d $SELENIUM_BROWSER
+  - docker-compose up -d node $SELENIUM_BROWSER
+  - docker-compose exec node npm run build
 
 jobs:
   include:
@@ -27,37 +27,37 @@ jobs:
       name: "E2E Chrome"
       env: SELENIUM_BROWSER=chrome
       before_script: *before_script_reference
-      script: docker-compose run --rm codeceptjs codeceptjs run-multiple basic:$SELENIUM_BROWSER --invert --grep  '@optional'
+      script: docker-compose exec node codeceptjs -c /repo/tests/codeceptjs/codecept.json run-multiple basic:$SELENIUM_BROWSER --invert --grep  '@optional'
 
     - stage: test
       name: "E2E Firefox"
       env: SELENIUM_BROWSER=firefox
       before_script: *before_script_reference
-      script: docker-compose run --rm codeceptjs codeceptjs run-multiple basic:$SELENIUM_BROWSER --invert --grep  '@optional'
+      script: docker-compose exec node codeceptjs -c /repo/tests/codeceptjs/codecept.json run-multiple basic:$SELENIUM_BROWSER --invert --grep  '@optional'
 
     - stage: test
       name: "E2E Chrome nonmin"
       env: SELENIUM_BROWSER=chrome DIST_SUB_PATH=nonmin
       before_script: *before_script_reference
-      script: docker-compose run --rm codeceptjs codeceptjs run-multiple basic:$SELENIUM_BROWSER --invert --grep  '@optional'
+      script: docker-compose exec node codeceptjs -c /repo/tests/codeceptjs/codecept.json run-multiple basic:$SELENIUM_BROWSER --invert --grep  '@optional'
 
     - stage: test
       name: "E2E Firefox nonmin"
       env: SELENIUM_BROWSER=firefox DIST_SUB_PATH=nonmin
       before_script: *before_script_reference
-      script: docker-compose run --rm codeceptjs codeceptjs run-multiple basic:$SELENIUM_BROWSER --invert --grep  '@optional'
+      script: docker-compose exec node codeceptjs -c /repo/tests/codeceptjs/codecept.json run-multiple basic:$SELENIUM_BROWSER --invert --grep  '@optional'
 
     - stage: test
       name: "E2E Chrome Optional"
       env: TEST_TYPE=optional SELENIUM_BROWSER=chrome
       before_script: *before_script_reference
-      script: docker-compose run --rm codeceptjs codeceptjs run-multiple basic:$SELENIUM_BROWSER --grep '@optional'
+      script: docker-compose exec node codeceptjs -c /repo/tests/codeceptjs/codecept.json run-multiple basic:$SELENIUM_BROWSER --grep '@optional'
 
     - stage: test
       name: "E2E Firefox Optional"
       env: TEST_TYPE=optional SELENIUM_BROWSER=firefox
       before_script: *before_script_reference
-      script: docker-compose run --rm codeceptjs codeceptjs run-multiple basic:$SELENIUM_BROWSER --grep '@optional'
+      script: docker-compose exec node codeceptjs -c /repo/tests/codeceptjs/codecept.json run-multiple basic:$SELENIUM_BROWSER --grep '@optional'
 
   allow_failures:
     - env: TEST_TYPE=optional SELENIUM_BROWSER=chrome

CHANGELOG.md

@@ -1,5 +1,7 @@
 ### 2.3.0-dev
 
+- Removed codeception container, use `codeceptjs` as node-dev module
+
 ### 2.2.1-current
 
 - AbstractEditor, AbstractTheme, AbstractIconlib had been removed, re-expose them

Makefile

@@ -12,7 +12,7 @@ bash:
 	docker-compose exec node bash
 
 test:
-	docker-compose run --rm codeceptjs codeceptjs run
+	docker-compose run --rm -w /repo/tests/codeceptjs node /repo/node_modules/.bin/codeceptjs run
 
 selenium-firefox:
 	xdg-open vnc://$(DOCKER_HOST):9059

tests/Dockerfile

@@ -0,0 +1,3 @@
+FROM node:12
+
+ENV PATH=/repo/node_modules/.bin:$PATH

tests/README.md

@@ -2,10 +2,14 @@
 
 ## With Docker
 
-Go to the `tests/` directory and install node modules, start test application with node (webserver), Firefox (browser) and CodeceptJS (testing).
+Configure Docker environment:
 
 ```
-cd tests
+cp .env-dist .env
+```
+
+Install `node_modules` and start stack:
+```
 docker-compose run --rm node npm install
 docker-compose up -d
 ```
@@ -15,9 +19,10 @@ docker-compose up -d
 - Selenium Chrome Browser URL: vnc://127.0.0.1:9060/
 
 ```
-docker-compose run --rm codeceptjs bash
+docker-compose exec node bash
 
 $ npm run build
+$ cd tests/codeceptjs
 $ codeceptjs run
 ```
 

tests/codeceptjs/steps.d.ts

@@ -0,0 +1,13 @@
+/// <reference types='codeceptjs' />
+type steps_file = typeof import('./steps_file.js');
+type customHelpers = import('../../config/codeceptjs_helpers.js');
+
+declare namespace CodeceptJS {
+  interface SupportObject { I: CodeceptJS.I }
+  interface CallbackOrder { [0]: CodeceptJS.I }
+  interface Methods extends CodeceptJS.WebDriver, customHelpers {}
+  interface I extends ReturnType<steps_file> {}
+  namespace Translation {
+    interface Actions {}
+  }
+}

tests/docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   node:
-    image: node:12
+    build: .
     volumes:
       - ../:/repo:delegated
       - ../${DIST_SUB_PATH-.}/dist:/repo/dist:delegated
@@ -11,10 +11,11 @@ services:
       - '9100:9001'
     expose:
       - '9001'
+    depends_on:
+      - firefox
+      - chrome
   firefox:
     image: selenium/standalone-firefox-debug:3.141.59-oxygen
-    depends_on:
-      - node
     environment:
       - VNC_NO_PASSWORD=1
     ports:
@@ -25,8 +26,6 @@ services:
       - /dev/shm:/dev/shm
   chrome:
     image: selenium/standalone-chrome-debug:3.141.59-oxygen
-    depends_on:
-      - node
     environment:
       - VNC_NO_PASSWORD=1
     ports:
@@ -35,11 +34,3 @@ services:
     volumes:
       # Mount shm also for firefox, see https://github.com/SeleniumHQ/docker-selenium#running-the-images
       - /dev/shm:/dev/shm
-
-  codeceptjs:
-    depends_on:
-      - node
-    image: codeception/codeceptjs
-    working_dir: /repo/tests/codeceptjs
-    volumes:
-      - ../:/repo:delegated