.gitlab-ci.yml, test/Makefile: launch functional tests on CI with versioned browsers list

See #3722 and #3701.

.gitlab-ci.yml, test/Makefile: launch functional tests on CI with versioned browsers list
See #3722 and #3701.
a4abacf8 · Mathieu Giraud · Mikaël Salson · 3b0c9613 · a4abacf8 · a4abacf8
Commit a4abacf8 authored Feb 28, 2019 by Mathieu Giraud Committed by Mikaël Salson Mar 05, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

.gitlab-ci.yml .gitlab-ci.yml +1 -1

browser/test/Makefile browser/test/Makefile +4 -2

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,7 +223,7 @@ test_browser-functional:
    - make -C browser
    - source /etc/profile.d/rvm.sh
    - rvm use 2.6.1
-    - HEADLESS=1 make -C browser/test functional
+    - HEADLESS=1 make -C browser/test functional BROWSERS=--browsers-from-file
  artifacts:
    paths:
    - browser/

--- a/browser/test/Makefile
+++ b/browser/test/Makefile

+BROWSERS=
+
 all: unit functional

 unit: nightmare
@@ -8,10 +10,10 @@ headless:
 	HEADLESS=1 $(MAKE) external

 functional: ../../doc/analysis-example1.vidjil
-	sh launch_functional_tests functional/test_*rb
+	sh launch_functional_tests $(BROWSERS) functional/test_*rb

 external: ../../doc/analysis-example1.vidjil
-	sh launch_functional_tests functional/external_test_*rb
+	sh launch_functional_tests $(BROWSERS) functional/external_test_*rb

 functional-rbx: ../../doc/analysis-example1.vidjil
 	LIVE_SERVER=http://app.vidjil.org/browser/ ruby test_browser.rb