Commit ee596525 authored by Mikaël Salson's avatar Mikaël Salson
Browse files

Merge branch 'feature-cs/3722-browsers-from-env-or-file' into 'dev'

Feature cs/3722 browsers from env or file

See merge request !423
parents e8047a56 9f8f429e
Pipeline #66602 passed with stages
in 10 minutes and 5 seconds
......@@ -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/
......
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
......
......@@ -72,6 +72,10 @@ class TestMultilocus < BrowserTest
assert ($b.div(:id => "left-container").present?), ">> fail : left menu did not reappear"
end
def test_02_export_align_sequences
assert ( $b.menu_item_export_fasta_align(:class => 'disabledClass').exists?), ">> export align sequences is disable by default"
end
def test_03_rename_clone_by_clicking
clone_name = $b.clone_info('25')[:name]
assert (clone_name.title == 'TRBV29*01 -1/0/-0 TRBD1*01 -2/0/-5 TRBJ2-5*01'), " >> clone name is not correct : " + clone_name.title
......
......@@ -39,11 +39,6 @@ CGTCTT"
assert ($b.clone_in_segmenter('0').text.include? 'CGTCTT'), "We should have sequence CGTCTT, %s instead" % $b.clone_in_segmenter('0').text
end
def test_02_export_align_sequences
assert ( $b.menu_item_export_fasta_align(:class => 'disabledClass').exists?), ">> export align sequences is disable by default"
end
def test_zz_close
close_everything
end
......
......@@ -164,18 +164,18 @@ class VidjilBrowser < Watir::Browser
return div(:id => 'settings_menu')
end
def menu_item_export(id)
def menu_item_export(id, extra = {})
menu = menu_import_export
menu.click
return menu.a(:id => id)
return menu.a(extra.merge(:id => id))
end
def menu_item_export_fasta
return menu_item_export('export_fasta')
def menu_item_export_fasta(extra = {})
return menu_item_export('export_fasta', extra)
end
def menu_item_export_fasta_align
return menu_item_export('export_fasta_align')
def menu_item_export_fasta_align(extra = {})
return menu_item_export('export_fasta_align', extra)
end
def merge
......
# sh launch_functional_tests functional/test_*rb
if [ -z "$FUNCTIONAL_CLIENT_BROWSER_PATH" ]; then
FUNCTIONAL_CLIENT_BROWSER_PATH="."
fi
if [ "$1" = "--browsers-from-file" ]
then
shift
BROWSER_LIST=`sed "s#^#$FUNCTIONAL_CLIENT_BROWSER_DIR#" ./tested-browsers`
else
BROWSER_LIST=$FUNCTIONAL_CLIENT_BROWSER_PATH
fi
FUNCTIONAL_TESTS=$*
BROWSER_LIST=./tested-browsers
rename_reports_in() {
dir="$1"
......@@ -19,17 +30,17 @@ rename_reports_in() {
rm -f test/*.xml
EXIT=0
if [ -z "$FUNCTIONAL_CLIENT_BROWSER_PATH" ]; then
FUNCTIONAL_CLIENT_BROWSER_PATH="."
fi
cat $BROWSER_LIST | while read browser ; do
for browser in $BROWSER_LIST; do
echo
echo "\033[1m\033[33m===== Testing browser: " $browser "\033[0m"
echo
for file in $FUNCTIONAL_TESTS; do
echo "\033[34m===" $file "\033[0m"
if [ ${#browser} -gt 1 ]; then
export WATIR_BROWSER_PATH="$FUNCTIONAL_CLIENT_BROWSER_PATH/$browser"
export WATIR_BROWSER_PATH="$browser"
fi
ruby -I functional $file;
TMP_EXIT=$?
......
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