Commit 1eb3ea10 authored by Mikaël Salson's avatar Mikaël Salson

Remove unnecessary code and data following previous commits

Now the browsers have to be defined in the .gitlab-ci.yml so that
one job is run for each of them. This doesn't make possible to store
this information in an external file.

Removes useless IGNORE_FUNCTIONAL_CBP.
parent 68ee6ca9
......@@ -238,7 +238,6 @@ test_browser_unit:
extends: .browser-functional
variables:
WATIR_CHROME: "1"
IGNORE_FUNCTIONAL_CBP: "1"
.browser-functional-external:
stage: test_functional_external
......@@ -261,13 +260,11 @@ test_browser_unit:
extends: .browser-functional-external
variables:
WATIR_CHROME: "1"
IGNORE_FUNCTIONAL_CBP: "1"
test_browser-functional-ff32:
extends: .browser-functional
variables:
FIREFOX_VERSION: 32
IGNORE_FUNCTIONAL_CBP: "1"
tags:
- web
......@@ -275,7 +272,6 @@ test_browser-functional-ff45:
extends: .browser-functional
variables:
FIREFOX_VERSION: 45
IGNORE_FUNCTIONAL_CBP: "1"
tags:
- web
......@@ -293,7 +289,6 @@ test_browser-functional-external-ff32:
extends: .browser-functional-external
variables:
FIREFOX_VERSION: 32
IGNORE_FUNCTIONAL_CBP: "1"
tags:
- web
......@@ -301,7 +296,6 @@ test_browser-functional-external-ff45:
extends: .browser-functional-external
variables:
FIREFOX_VERSION: 45
IGNORE_FUNCTIONAL_CBP: "1"
tags:
- web
......@@ -386,13 +380,11 @@ test-server-functional-ff32:
extends: .test_server_functional
variables:
FIREFOX_VERSION: 32
IGNORE_FUNCTIONAL_CBP: 1
test-server-functional-ff45:
extends: .test_server_functional
variables:
FIREFOX_VERSION: 45
IGNORE_FUNCTIONAL_CBP: 1
......
# sh launch_functional_tests functional/test_*rb
if [ -z "$FUNCTIONAL_CLIENT_BROWSER_PATH" -o ! -z "$IGNORE_FUNCTIONAL_CBP" ]; then
FUNCTIONAL_CLIENT_BROWSER_PATH="."
fi
if [ "$1" = "--browsers-from-file" ]
then
shift
if [ ! -f ./tested-browsers ]; then
exit 1
fi
BROWSER_LIST=`sed "s#^#$FUNCTIONAL_CLIENT_BROWSER_DIR#" ./tested-browsers`
if [ ! -z "$FIREFOX_PATH" -a ! -z "$FIREFOX_VERSION" ]; then
BROWSER_LIST="$(printf $FIREFOX_PATH $FIREFOX_VERSION)"
else
if [ "$FUNCTIONAL_CLIENT_BROWSER_PATH" = "." -a ! -z "$FIREFOX_VERSION" ]; then
BROWSER_LIST="$(printf $FIREFOX_PATH $FIREFOX_VERSION)"
else
BROWSER_LIST=$FUNCTIONAL_CLIENT_BROWSER_PATH
fi
BROWSER_LIST=.
fi
FUNCTIONAL_TESTS=$*
......
firefox/v32/firefox
firefox/v45/firefox
chrome/default/chrome
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment