From 9f5b3c540de51fdefd381dcc028fdb09ec4997fa Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 11:32:10 +1000 Subject: [PATCH 01/15] Re-running failing tests. --- .travis.yml | 126 +++++++++--------- Rakefile | 4 +- .../handlers/browser_details_handler_spec.rb | 2 +- ...nfig.yml => catalina_chrome_41.config.yml} | 4 +- .../elcapitan_chrome_14.config.yml | 0 .../elcapitan_chrome_81.config.yml | 0 .../elcapitan_firefox_6.config.yml} | 4 +- .../elcapitan_firefox_75.config.yml | 0 .../elcapitan_safari_9-1.config.yml} | 0 .../snowleopard_chrome_14.config.yml | 0 .../snowleopard_chrome_35.config.yml | 0 .../snowleopard_chrome_49.config.yml | 0 .../snowleopard_firefox_38esr.config.yml | 0 .../snowleopard_firefox_42.config.yml | 0 .../snowleopard_firefox_6.config.yml} | 4 +- .../snowleopard_safari_5-1.config.yml | 0 .../win10_chrome_37.config.yml | 0 .../win10_chrome_59.config.yml | 0 .../win10_chrome_81.config.yml | 0 .../win10_edge_81.config.yml | 0 .../win10_firefox_32.config.yml | 0 .../win10_firefox_68esr.config.yml | 0 .../win10_firefox_75.config.yml | 0 .../{win_10 => win10}/win10_ie_11.config.yml | 0 .../{win_8 => win8}/win8_chrome_22.config.yml | 0 .../{win_8 => win8}/win8_chrome_28.config.yml | 0 .../{win_8 => win8}/win8_chrome_36.config.yml | 0 .../{win_8 => win8}/win8_chrome_43.config.yml | 0 .../{win_8 => win8}/win8_chrome_51.config.yml | 0 .../{win_8 => win8}/win8_chrome_59.config.yml | 0 .../{win_8 => win8}/win8_chrome_67.config.yml | 0 .../{win_8 => win8}/win8_chrome_75.config.yml | 0 .../{win_8 => win8}/win8_chrome_81.config.yml | 0 .../{win_8 => win8}/win8_edge_81.config.yml | 0 .../win8_firefox_32.config.yml | 0 .../win8_firefox_75.config.yml | 0 .../{win_8 => win8}/win8_ie_10.config.yml | 0 .../windows/win_10/win10_chrome_43.config.yml | 14 -- .../windows/win_10/win10_chrome_51.config.yml | 14 -- .../windows/win_10/win10_chrome_67.config.yml | 14 -- .../windows/win_10/win10_chrome_75.config.yml | 14 -- .../windows/win_7/win7_ie_10.config.yml | 14 -- .../windows/win_7/win7_ie_11.config.yml | 14 -- .../windows/win_7/win7_ie_8.config.yml | 14 -- .../windows/win_7/win7_ie_9.config.yml | 14 -- .../windows/win_7/win8_chrome_14.config.yml | 14 -- .../windows/win_7/win8_chrome_20.config.yml | 14 -- .../windows/win_7/win8_chrome_28.config.yml | 14 -- .../windows/win_7/win8_chrome_36.config.yml | 14 -- .../windows/win_7/win8_chrome_43.config.yml | 14 -- .../windows/win_7/win8_chrome_51.config.yml | 14 -- .../windows/win_7/win8_chrome_59.config.yml | 14 -- .../windows/win_7/win8_chrome_67.config.yml | 14 -- .../windows/win_7/win8_chrome_75.config.yml | 14 -- .../win_7/win8_chrome_latest.config.yml | 13 -- .../win_8-1/win8-1_chrome_22.config.yml | 14 -- .../win_8-1/win8-1_chrome_28.config.yml | 14 -- .../win_8-1/win8-1_chrome_36.config.yml | 14 -- .../win_8-1/win8-1_chrome_43.config.yml | 14 -- .../win_8-1/win8-1_chrome_51.config.yml | 14 -- .../win_8-1/win8-1_chrome_59.config.yml | 14 -- .../win_8-1/win8-1_chrome_67.config.yml | 14 -- .../win_8-1/win8-1_chrome_75.config.yml | 14 -- .../win_8-1/win8-1_chrome_latest.config.yml | 13 -- .../windows/win_8-1/win8-1_ie_11.config.yml | 14 -- .../windows/xp/xp_chrome_20.config.yml | 14 -- .../windows/xp/xp_chrome_36.config.yml | 14 -- .../windows/xp/xp_chrome_latest.config.yml | 13 -- .../windows/xp/xp_firefox_5.config.yml | 14 -- ...e_6.config.yml => xp_firefox_6.config.yml} | 4 +- 70 files changed, 78 insertions(+), 515 deletions(-) rename spec/support/browserstack/osx/catalina/{catalina_chrome_39.config.yml => catalina_chrome_41.config.yml} (76%) rename spec/support/browserstack/osx/{el_capitan => elcapitan}/elcapitan_chrome_14.config.yml (100%) rename spec/support/browserstack/osx/{el_capitan => elcapitan}/elcapitan_chrome_81.config.yml (100%) rename spec/support/browserstack/osx/{el_capitan/elcapitan_firefox_5.config.yml => elcapitan/elcapitan_firefox_6.config.yml} (76%) rename spec/support/browserstack/osx/{el_capitan => elcapitan}/elcapitan_firefox_75.config.yml (100%) rename spec/support/browserstack/osx/{el_capitan/elcapitan_safari_9-1.yml => elcapitan/elcapitan_safari_9-1.config.yml} (100%) rename spec/support/browserstack/osx/{snow_leopard => snowleopard}/snowleopard_chrome_14.config.yml (100%) rename spec/support/browserstack/osx/{snow_leopard => snowleopard}/snowleopard_chrome_35.config.yml (100%) rename spec/support/browserstack/osx/{snow_leopard => snowleopard}/snowleopard_chrome_49.config.yml (100%) rename spec/support/browserstack/osx/{snow_leopard => snowleopard}/snowleopard_firefox_38esr.config.yml (100%) rename spec/support/browserstack/osx/{snow_leopard => snowleopard}/snowleopard_firefox_42.config.yml (100%) rename spec/support/browserstack/osx/{snow_leopard/snowleopard_firefox_5.config.yml => snowleopard/snowleopard_firefox_6.config.yml} (76%) rename spec/support/browserstack/osx/{snow_leopard => snowleopard}/snowleopard_safari_5-1.config.yml (100%) rename spec/support/browserstack/windows/{win_10 => win10}/win10_chrome_37.config.yml (100%) rename spec/support/browserstack/windows/{win_10 => win10}/win10_chrome_59.config.yml (100%) rename spec/support/browserstack/windows/{win_10 => win10}/win10_chrome_81.config.yml (100%) rename spec/support/browserstack/windows/{win_10 => win10}/win10_edge_81.config.yml (100%) rename spec/support/browserstack/windows/{win_10 => win10}/win10_firefox_32.config.yml (100%) rename spec/support/browserstack/windows/{win_10 => win10}/win10_firefox_68esr.config.yml (100%) rename spec/support/browserstack/windows/{win_10 => win10}/win10_firefox_75.config.yml (100%) rename spec/support/browserstack/windows/{win_10 => win10}/win10_ie_11.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_chrome_22.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_chrome_28.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_chrome_36.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_chrome_43.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_chrome_51.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_chrome_59.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_chrome_67.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_chrome_75.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_chrome_81.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_edge_81.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_firefox_32.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_firefox_75.config.yml (100%) rename spec/support/browserstack/windows/{win_8 => win8}/win8_ie_10.config.yml (100%) delete mode 100644 spec/support/browserstack/windows/win_10/win10_chrome_43.config.yml delete mode 100644 spec/support/browserstack/windows/win_10/win10_chrome_51.config.yml delete mode 100644 spec/support/browserstack/windows/win_10/win10_chrome_67.config.yml delete mode 100644 spec/support/browserstack/windows/win_10/win10_chrome_75.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win7_ie_10.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win7_ie_11.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win7_ie_8.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win7_ie_9.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win8_chrome_14.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win8_chrome_20.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win8_chrome_28.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win8_chrome_36.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win8_chrome_43.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win8_chrome_51.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win8_chrome_59.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win8_chrome_67.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win8_chrome_75.config.yml delete mode 100644 spec/support/browserstack/windows/win_7/win8_chrome_latest.config.yml delete mode 100644 spec/support/browserstack/windows/win_8-1/win8-1_chrome_22.config.yml delete mode 100644 spec/support/browserstack/windows/win_8-1/win8-1_chrome_28.config.yml delete mode 100644 spec/support/browserstack/windows/win_8-1/win8-1_chrome_36.config.yml delete mode 100644 spec/support/browserstack/windows/win_8-1/win8-1_chrome_43.config.yml delete mode 100644 spec/support/browserstack/windows/win_8-1/win8-1_chrome_51.config.yml delete mode 100644 spec/support/browserstack/windows/win_8-1/win8-1_chrome_59.config.yml delete mode 100644 spec/support/browserstack/windows/win_8-1/win8-1_chrome_67.config.yml delete mode 100644 spec/support/browserstack/windows/win_8-1/win8-1_chrome_75.config.yml delete mode 100644 spec/support/browserstack/windows/win_8-1/win8-1_chrome_latest.config.yml delete mode 100644 spec/support/browserstack/windows/win_8-1/win8-1_ie_11.config.yml delete mode 100644 spec/support/browserstack/windows/xp/xp_chrome_20.config.yml delete mode 100644 spec/support/browserstack/windows/xp/xp_chrome_36.config.yml delete mode 100644 spec/support/browserstack/windows/xp/xp_chrome_latest.config.yml delete mode 100644 spec/support/browserstack/windows/xp/xp_firefox_5.config.yml rename spec/support/browserstack/windows/xp/{xp_ie_6.config.yml => xp_firefox_6.config.yml} (77%) diff --git a/.travis.yml b/.travis.yml index fba2124ba..c0367ae0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,67 +13,73 @@ 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 env: - - CONFIG_FILE=osx/catalina/catalina_chrome_39.config.yml - - CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml - - CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml - - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml - - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml - - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml - - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml - - CONFIG_FILE=osx/el_capitan/elcapitan_chrome_14.config.yml - - CONFIG_FILE=osx/el_capitan/elcapitan_chrome_81.config.yml - - CONFIG_FILE=osx/el_capitan/elcapitan_firefox_5.config.yml - - CONFIG_FILE=osx/el_capitan/elcapitan_firefox_75.config.yml - - CONFIG_FILE=osx/el_capitan/elcapitan_safari_9-1.config.yml - - CONFIG_FILE=osx/snow_leopard/snowleopard_chrome_14.config.yml - - CONFIG_FILE=osx/snow_leopard/snowleopard_chrome_35.config.yml - - CONFIG_FILE=osx/snow_leopard/snowleopard_chrome_49.config.yml - - CONFIG_FILE=osx/snow_leopard/snowleopard_firefox_5.config.yml - - CONFIG_FILE=osx/snow_leopard/snowleopard_firefox_38esr.config.yml - - CONFIG_FILE=osx/snow_leopard/snowleopard_firefox_42.config.yml - - CONFIG_FILE=osx/snow_leopard/snowleopard_safari_5-1.config.yml - - CONFIG_FILE=windows/win_10/win10_chrome_37.config.yml - - CONFIG_FILE=windows/win_10/win10_chrome_59.config.yml - - CONFIG_FILE=windows/win_10/win10_firefox_32.config.yml - - CONFIG_FILE=windows/win_10/win10_firefox_68esr.config.yml - - CONFIG_FILE=windows/win_10/win10_firefox_75.config.yml - - CONFIG_FILE=windows/win_10/win10_edge_81.config.yml - - CONFIG_FILE=windows/win_10/win10_ie_11.config.yml - - CONFIG_FILE=windows/win_8/win8_chrome_22.config.yml - - CONFIG_FILE=windows/win_8/win8_chrome_81.config.yml - - CONFIG_FILE=windows/win_8/win8_firefox_32.config.yml - - CONFIG_FILE=windows/win_8/win8_firefox_75.config.yml - - CONFIG_FILE=windows/win_8/win8_edge_81.config.yml - - CONFIG_FILE=windows/win_8/win8_ie_10.config.yml - - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml - - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml - - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml - - CONFIG_FILE=windows/xp/xp_firefox_5.config.yml - - CONFIG_FILE=windows/xp/xp_firefox_45esr.config.yml - - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml + - CONFIG_FILE=osx/catalina/catalina_chrome_41.config.yml + # - CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml + # - CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml + # - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml + # - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml + # - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml + # - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml + # - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_14.config.yml + # - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_81.config.yml + # - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_6.config.yml + # - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_75.config.yml + # - CONFIG_FILE=osx/elcapitan/elcapitan_safari_9-1.config.yml + # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_14.config.yml + # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_35.config.yml + # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_49.config.yml + - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_6.config.yml + # - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_38esr.config.yml + # - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_42.config.yml + # - CONFIG_FILE=osx/snowleopard/snowleopard_safari_5-1.config.yml + # - CONFIG_FILE=windows/win10/win10_chrome_37.config.yml + # - CONFIG_FILE=windows/win10/win10_chrome_59.config.yml + # - CONFIG_FILE=windows/win10/win10_chrome_81.config.yml + # - CONFIG_FILE=windows/win10/win10_firefox_32.config.yml + # - CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml + # - CONFIG_FILE=windows/win10/win10_firefox_75.config.yml + - CONFIG_FILE=windows/win10/win10_edge_81.config.yml + - CONFIG_FILE=windows/win10/win10_ie_11.config.yml + # - CONFIG_FILE=windows/win8/win8_chrome_22.config.yml + # - CONFIG_FILE=windows/win8/win8_chrome_81.config.yml + # - CONFIG_FILE=windows/win8/win8_firefox_32.config.yml + # - CONFIG_FILE=windows/win8/win8_firefox_75.config.yml + # - CONFIG_FILE=windows/win8/win8_edge_81.config.yml + - CONFIG_FILE=windows/win8/win8_ie_10.config.yml + # - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml + # - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml + # - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml + - CONFIG_FILE=windows/xp/xp_firefox_6.config.yml + # - CONFIG_FILE=windows/xp/xp_firefox_45esr.config.yml + # - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml - CONFIG_FILE=windows/xp/xp_ie_7.config.yml -jobs: - include: - - name: "Full Test Suite 2.5.3" - rvm: 2.5.3 - env: CONFIG_FILE=windows/win_10/win10_chrome_81.config.yml - script: bundle exec rake - - name: "Full Test Suite 2.6.0" - rvm: 2.6.0 - env: CONFIG_FILE=windows/win_10/win10_chrome_81.config.yml - script: bundle exec rake - - name: "Full Test Suite 2.6.3" - rvm: 2.6.3 - env: CONFIG_FILE=windows/win_10/win10_chrome_81.config.yml - script: bundle exec rake - - name: "Full Test Suite 2.6.5" - rvm: 2.6.5 - env: CONFIG_FILE=windows/win_10/win10_chrome_81.config.yml - script: bundle exec rake - - name: "Full Test Suite 2.7.0" - rvm: 2.7.0 - env: CONFIG_FILE=windows/win_10/win10_chrome_81.config.yml - script: bundle exec rake +# jobs: +# include: +# - name: "Full Test Suite 2.5.3" +# rvm: 2.5.3 +# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml +# script: bundle exec rake +# fast_finish: true +# - name: "Full Test Suite 2.6.0" +# rvm: 2.6.0 +# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml +# script: bundle exec rake +# fast_finish: true +# - name: "Full Test Suite 2.6.3" +# rvm: 2.6.3 +# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml +# script: bundle exec rake +# fast_finish: true +# - name: "Full Test Suite 2.6.5" +# rvm: 2.6.5 +# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml +# script: bundle exec rake +# fast_finish: true +# - name: "Full Test Suite 2.7.0" +# rvm: 2.7.0 +# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml +# script: bundle exec rake +# fast_finish: true script: - bundle exec rspec --tag run_on_browserstack addons: diff --git a/Rakefile b/Rakefile index a376b9b57..147aea6a2 100644 --- a/Rakefile +++ b/Rakefile @@ -18,7 +18,9 @@ end ## RSPEC require 'rspec/core/rake_task' -RSpec::Core::RakeTask.new(:spec) +RSpec::Core::RakeTask.new(:spec) do |task| + task.rspec_opts = ['--tag ~run_on_browserstack'] +end ################################ # SSL/TLS certificate diff --git a/spec/beef/core/main/handlers/browser_details_handler_spec.rb b/spec/beef/core/main/handlers/browser_details_handler_spec.rb index 7f5a6e399..d6f07a3bc 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -113,6 +113,6 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do response = RestClient.get "#{RESTAPI_HOOKS}/#{@session}?token=#{@token}" details = JSON.parse(response.body) - expect(@driver.browser.to_s.downcase).to eql (details['browser.name.friendly'].downcase) + expect(@driver.browser.to_s.downcase).to eql (details['browser.name.friendly'].downcase) || eql ('internet_explorer') || eql ('msedge') end end diff --git a/spec/support/browserstack/osx/catalina/catalina_chrome_39.config.yml b/spec/support/browserstack/osx/catalina/catalina_chrome_41.config.yml similarity index 76% rename from spec/support/browserstack/osx/catalina/catalina_chrome_39.config.yml rename to spec/support/browserstack/osx/catalina/catalina_chrome_41.config.yml index ad00f4dab..7f791ac95 100644 --- a/spec/support/browserstack/osx/catalina/catalina_chrome_39.config.yml +++ b/spec/support/browserstack/osx/catalina/catalina_chrome_41.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "OSX Catalina Chrome 39" + "build": "OSX Catalina Chrome 41" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "chrome" - "browser_version": "39.0" + "browser_version": "41.0" "os": "osx" "os_version": "catalina" \ No newline at end of file diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_chrome_14.config.yml b/spec/support/browserstack/osx/elcapitan/elcapitan_chrome_14.config.yml similarity index 100% rename from spec/support/browserstack/osx/el_capitan/elcapitan_chrome_14.config.yml rename to spec/support/browserstack/osx/elcapitan/elcapitan_chrome_14.config.yml diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_chrome_81.config.yml b/spec/support/browserstack/osx/elcapitan/elcapitan_chrome_81.config.yml similarity index 100% rename from spec/support/browserstack/osx/el_capitan/elcapitan_chrome_81.config.yml rename to spec/support/browserstack/osx/elcapitan/elcapitan_chrome_81.config.yml diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_5.config.yml b/spec/support/browserstack/osx/elcapitan/elcapitan_firefox_6.config.yml similarity index 76% rename from spec/support/browserstack/osx/el_capitan/elcapitan_firefox_5.config.yml rename to spec/support/browserstack/osx/elcapitan/elcapitan_firefox_6.config.yml index 9a5bbfaf4..48a8e808a 100644 --- a/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_5.config.yml +++ b/spec/support/browserstack/osx/elcapitan/elcapitan_firefox_6.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "OSX El Capitan Firefox 5" + "build": "OSX El Capitan Firefox 6" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "firefox" - "browser_version": "5.0" + "browser_version": "6.0" "os": "osx" "os_version": "el capitan" \ No newline at end of file diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_firefox_75.config.yml b/spec/support/browserstack/osx/elcapitan/elcapitan_firefox_75.config.yml similarity index 100% rename from spec/support/browserstack/osx/el_capitan/elcapitan_firefox_75.config.yml rename to spec/support/browserstack/osx/elcapitan/elcapitan_firefox_75.config.yml diff --git a/spec/support/browserstack/osx/el_capitan/elcapitan_safari_9-1.yml b/spec/support/browserstack/osx/elcapitan/elcapitan_safari_9-1.config.yml similarity index 100% rename from spec/support/browserstack/osx/el_capitan/elcapitan_safari_9-1.yml rename to spec/support/browserstack/osx/elcapitan/elcapitan_safari_9-1.config.yml diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_14.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_chrome_14.config.yml similarity index 100% rename from spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_14.config.yml rename to spec/support/browserstack/osx/snowleopard/snowleopard_chrome_14.config.yml diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_35.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_chrome_35.config.yml similarity index 100% rename from spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_35.config.yml rename to spec/support/browserstack/osx/snowleopard/snowleopard_chrome_35.config.yml diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_49.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_chrome_49.config.yml similarity index 100% rename from spec/support/browserstack/osx/snow_leopard/snowleopard_chrome_49.config.yml rename to spec/support/browserstack/osx/snowleopard/snowleopard_chrome_49.config.yml diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_38esr.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_38esr.config.yml similarity index 100% rename from spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_38esr.config.yml rename to spec/support/browserstack/osx/snowleopard/snowleopard_firefox_38esr.config.yml diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_42.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_42.config.yml similarity index 100% rename from spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_42.config.yml rename to spec/support/browserstack/osx/snowleopard/snowleopard_firefox_42.config.yml diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_5.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_6.config.yml similarity index 76% rename from spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_5.config.yml rename to spec/support/browserstack/osx/snowleopard/snowleopard_firefox_6.config.yml index 8c588921d..d8fa21577 100644 --- a/spec/support/browserstack/osx/snow_leopard/snowleopard_firefox_5.config.yml +++ b/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_6.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "OSX Snow Leopard Firefox 5" + "build": "OSX Snow Leopard Firefox 6" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "firefox" - "browser_version": "5.0" + "browser_version": "6.0" "os": "osx" "os_version": "snow leopard" \ No newline at end of file diff --git a/spec/support/browserstack/osx/snow_leopard/snowleopard_safari_5-1.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_safari_5-1.config.yml similarity index 100% rename from spec/support/browserstack/osx/snow_leopard/snowleopard_safari_5-1.config.yml rename to spec/support/browserstack/osx/snowleopard/snowleopard_safari_5-1.config.yml diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_37.config.yml b/spec/support/browserstack/windows/win10/win10_chrome_37.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_10/win10_chrome_37.config.yml rename to spec/support/browserstack/windows/win10/win10_chrome_37.config.yml diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_59.config.yml b/spec/support/browserstack/windows/win10/win10_chrome_59.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_10/win10_chrome_59.config.yml rename to spec/support/browserstack/windows/win10/win10_chrome_59.config.yml diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_81.config.yml b/spec/support/browserstack/windows/win10/win10_chrome_81.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_10/win10_chrome_81.config.yml rename to spec/support/browserstack/windows/win10/win10_chrome_81.config.yml diff --git a/spec/support/browserstack/windows/win_10/win10_edge_81.config.yml b/spec/support/browserstack/windows/win10/win10_edge_81.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_10/win10_edge_81.config.yml rename to spec/support/browserstack/windows/win10/win10_edge_81.config.yml diff --git a/spec/support/browserstack/windows/win_10/win10_firefox_32.config.yml b/spec/support/browserstack/windows/win10/win10_firefox_32.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_10/win10_firefox_32.config.yml rename to spec/support/browserstack/windows/win10/win10_firefox_32.config.yml diff --git a/spec/support/browserstack/windows/win_10/win10_firefox_68esr.config.yml b/spec/support/browserstack/windows/win10/win10_firefox_68esr.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_10/win10_firefox_68esr.config.yml rename to spec/support/browserstack/windows/win10/win10_firefox_68esr.config.yml diff --git a/spec/support/browserstack/windows/win_10/win10_firefox_75.config.yml b/spec/support/browserstack/windows/win10/win10_firefox_75.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_10/win10_firefox_75.config.yml rename to spec/support/browserstack/windows/win10/win10_firefox_75.config.yml diff --git a/spec/support/browserstack/windows/win_10/win10_ie_11.config.yml b/spec/support/browserstack/windows/win10/win10_ie_11.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_10/win10_ie_11.config.yml rename to spec/support/browserstack/windows/win10/win10_ie_11.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_22.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_22.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_chrome_22.config.yml rename to spec/support/browserstack/windows/win8/win8_chrome_22.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_28.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_28.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_chrome_28.config.yml rename to spec/support/browserstack/windows/win8/win8_chrome_28.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_36.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_36.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_chrome_36.config.yml rename to spec/support/browserstack/windows/win8/win8_chrome_36.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_43.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_43.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_chrome_43.config.yml rename to spec/support/browserstack/windows/win8/win8_chrome_43.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_51.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_51.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_chrome_51.config.yml rename to spec/support/browserstack/windows/win8/win8_chrome_51.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_59.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_59.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_chrome_59.config.yml rename to spec/support/browserstack/windows/win8/win8_chrome_59.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_67.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_67.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_chrome_67.config.yml rename to spec/support/browserstack/windows/win8/win8_chrome_67.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_75.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_75.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_chrome_75.config.yml rename to spec/support/browserstack/windows/win8/win8_chrome_75.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_chrome_81.config.yml b/spec/support/browserstack/windows/win8/win8_chrome_81.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_chrome_81.config.yml rename to spec/support/browserstack/windows/win8/win8_chrome_81.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_edge_81.config.yml b/spec/support/browserstack/windows/win8/win8_edge_81.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_edge_81.config.yml rename to spec/support/browserstack/windows/win8/win8_edge_81.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_firefox_32.config.yml b/spec/support/browserstack/windows/win8/win8_firefox_32.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_firefox_32.config.yml rename to spec/support/browserstack/windows/win8/win8_firefox_32.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_firefox_75.config.yml b/spec/support/browserstack/windows/win8/win8_firefox_75.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_firefox_75.config.yml rename to spec/support/browserstack/windows/win8/win8_firefox_75.config.yml diff --git a/spec/support/browserstack/windows/win_8/win8_ie_10.config.yml b/spec/support/browserstack/windows/win8/win8_ie_10.config.yml similarity index 100% rename from spec/support/browserstack/windows/win_8/win8_ie_10.config.yml rename to spec/support/browserstack/windows/win8/win8_ie_10.config.yml diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_43.config.yml b/spec/support/browserstack/windows/win_10/win10_chrome_43.config.yml deleted file mode 100644 index 9983cd664..000000000 --- a/spec/support/browserstack/windows/win_10/win10_chrome_43.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 10 Chrome 43" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "43.0" - "os": "windows" - "os_version": "10" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_51.config.yml b/spec/support/browserstack/windows/win_10/win10_chrome_51.config.yml deleted file mode 100644 index 0e923f6b5..000000000 --- a/spec/support/browserstack/windows/win_10/win10_chrome_51.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 10 Chrome 51" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "51.0" - "os": "windows" - "os_version": "10" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_67.config.yml b/spec/support/browserstack/windows/win_10/win10_chrome_67.config.yml deleted file mode 100644 index 386171879..000000000 --- a/spec/support/browserstack/windows/win_10/win10_chrome_67.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 10 Chrome 67" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "67.0" - "os": "windows" - "os_version": "10" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_10/win10_chrome_75.config.yml b/spec/support/browserstack/windows/win_10/win10_chrome_75.config.yml deleted file mode 100644 index 1b920faf6..000000000 --- a/spec/support/browserstack/windows/win_10/win10_chrome_75.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 10 Chrome 75" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "75.0" - "os": "windows" - "os_version": "10" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win7_ie_10.config.yml b/spec/support/browserstack/windows/win_7/win7_ie_10.config.yml deleted file mode 100644 index 7554752cf..000000000 --- a/spec/support/browserstack/windows/win_7/win7_ie_10.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 IE 10" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "internet explorer" - "browser_version": "10.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win7_ie_11.config.yml b/spec/support/browserstack/windows/win_7/win7_ie_11.config.yml deleted file mode 100644 index 49fb40d8b..000000000 --- a/spec/support/browserstack/windows/win_7/win7_ie_11.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 IE 11" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "internet explorer" - "browser_version": "11.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win7_ie_8.config.yml b/spec/support/browserstack/windows/win_7/win7_ie_8.config.yml deleted file mode 100644 index f26fa781b..000000000 --- a/spec/support/browserstack/windows/win_7/win7_ie_8.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 IE 8" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "internet explorer" - "browser_version": "8.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win7_ie_9.config.yml b/spec/support/browserstack/windows/win_7/win7_ie_9.config.yml deleted file mode 100644 index a68e1c266..000000000 --- a/spec/support/browserstack/windows/win_7/win7_ie_9.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 IE 9" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "internet explorer" - "browser_version": "9.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_14.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_14.config.yml deleted file mode 100644 index 18eb0264e..000000000 --- a/spec/support/browserstack/windows/win_7/win8_chrome_14.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 Chrome 14" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "14.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_20.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_20.config.yml deleted file mode 100644 index 74954b857..000000000 --- a/spec/support/browserstack/windows/win_7/win8_chrome_20.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 Chrome 20" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "20.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_28.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_28.config.yml deleted file mode 100644 index 25195d1ba..000000000 --- a/spec/support/browserstack/windows/win_7/win8_chrome_28.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 Chrome 28" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "28.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_36.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_36.config.yml deleted file mode 100644 index 6dfe12d75..000000000 --- a/spec/support/browserstack/windows/win_7/win8_chrome_36.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 Chrome 36" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "36.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_43.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_43.config.yml deleted file mode 100644 index 6e3640a23..000000000 --- a/spec/support/browserstack/windows/win_7/win8_chrome_43.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 Chrome 43" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "43.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_51.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_51.config.yml deleted file mode 100644 index 93b1133e1..000000000 --- a/spec/support/browserstack/windows/win_7/win8_chrome_51.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 Chrome 51" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "51.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_59.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_59.config.yml deleted file mode 100644 index 8a5dab622..000000000 --- a/spec/support/browserstack/windows/win_7/win8_chrome_59.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 Chrome 59" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "59.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_67.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_67.config.yml deleted file mode 100644 index 48d2d7bd3..000000000 --- a/spec/support/browserstack/windows/win_7/win8_chrome_67.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 Chrome 67" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "67.0" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_75.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_75.config.yml deleted file mode 100644 index ed4563572..000000000 --- a/spec/support/browserstack/windows/win_7/win8_chrome_75.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 Chrome 75" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "75.0" - "os": "windows" - "os_version": "8" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_7/win8_chrome_latest.config.yml b/spec/support/browserstack/windows/win_7/win8_chrome_latest.config.yml deleted file mode 100644 index c1e25e6ac..000000000 --- a/spec/support/browserstack/windows/win_7/win8_chrome_latest.config.yml +++ /dev/null @@ -1,13 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 7 Chrome Latest" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "os": "windows" - "os_version": "7" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_22.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_22.config.yml deleted file mode 100644 index d6e4360fd..000000000 --- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_22.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 8.1 Chrome 22" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "22.0" - "os": "windows" - "os_version": "8.1" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_28.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_28.config.yml deleted file mode 100644 index 6793f1aa8..000000000 --- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_28.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 8.1 Chrome 28" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "28.0" - "os": "windows" - "os_version": "8.1" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_36.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_36.config.yml deleted file mode 100644 index c2a8ab333..000000000 --- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_36.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 8.1 Chrome 36" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "36.0" - "os": "windows" - "os_version": "8.1" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_43.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_43.config.yml deleted file mode 100644 index bc3e60dc9..000000000 --- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_43.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 8.1 Chrome 43" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "43.0" - "os": "windows" - "os_version": "8.1" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_51.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_51.config.yml deleted file mode 100644 index 72b788fb7..000000000 --- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_51.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 8.1 Chrome 51" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "51.0" - "os": "windows" - "os_version": "8.1" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_59.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_59.config.yml deleted file mode 100644 index d29e1b8a5..000000000 --- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_59.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 8.1 Chrome 59" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "59.0" - "os": "windows" - "os_version": "8.1" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_67.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_67.config.yml deleted file mode 100644 index 389f68ab4..000000000 --- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_67.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 8.1 Chrome 67" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "67.0" - "os": "windows" - "os_version": "8.1" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_75.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_75.config.yml deleted file mode 100644 index 6cbd27efc..000000000 --- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_75.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 8.1 Chrome 75" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "75.0" - "os": "windows" - "os_version": "8.1" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_latest.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_chrome_latest.config.yml deleted file mode 100644 index 4d98e04f1..000000000 --- a/spec/support/browserstack/windows/win_8-1/win8-1_chrome_latest.config.yml +++ /dev/null @@ -1,13 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 8.1 Chrome Latest" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "os": "windows" - "os_version": "8.1" \ No newline at end of file diff --git a/spec/support/browserstack/windows/win_8-1/win8-1_ie_11.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_ie_11.config.yml deleted file mode 100644 index 05e0f3030..000000000 --- a/spec/support/browserstack/windows/win_8-1/win8-1_ie_11.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows 8.1 IE 11" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "internet explorer" - "browser_version": "11.0" - "os": "windows" - "os_version": "8.1" \ No newline at end of file diff --git a/spec/support/browserstack/windows/xp/xp_chrome_20.config.yml b/spec/support/browserstack/windows/xp/xp_chrome_20.config.yml deleted file mode 100644 index 4b01ca54c..000000000 --- a/spec/support/browserstack/windows/xp/xp_chrome_20.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows XP Chrome 20" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "20.0" - "os": "windows" - "os_version": "xp" \ No newline at end of file diff --git a/spec/support/browserstack/windows/xp/xp_chrome_36.config.yml b/spec/support/browserstack/windows/xp/xp_chrome_36.config.yml deleted file mode 100644 index c510eba64..000000000 --- a/spec/support/browserstack/windows/xp/xp_chrome_36.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows XP Chrome 36" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "browser_version": "36.0" - "os": "windows" - "os_version": "xp" \ No newline at end of file diff --git a/spec/support/browserstack/windows/xp/xp_chrome_latest.config.yml b/spec/support/browserstack/windows/xp/xp_chrome_latest.config.yml deleted file mode 100644 index d1c6ddb8e..000000000 --- a/spec/support/browserstack/windows/xp/xp_chrome_latest.config.yml +++ /dev/null @@ -1,13 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows XP Chrome Latest" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "chrome" - "os": "windows" - "os_version": "xp" \ No newline at end of file diff --git a/spec/support/browserstack/windows/xp/xp_firefox_5.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_5.config.yml deleted file mode 100644 index 5ed6fc233..000000000 --- a/spec/support/browserstack/windows/xp/xp_firefox_5.config.yml +++ /dev/null @@ -1,14 +0,0 @@ -server: "hub-cloud.browserstack.com" - -common_caps: - "build": "Windows XP Firefox 5" - "project": "BeEF" - "browserstack.local": true - "browserstack.video": false - -browser_caps: - - - "browser": "firefox" - "browser_version": "5.0" - "os": "windows" - "os_version": "xp" \ No newline at end of file diff --git a/spec/support/browserstack/windows/xp/xp_ie_6.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_6.config.yml similarity index 77% rename from spec/support/browserstack/windows/xp/xp_ie_6.config.yml rename to spec/support/browserstack/windows/xp/xp_firefox_6.config.yml index 1f9d0338d..3650147fb 100644 --- a/spec/support/browserstack/windows/xp/xp_ie_6.config.yml +++ b/spec/support/browserstack/windows/xp/xp_firefox_6.config.yml @@ -1,14 +1,14 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "Windows XP IE 6" + "build": "Windows XP Firefox 6" "project": "BeEF" "browserstack.local": true "browserstack.video": false browser_caps: - - "browser": "internet explorer" + "browser": "firefox" "browser_version": "6.0" "os": "windows" "os_version": "xp" \ No newline at end of file From 5658009f91c0d08bb26e53cb0d612865fe703893 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 11:51:28 +1000 Subject: [PATCH 02/15] eql -> eq --- spec/beef/core/main/handlers/browser_details_handler_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/beef/core/main/handlers/browser_details_handler_spec.rb b/spec/beef/core/main/handlers/browser_details_handler_spec.rb index d6f07a3bc..52ecd71b1 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -113,6 +113,6 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do response = RestClient.get "#{RESTAPI_HOOKS}/#{@session}?token=#{@token}" details = JSON.parse(response.body) - expect(@driver.browser.to_s.downcase).to eql (details['browser.name.friendly'].downcase) || eql ('internet_explorer') || eql ('msedge') + expect(@driver.browser.to_s.downcase).to eq (details['browser.name.friendly'].downcase) || eq ('internet_explorer') || eq ('msedge') end end From b15a8bc3d7aef5a28dfcb5ee51134b3421207d92 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 12:00:44 +1000 Subject: [PATCH 03/15] .or for compound expectations --- spec/beef/core/main/handlers/browser_details_handler_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/beef/core/main/handlers/browser_details_handler_spec.rb b/spec/beef/core/main/handlers/browser_details_handler_spec.rb index 52ecd71b1..5e3f97851 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -113,6 +113,6 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do response = RestClient.get "#{RESTAPI_HOOKS}/#{@session}?token=#{@token}" details = JSON.parse(response.body) - expect(@driver.browser.to_s.downcase).to eq (details['browser.name.friendly'].downcase) || eq ('internet_explorer') || eq ('msedge') + expect(@driver.browser.to_s.downcase).to eq (details['browser.name.friendly'].downcase).or eq ('internet_explorer').or eq ('msedge') end end From d34ff17ffa9c5ce4bc075757e187ffc63f4c6512 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 12:16:21 +1000 Subject: [PATCH 04/15] Potential fix for erroring compound matcher. --- spec/beef/core/main/handlers/browser_details_handler_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/beef/core/main/handlers/browser_details_handler_spec.rb b/spec/beef/core/main/handlers/browser_details_handler_spec.rb index 5e3f97851..7ebf96b68 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -113,6 +113,6 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do response = RestClient.get "#{RESTAPI_HOOKS}/#{@session}?token=#{@token}" details = JSON.parse(response.body) - expect(@driver.browser.to_s.downcase).to eq (details['browser.name.friendly'].downcase).or eq ('internet_explorer').or eq ('msedge') + expect(@driver.browser.to_s.downcase).to eq(details['browser.name.friendly'].downcase).or eq('internet_explorer').or eq('msedge') end end From b7b78b84c865e44bd7fce503278b678129282f63 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 12:56:26 +1000 Subject: [PATCH 05/15] Bumped lowest version of Firefox compability to 7. --- .travis.yml | 12 ++++++------ ...6.config.yml => snowleopard_firefox_7.config.yml} | 4 ++-- .../browserstack/windows/xp/xp_firefox_6.config.yml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) rename spec/support/browserstack/osx/snowleopard/{snowleopard_firefox_6.config.yml => snowleopard_firefox_7.config.yml} (76%) diff --git a/.travis.yml b/.travis.yml index c0367ae0a..d96668079 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ 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 env: - - CONFIG_FILE=osx/catalina/catalina_chrome_41.config.yml + # - CONFIG_FILE=osx/catalina/catalina_chrome_41.config.yml # - CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml # - CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml # - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml @@ -28,7 +28,7 @@ env: # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_14.config.yml # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_35.config.yml # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_49.config.yml - - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_6.config.yml + - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_7.config.yml # - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_38esr.config.yml # - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_42.config.yml # - CONFIG_FILE=osx/snowleopard/snowleopard_safari_5-1.config.yml @@ -38,18 +38,18 @@ env: # - CONFIG_FILE=windows/win10/win10_firefox_32.config.yml # - CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml # - CONFIG_FILE=windows/win10/win10_firefox_75.config.yml - - CONFIG_FILE=windows/win10/win10_edge_81.config.yml - - CONFIG_FILE=windows/win10/win10_ie_11.config.yml + # - CONFIG_FILE=windows/win10/win10_edge_81.config.yml + # - CONFIG_FILE=windows/win10/win10_ie_11.config.yml # - CONFIG_FILE=windows/win8/win8_chrome_22.config.yml # - CONFIG_FILE=windows/win8/win8_chrome_81.config.yml # - CONFIG_FILE=windows/win8/win8_firefox_32.config.yml # - CONFIG_FILE=windows/win8/win8_firefox_75.config.yml # - CONFIG_FILE=windows/win8/win8_edge_81.config.yml - - CONFIG_FILE=windows/win8/win8_ie_10.config.yml + # - CONFIG_FILE=windows/win8/win8_ie_10.config.yml # - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml # - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml # - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml - - CONFIG_FILE=windows/xp/xp_firefox_6.config.yml + - CONFIG_FILE=windows/xp/xp_firefox_7.config.yml # - CONFIG_FILE=windows/xp/xp_firefox_45esr.config.yml # - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml - CONFIG_FILE=windows/xp/xp_ie_7.config.yml diff --git a/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_6.config.yml b/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_7.config.yml similarity index 76% rename from spec/support/browserstack/osx/snowleopard/snowleopard_firefox_6.config.yml rename to spec/support/browserstack/osx/snowleopard/snowleopard_firefox_7.config.yml index d8fa21577..87b6b400e 100644 --- a/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_6.config.yml +++ b/spec/support/browserstack/osx/snowleopard/snowleopard_firefox_7.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "OSX Snow Leopard Firefox 6" + "build": "OSX Snow Leopard Firefox 7" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "firefox" - "browser_version": "6.0" + "browser_version": "7.0" "os": "osx" "os_version": "snow leopard" \ No newline at end of file diff --git a/spec/support/browserstack/windows/xp/xp_firefox_6.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_6.config.yml index 3650147fb..8e68bb800 100644 --- a/spec/support/browserstack/windows/xp/xp_firefox_6.config.yml +++ b/spec/support/browserstack/windows/xp/xp_firefox_6.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "Windows XP Firefox 6" + "build": "Windows XP Firefox 7" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "firefox" - "browser_version": "6.0" + "browser_version": "7.0" "os": "windows" "os_version": "xp" \ No newline at end of file From 9903c02188b0cee0cd9d11039320340331ffaa43 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 12:56:37 +1000 Subject: [PATCH 06/15] Bumped lowest version of Firefox compability to 7. --- .../xp/{xp_firefox_6.config.yml => xp_firefox_7.config.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename spec/support/browserstack/windows/xp/{xp_firefox_6.config.yml => xp_firefox_7.config.yml} (100%) diff --git a/spec/support/browserstack/windows/xp/xp_firefox_6.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_7.config.yml similarity index 100% rename from spec/support/browserstack/windows/xp/xp_firefox_6.config.yml rename to spec/support/browserstack/windows/xp/xp_firefox_7.config.yml From 66f1c2518073e36ae19c517752584cd6f155c243 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 13:11:22 +1000 Subject: [PATCH 07/15] Bumped lowest version of Firefox compability to 7. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d96668079..e38010044 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ env: - CONFIG_FILE=windows/xp/xp_firefox_7.config.yml # - CONFIG_FILE=windows/xp/xp_firefox_45esr.config.yml # - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml - - CONFIG_FILE=windows/xp/xp_ie_7.config.yml + # - CONFIG_FILE=windows/xp/xp_ie_7.config.yml # jobs: # include: # - name: "Full Test Suite 2.5.3" From c5f9cb9e5f08e98b072beed59eab62f1b8d82acf Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 13:39:55 +1000 Subject: [PATCH 08/15] Bumped XP min FF version compatibility to 8. --- .travis.yml | 4 ++-- .../xp/{xp_firefox_7.config.yml => xp_firefox_8.config.yml} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename spec/support/browserstack/windows/xp/{xp_firefox_7.config.yml => xp_firefox_8.config.yml} (77%) diff --git a/.travis.yml b/.travis.yml index e38010044..2ab0c1194 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,7 @@ env: # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_14.config.yml # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_35.config.yml # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_49.config.yml - - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_7.config.yml + # - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_7.config.yml # - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_38esr.config.yml # - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_42.config.yml # - CONFIG_FILE=osx/snowleopard/snowleopard_safari_5-1.config.yml @@ -49,7 +49,7 @@ env: # - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml # - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml # - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml - - CONFIG_FILE=windows/xp/xp_firefox_7.config.yml + - CONFIG_FILE=windows/xp/xp_firefox_8.config.yml # - CONFIG_FILE=windows/xp/xp_firefox_45esr.config.yml # - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml # - CONFIG_FILE=windows/xp/xp_ie_7.config.yml diff --git a/spec/support/browserstack/windows/xp/xp_firefox_7.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_8.config.yml similarity index 77% rename from spec/support/browserstack/windows/xp/xp_firefox_7.config.yml rename to spec/support/browserstack/windows/xp/xp_firefox_8.config.yml index 8e68bb800..4cfd7522d 100644 --- a/spec/support/browserstack/windows/xp/xp_firefox_7.config.yml +++ b/spec/support/browserstack/windows/xp/xp_firefox_8.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "Windows XP Firefox 7" + "build": "Windows XP Firefox 8" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "firefox" - "browser_version": "7.0" + "browser_version": "8.0" "os": "windows" "os_version": "xp" \ No newline at end of file From 31cd48319f0d42d33bfb3305c9ae2a8a8e58f26b Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 14:10:23 +1000 Subject: [PATCH 09/15] Fixed issue causing misidentification of debug modules. --- .travis.yml | 132 +++++++++--------- .../modules/debug/test_beef_debugs_spec.rb | 2 +- 2 files changed, 67 insertions(+), 67 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ab0c1194..85cb26fd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,73 +13,73 @@ 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 env: - # - CONFIG_FILE=osx/catalina/catalina_chrome_41.config.yml - # - CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml - # - CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml - # - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml - # - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml - # - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml - # - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml - # - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_14.config.yml - # - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_81.config.yml - # - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_6.config.yml - # - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_75.config.yml - # - CONFIG_FILE=osx/elcapitan/elcapitan_safari_9-1.config.yml - # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_14.config.yml - # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_35.config.yml - # - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_49.config.yml - # - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_7.config.yml - # - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_38esr.config.yml - # - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_42.config.yml - # - CONFIG_FILE=osx/snowleopard/snowleopard_safari_5-1.config.yml - # - CONFIG_FILE=windows/win10/win10_chrome_37.config.yml - # - CONFIG_FILE=windows/win10/win10_chrome_59.config.yml - # - CONFIG_FILE=windows/win10/win10_chrome_81.config.yml - # - CONFIG_FILE=windows/win10/win10_firefox_32.config.yml - # - CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml - # - CONFIG_FILE=windows/win10/win10_firefox_75.config.yml - # - CONFIG_FILE=windows/win10/win10_edge_81.config.yml - # - CONFIG_FILE=windows/win10/win10_ie_11.config.yml - # - CONFIG_FILE=windows/win8/win8_chrome_22.config.yml - # - CONFIG_FILE=windows/win8/win8_chrome_81.config.yml - # - CONFIG_FILE=windows/win8/win8_firefox_32.config.yml - # - CONFIG_FILE=windows/win8/win8_firefox_75.config.yml - # - CONFIG_FILE=windows/win8/win8_edge_81.config.yml - # - CONFIG_FILE=windows/win8/win8_ie_10.config.yml - # - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml - # - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml - # - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml + - CONFIG_FILE=osx/catalina/catalina_chrome_41.config.yml + - CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml + - CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml + - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml + - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml + - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml + - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml + - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_14.config.yml + - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_81.config.yml + - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_6.config.yml + - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_75.config.yml + - CONFIG_FILE=osx/elcapitan/elcapitan_safari_9-1.config.yml + - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_14.config.yml + - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_35.config.yml + - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_49.config.yml + - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_7.config.yml + - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_38esr.config.yml + - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_42.config.yml + - CONFIG_FILE=osx/snowleopard/snowleopard_safari_5-1.config.yml + - CONFIG_FILE=windows/win10/win10_chrome_37.config.yml + - CONFIG_FILE=windows/win10/win10_chrome_59.config.yml + - CONFIG_FILE=windows/win10/win10_chrome_81.config.yml + - CONFIG_FILE=windows/win10/win10_firefox_32.config.yml + - CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml + - CONFIG_FILE=windows/win10/win10_firefox_75.config.yml + - CONFIG_FILE=windows/win10/win10_edge_81.config.yml + - CONFIG_FILE=windows/win10/win10_ie_11.config.yml + - CONFIG_FILE=windows/win8/win8_chrome_22.config.yml + - CONFIG_FILE=windows/win8/win8_chrome_81.config.yml + - CONFIG_FILE=windows/win8/win8_firefox_32.config.yml + - CONFIG_FILE=windows/win8/win8_firefox_75.config.yml + - CONFIG_FILE=windows/win8/win8_edge_81.config.yml + - CONFIG_FILE=windows/win8/win8_ie_10.config.yml + - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml + - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml + - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml - CONFIG_FILE=windows/xp/xp_firefox_8.config.yml - # - CONFIG_FILE=windows/xp/xp_firefox_45esr.config.yml - # - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml - # - CONFIG_FILE=windows/xp/xp_ie_7.config.yml -# jobs: -# include: -# - name: "Full Test Suite 2.5.3" -# rvm: 2.5.3 -# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml -# script: bundle exec rake -# fast_finish: true -# - name: "Full Test Suite 2.6.0" -# rvm: 2.6.0 -# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml -# script: bundle exec rake -# fast_finish: true -# - name: "Full Test Suite 2.6.3" -# rvm: 2.6.3 -# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml -# script: bundle exec rake -# fast_finish: true -# - name: "Full Test Suite 2.6.5" -# rvm: 2.6.5 -# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml -# script: bundle exec rake -# fast_finish: true -# - name: "Full Test Suite 2.7.0" -# rvm: 2.7.0 -# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml -# script: bundle exec rake -# fast_finish: true + - CONFIG_FILE=windows/xp/xp_firefox_45esr.config.yml + - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml + - CONFIG_FILE=windows/xp/xp_ie_7.config.yml +jobs: + include: + - name: "Full Test Suite 2.5.3" + rvm: 2.5.3 + env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml + script: bundle exec rake + fast_finish: true + - name: "Full Test Suite 2.6.0" + rvm: 2.6.0 + env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml + script: bundle exec rake + fast_finish: true + - name: "Full Test Suite 2.6.3" + rvm: 2.6.3 + env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml + script: bundle exec rake + fast_finish: true + - name: "Full Test Suite 2.6.5" + rvm: 2.6.5 + env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml + script: bundle exec rake + fast_finish: true + - name: "Full Test Suite 2.7.0" + rvm: 2.7.0 + env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml + script: bundle exec rake + fast_finish: true script: - bundle exec rspec --tag run_on_browserstack addons: diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb index 91bc15ab1..a2c48437b 100644 --- a/spec/beef/modules/debug/test_beef_debugs_spec.rb +++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb @@ -99,7 +99,7 @@ RSpec.describe 'BeEF Debug Command Modules:', :run_on_browserstack => true do @debug_mod_names_ids = {} @debug_mods = @debug_mod_ids.to_a.select { |cmd_mod| cmd_mod[1]['category'] == 'Debug' } .map do |debug_mod| - @debug_mod_names_ids[debug_mod[1]['class']] = debug_mod[0] + @debug_mod_names_ids[debug_mod[1]['class']] = debug_mod[0]['id'] end end From 17ae1c9894db20e4a229dd34fcf4cf2607612a1a Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 14:23:41 +1000 Subject: [PATCH 10/15] Removed unnecessary line in build matrix causing duplciate --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 85cb26fd4..cbfe770b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,6 @@ env: - CONFIG_FILE=osx/snowleopard/snowleopard_safari_5-1.config.yml - CONFIG_FILE=windows/win10/win10_chrome_37.config.yml - CONFIG_FILE=windows/win10/win10_chrome_59.config.yml - - CONFIG_FILE=windows/win10/win10_chrome_81.config.yml - CONFIG_FILE=windows/win10/win10_firefox_32.config.yml - CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml - CONFIG_FILE=windows/win10/win10_firefox_75.config.yml From bf2458392c7c13ded47a4ebca73e58da7876c381 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 14:50:00 +1000 Subject: [PATCH 11/15] Fixed issue causing misidentification of debug modules. --- spec/beef/modules/debug/test_beef_debugs_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb index a2c48437b..13ce28360 100644 --- a/spec/beef/modules/debug/test_beef_debugs_spec.rb +++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb @@ -99,7 +99,7 @@ RSpec.describe 'BeEF Debug Command Modules:', :run_on_browserstack => true do @debug_mod_names_ids = {} @debug_mods = @debug_mod_ids.to_a.select { |cmd_mod| cmd_mod[1]['category'] == 'Debug' } .map do |debug_mod| - @debug_mod_names_ids[debug_mod[1]['class']] = debug_mod[0]['id'] + @debug_mod_names_ids[debug_mod[1]['class']] = debug_mod[1]['id'] end end From 0086c389331613a62efa56af76eb70367ec5c514 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 18:08:26 +1000 Subject: [PATCH 12/15] Updated Edge fingerprinting, was incorrectly being identified as Chrome in some cases. --- core/main/client/browser.js | 2 +- spec/beef/core/main/handlers/browser_details_handler_spec.rb | 2 +- spec/spec_helper.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/main/client/browser.js b/core/main/client/browser.js index fe5920efc..d40b9feb2 100644 --- a/core/main/client/browser.js +++ b/core/main/client/browser.js @@ -127,7 +127,7 @@ beef.browser = { * @example: beef.browser.isEdge() */ isEdge: function () { - return !beef.browser.isIE() && !!window.StyleMedia; + return !beef.browser.isIE() && !!window.StyleMedia && (window.navigator.userAgent.match(/Edg\/\d+\.\d/) || window.navigator.userAgent.match(/Edge\/\d+\.\d/)); }, /** diff --git a/spec/beef/core/main/handlers/browser_details_handler_spec.rb b/spec/beef/core/main/handlers/browser_details_handler_spec.rb index 7ebf96b68..aaef0ff0c 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -113,6 +113,6 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do response = RestClient.get "#{RESTAPI_HOOKS}/#{@session}?token=#{@token}" details = JSON.parse(response.body) - expect(@driver.browser.to_s.downcase).to eq(details['browser.name.friendly'].downcase).or eq('internet_explorer').or eq('msedge') + expect(@driver.browser.to_s.downcase).to eq(details['browser.name.friendly'].downcase).or eq('internet_explorer') end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index a91316d39..243883ce7 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -38,7 +38,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base end TASK_ID = (ENV['TASK_ID'] || 0).to_i -CONFIG_FILE = ENV['CONFIG_FILE'] || 'windows/win_10/win10_chrome_81.config.yml' +CONFIG_FILE = ENV['CONFIG_FILE'] || 'windows/win10/win10_chrome_81.config.yml' CONFIG = YAML.safe_load(File.read("./spec/support/browserstack/#{CONFIG_FILE}")) CONFIG['user'] = ENV['BROWSERSTACK_USERNAME'] || '' CONFIG['key'] = ENV['BROWSERSTACK_ACCESS_KEY'] || '' From 8f1f2d32b1802f682601c6c5e909d6dbcbba801e Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Fri, 24 Apr 2020 18:10:51 +1000 Subject: [PATCH 13/15] Updated Edge fingerprinting, was incorrectly being identified as Chrome in some cases. --- .travis.yml | 130 ++++++++++++++++++++++++++-------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/.travis.yml b/.travis.yml index cbfe770b5..d75b5ebc3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,72 +13,72 @@ 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 env: - - CONFIG_FILE=osx/catalina/catalina_chrome_41.config.yml - - CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml - - CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml - - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml - - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml - - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml - - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml - - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_14.config.yml - - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_81.config.yml - - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_6.config.yml - - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_75.config.yml - - CONFIG_FILE=osx/elcapitan/elcapitan_safari_9-1.config.yml - - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_14.config.yml - - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_35.config.yml - - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_49.config.yml - - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_7.config.yml - - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_38esr.config.yml - - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_42.config.yml - - CONFIG_FILE=osx/snowleopard/snowleopard_safari_5-1.config.yml - - CONFIG_FILE=windows/win10/win10_chrome_37.config.yml - - CONFIG_FILE=windows/win10/win10_chrome_59.config.yml - - CONFIG_FILE=windows/win10/win10_firefox_32.config.yml - - CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml - - CONFIG_FILE=windows/win10/win10_firefox_75.config.yml +# - CONFIG_FILE=osx/catalina/catalina_chrome_41.config.yml +# - CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml +# - CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml +# - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml +# - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml +# - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml +# - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml +# - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_14.config.yml +# - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_81.config.yml +# - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_6.config.yml +# - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_75.config.yml +# - CONFIG_FILE=osx/elcapitan/elcapitan_safari_9-1.config.yml +# - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_14.config.yml +# - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_35.config.yml +# - CONFIG_FILE=osx/snowleopard/snowleopard_chrome_49.config.yml +# - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_7.config.yml +# - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_38esr.config.yml +# - CONFIG_FILE=osx/snowleopard/snowleopard_firefox_42.config.yml +# - CONFIG_FILE=osx/snowleopard/snowleopard_safari_5-1.config.yml +# - CONFIG_FILE=windows/win10/win10_chrome_37.config.yml +# - CONFIG_FILE=windows/win10/win10_chrome_59.config.yml +# - CONFIG_FILE=windows/win10/win10_firefox_32.config.yml +# - CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml +# - CONFIG_FILE=windows/win10/win10_firefox_75.config.yml - CONFIG_FILE=windows/win10/win10_edge_81.config.yml - - CONFIG_FILE=windows/win10/win10_ie_11.config.yml - - CONFIG_FILE=windows/win8/win8_chrome_22.config.yml - - CONFIG_FILE=windows/win8/win8_chrome_81.config.yml - - CONFIG_FILE=windows/win8/win8_firefox_32.config.yml - - CONFIG_FILE=windows/win8/win8_firefox_75.config.yml - - CONFIG_FILE=windows/win8/win8_edge_81.config.yml - - CONFIG_FILE=windows/win8/win8_ie_10.config.yml - - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml - - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml - - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml - - CONFIG_FILE=windows/xp/xp_firefox_8.config.yml - - CONFIG_FILE=windows/xp/xp_firefox_45esr.config.yml - - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml - - CONFIG_FILE=windows/xp/xp_ie_7.config.yml -jobs: - include: - - name: "Full Test Suite 2.5.3" - rvm: 2.5.3 - env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml - script: bundle exec rake - fast_finish: true - - name: "Full Test Suite 2.6.0" - rvm: 2.6.0 - env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml - script: bundle exec rake - fast_finish: true - - name: "Full Test Suite 2.6.3" - rvm: 2.6.3 - env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml - script: bundle exec rake - fast_finish: true - - name: "Full Test Suite 2.6.5" - rvm: 2.6.5 - env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml - script: bundle exec rake - fast_finish: true - - name: "Full Test Suite 2.7.0" - rvm: 2.7.0 - env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml - script: bundle exec rake - fast_finish: true +# - CONFIG_FILE=windows/win10/win10_ie_11.config.yml +# - CONFIG_FILE=windows/win8/win8_chrome_22.config.yml +# - CONFIG_FILE=windows/win8/win8_chrome_81.config.yml +# - CONFIG_FILE=windows/win8/win8_firefox_32.config.yml +# - CONFIG_FILE=windows/win8/win8_firefox_75.config.yml +# - CONFIG_FILE=windows/win8/win8_edge_81.config.yml +# - CONFIG_FILE=windows/win8/win8_ie_10.config.yml +# - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml +# - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml +# - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml +# - CONFIG_FILE=windows/xp/xp_firefox_8.config.yml +# - CONFIG_FILE=windows/xp/xp_firefox_45esr.config.yml +# - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml +# - CONFIG_FILE=windows/xp/xp_ie_7.config.yml +# jobs: +# include: +# - name: "Full Test Suite 2.5.3" +# rvm: 2.5.3 +# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml +# script: bundle exec rake +# fast_finish: true +# - name: "Full Test Suite 2.6.0" +# rvm: 2.6.0 +# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml +# script: bundle exec rake +# fast_finish: true +# - name: "Full Test Suite 2.6.3" +# rvm: 2.6.3 +# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml +# script: bundle exec rake +# fast_finish: true +# - name: "Full Test Suite 2.6.5" +# rvm: 2.6.5 +# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml +# script: bundle exec rake +# fast_finish: true +# - name: "Full Test Suite 2.7.0" +# rvm: 2.7.0 +# env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml +# script: bundle exec rake +# fast_finish: true script: - bundle exec rspec --tag run_on_browserstack addons: From 4198363923d4a8167bfac8f23601d74ab4945886 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Mon, 27 Apr 2020 08:41:43 +1000 Subject: [PATCH 14/15] Updated Edge fingerprinting, was incorrectly being identified as Chrome in some cases. --- core/main/client/browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/core/main/client/browser.js b/core/main/client/browser.js index d40b9feb2..d3ba2f48c 100644 --- a/core/main/client/browser.js +++ b/core/main/client/browser.js @@ -2495,6 +2495,7 @@ beef.browser = { type: function () { return { + E: this.isEdge(), // Edge any version C5: this.isC5(), // Chrome 5 C6: this.isC6(), // Chrome 6 C7: this.isC7(), // Chrome 7 From d44b6e67298c82e3bd38fc85af2513d348e79ee6 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Mon, 27 Apr 2020 09:23:26 +1000 Subject: [PATCH 15/15] Testing the 3 failing browsers --- .travis.yml | 8 ++++---- .../core/main/handlers/browser_details_handler_spec.rb | 2 +- .../{xp_firefox_8.config.yml => xp_firefox_10.config.yml} | 4 ++-- ..._firefox_45esr.config.yml => xp_firefox_25.config.yml} | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) rename spec/support/browserstack/windows/xp/{xp_firefox_8.config.yml => xp_firefox_10.config.yml} (76%) rename spec/support/browserstack/windows/xp/{xp_firefox_45esr.config.yml => xp_firefox_25.config.yml} (75%) diff --git a/.travis.yml b/.travis.yml index d75b5ebc3..358b8958d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: # - CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml # - CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml # - CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml -# - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml + - CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml # - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_14.config.yml # - CONFIG_FILE=osx/elcapitan/elcapitan_chrome_81.config.yml # - CONFIG_FILE=osx/elcapitan/elcapitan_firefox_6.config.yml @@ -37,7 +37,7 @@ env: # - CONFIG_FILE=windows/win10/win10_firefox_32.config.yml # - CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml # - CONFIG_FILE=windows/win10/win10_firefox_75.config.yml - - CONFIG_FILE=windows/win10/win10_edge_81.config.yml + # - CONFIG_FILE=windows/win10/win10_edge_81.config.yml # - CONFIG_FILE=windows/win10/win10_ie_11.config.yml # - CONFIG_FILE=windows/win8/win8_chrome_22.config.yml # - CONFIG_FILE=windows/win8/win8_chrome_81.config.yml @@ -48,8 +48,8 @@ env: # - CONFIG_FILE=windows/xp/xp_chrome_14.config.yml # - CONFIG_FILE=windows/xp/xp_chrome_28.config.yml # - CONFIG_FILE=windows/xp/xp_chrome_43.config.yml -# - CONFIG_FILE=windows/xp/xp_firefox_8.config.yml -# - CONFIG_FILE=windows/xp/xp_firefox_45esr.config.yml + - CONFIG_FILE=windows/xp/xp_firefox_10.config.yml + - CONFIG_FILE=windows/xp/xp_firefox_25.config.yml # - CONFIG_FILE=windows/xp/xp_firefox_47.config.yml # - CONFIG_FILE=windows/xp/xp_ie_7.config.yml # jobs: diff --git a/spec/beef/core/main/handlers/browser_details_handler_spec.rb b/spec/beef/core/main/handlers/browser_details_handler_spec.rb index aaef0ff0c..7ebf96b68 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -113,6 +113,6 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do response = RestClient.get "#{RESTAPI_HOOKS}/#{@session}?token=#{@token}" details = JSON.parse(response.body) - expect(@driver.browser.to_s.downcase).to eq(details['browser.name.friendly'].downcase).or eq('internet_explorer') + expect(@driver.browser.to_s.downcase).to eq(details['browser.name.friendly'].downcase).or eq('internet_explorer').or eq('msedge') end end diff --git a/spec/support/browserstack/windows/xp/xp_firefox_8.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_10.config.yml similarity index 76% rename from spec/support/browserstack/windows/xp/xp_firefox_8.config.yml rename to spec/support/browserstack/windows/xp/xp_firefox_10.config.yml index 4cfd7522d..dbc1acdbd 100644 --- a/spec/support/browserstack/windows/xp/xp_firefox_8.config.yml +++ b/spec/support/browserstack/windows/xp/xp_firefox_10.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "Windows XP Firefox 8" + "build": "Windows XP Firefox 10" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "firefox" - "browser_version": "8.0" + "browser_version": "10.0" "os": "windows" "os_version": "xp" \ No newline at end of file diff --git a/spec/support/browserstack/windows/xp/xp_firefox_45esr.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_25.config.yml similarity index 75% rename from spec/support/browserstack/windows/xp/xp_firefox_45esr.config.yml rename to spec/support/browserstack/windows/xp/xp_firefox_25.config.yml index f769036a8..8c0f9b881 100644 --- a/spec/support/browserstack/windows/xp/xp_firefox_45esr.config.yml +++ b/spec/support/browserstack/windows/xp/xp_firefox_25.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "Windows XP Firefox 45 ESR" + "build": "Windows XP Firefox 25" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "firefox" - "browser_version": "45.0" + "browser_version": "25.0" "os": "windows" "os_version": "xp" \ No newline at end of file