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