Commit 15729d57 authored by Mathieu Giraud's avatar Mathieu Giraud

Merge branch 'feature-sc/fix-external-tests-for-chrome' into 'dev'

Browser tests for chrome

Closes #3695

See merge request !437
parents 73672dac 2562c3eb
Pipeline #68001 passed with stages
in 7 minutes
......@@ -253,6 +253,7 @@ function imgtPostForSegmenter(species, data, system, segmenter, override_imgt_op
var input = document.createElement('input');
input.type = 'checkbox';
input.id = 'imgt_cdr3_input_check';
input.checked = false;
$(input).on("click", function() {
if(this.checked) {
segmenter.highlight[1].field = "CDR3-IMGT";
......@@ -264,7 +265,6 @@ function imgtPostForSegmenter(species, data, system, segmenter, override_imgt_op
segmenter.update();
});
input.click();
var label = document.createElement('label');
label.setAttribute("for", 'imgt_cdr3_input_check');
label.innerHTML = 'CDR3-IMGT';
......@@ -278,6 +278,7 @@ function imgtPostForSegmenter(species, data, system, segmenter, override_imgt_op
input = document.createElement('input');
input.type = 'checkbox';
input.id = 'imgt_vdj_input_check';
input.checked = false;
$(input).on("click", function() {
if(this.checked) {
segmenter.highlight[2].field = "V-REGION";
......@@ -295,7 +296,6 @@ function imgtPostForSegmenter(species, data, system, segmenter, override_imgt_op
segmenter.update();
});
input.click();
label = document.createElement('label');
label.setAttribute("for", 'imgt_vdj_input_check');
label.innerHTML = "V/D/J-IMGT";
......
......@@ -53,7 +53,7 @@ class ExternalTest < BrowserTest
begin
$b.clone_in_scatterplot('25').click
$b.span(:id => "toIMGTSeg" ).click
$b.segmenter_checkbox_imgt_vdj.wait_until(&:present?)
$b.until { $b.segmenter_checkbox_imgt_vdj.present? }
clone_info = $b.clone_info_segmenter('25')
productive_title = clone_info[:axis].element(:class => 'productivity-IMGT').title
......
......@@ -219,7 +219,7 @@ class TestMultilocus < BrowserTest
def test_14_export_sample_report
if ENV['WATIR_CHROME']
if $b.driver.capabilities.browser_name == 'chrome'
skip "Issue #3699 must be solved first"
end
......
......@@ -10,7 +10,7 @@ class VidjilBrowser < Watir::Browser
Selenium::WebDriver::Chrome.path = ENV['WATIR_BROWSER_PATH']
end
# :chrome or :safari
if ENV['WATIR_CHROME']
if ENV['WATIR_CHROME'] or ENV['WATIR_BROWSER_PATH'].include? "chrom"
super :chrome
elsif ENV['WATIR_MARIONETTE']
super :firefox
......
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