.gitlab-ci.yml, test/Makefile: launch functional tests on CI with ver…

…sioned browsers list See #3722 and #3701.
vidjil · Mar 5, 2019 · a4abacf · a4abacf
1 parent 3b0c961
commit a4abacf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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/

diff --git a/browser/test/Makefile b/browser/test/Makefile
@@ -1,4 +1,6 @@
 
+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