Merge pull request #283 from skilld-labs/behat-junit

Allow Gitlab to parse behat results

Author: David Ferlay

.gitignore

@@ -17,6 +17,7 @@ docker/docker-compose.override.yml
 behat.yml
 features/*.html
 features/*.png
+features/junit/
 .cache/
 .editorconfig
 .gitattributes

.gitlab-ci.yml

@@ -257,14 +257,15 @@ test:behat:
   script:
   - echo "Starting job script in ${BUILD_DIR}"
   - cd ${BUILD_DIR}
-  - make behat
+  - BEHAT_ARGS='--colors -f pretty -o std -f junit -o features/junit' make behat
   after_script:
   - cd ${BUILD_DIR}
   - make browser_driver_stop
   - rm -rf web/screenshots
   - mkdir web/screenshots
   - mv features/*.png web/screenshots/
   - echo "- Screenshots are available here :" && cd web/screenshots && ls -h *.png | xargs -i echo "${CI_ENVIRONMENT_URL}/screenshots/{}"
+  - mv ${BUILD_DIR}/features/junit ${CI_PROJECT_DIR}
   retry:
     max: 2
     when: script_failure
@@ -273,6 +274,13 @@ test:behat:
   allow_failure: false
   <<: *runner_tag_selection
   <<: *only_branches
+  artifacts:
+    expire_in: 1 week
+    when: always
+    paths:
+      - junit/*.xml
+    reports:
+      junit: junit/*.xml
 
 test:cinsp:
   stage: tests

scripts/makefile/tests.mk

@@ -125,6 +125,7 @@ else
 endif
 
 ## Validate Behat scenarios
+BEHAT_ARGS ?= --colors
 behat:
 	@echo "Getting base url"
 ifdef REVIEW_DOMAIN
@@ -143,7 +144,7 @@ endif
 	@echo "Running Behat scenarios against http://$(BASE_URL)"
 	$(call php, composer install -o)
 	$(call php, vendor/bin/behat -V)
-	$(call php, vendor/bin/behat --colors) || $(call php, vendor/bin/behat --colors --rerun)
+	$(call php, vendor/bin/behat $(BEHAT_ARGS)) || $(call php, vendor/bin/behat $(BEHAT_ARGS) --rerun)
 	make browser_driver_stop
 
 ## List existing behat definitions