From 4d8395eafff006b937599cb1bb87d1ce133e2c53 Mon Sep 17 00:00:00 2001
From: Jack Walker <jwrc@protonmail.com>
Date: Wed, 22 Apr 2020 14:09:32 +1000
Subject: [PATCH] Hopefully found the final fix for the Travis/Browserstack
 local tunnel issues

---
 .travis.yml         | 19 +++++++++++--------
 spec/spec_helper.rb |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b170bf6b9..609ae6673 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,24 +13,27 @@ before_script:
   - RUBY_VERSION=/bin/bash rvm current
   - sed -i -E 's/system\((.*?)\)/""/g' /home/travis/.rvm/gems/$RUBY_VERSION/gems/browserstack-local-1.3.0/lib/browserstack/local.rb
   - yes | ./update-geoipdb
+env:
+  - CONFIG_FILE=windows/windows_chrome_latest.config.yaml
 jobs:
   include:
-    - name: "Full Test Suite"
+    - name: "Full Test Suite 2.5.3"
       rvm: 2.5.3
-      env: CONFIG_FILE=windows/windows_chrome_latest.config.yaml
       script: bundle exec rake
-    - name: "Full Test Suite"
+    - name: "Full Test Suite 2.6.0"
       rvm: 2.6.0
-      env: CONFIG_FILE=windows/windows_chrome_latest.config.yaml
       script: bundle exec rake
-    - name: "Full Test Suite"
+    - name: "Full Test Suite 2.6.3"
+      rvm: 2.6.3
+      script: bundle exec rake
+    - name: "Full Test Suite 2.6.5"
       rvm: 2.6.5
-      env: CONFIG_FILE=windows/windows_chrome_latest.config.yaml
       script: bundle exec rake
-    - name: "Full Test Suite"
+    - name: "Full Test Suite 2.7.0"
       rvm: 2.7.0
-      env: CONFIG_FILE=windows/windows_chrome_latest.config.yaml
       script: bundle exec rake
+script:
+  - bundle exec rspec --tag run_on_browserstack
 addons:
   apt:
     packages:
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 0235fd73c..b8a629592 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -79,6 +79,7 @@ RSpec.configure do |config|
       bs_local_args = { "key" => CONFIG['key'], "forcelocal" => true }
       @bs_local.start(bs_local_args)
       @caps["browserstack.local"] = true
+      @caps['browserstack.localIdentifier'] = ENV['BROWSERSTACK_LOCAL_IDENTIFIER']
     end
 
     @driver = Selenium::WebDriver.for(:remote,