tests/functional: More robust chrome detection

browser/test/functional/test_multilocus.rb

@@ -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
 

browser/test/functional/vidjil_browser.rb

@@ -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