diff --git a/.travis.yml b/.travis.yml index cf9236791..6b877da44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,72 +13,67 @@ 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=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_16.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 + # - 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_7.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_16.config.yml + - CONFIG_FILE=windows/xp/xp_firefox_26.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 + script: bundle exec rspec - 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 + script: bundle exec rspec - 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 + script: bundle exec rspec - 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 + script: bundle exec rspec - 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 script: - bundle exec rspec --tag run_on_browserstack addons: diff --git a/GeoLite2-City.tar.gz b/GeoLite2-City.tar.gz deleted file mode 100644 index 710361ffd..000000000 Binary files a/GeoLite2-City.tar.gz and /dev/null differ diff --git a/Rakefile b/Rakefile index 147aea6a2..fdbbac2f6 100644 --- a/Rakefile +++ b/Rakefile @@ -18,6 +18,7 @@ end ## RSPEC require 'rspec/core/rake_task' + RSpec::Core::RakeTask.new(:spec) do |task| task.rspec_opts = ['--tag ~run_on_browserstack'] end diff --git a/browserstack.err b/browserstack.err deleted file mode 100644 index a6e141486..000000000 --- a/browserstack.err +++ /dev/null @@ -1 +0,0 @@ -[object Object] \ No newline at end of file diff --git a/spec/support/browserstack/osx/elcapitan/elcapitan_firefox_6.config.yml b/spec/support/browserstack/osx/elcapitan/elcapitan_firefox_7.config.yml similarity index 76% rename from spec/support/browserstack/osx/elcapitan/elcapitan_firefox_6.config.yml rename to spec/support/browserstack/osx/elcapitan/elcapitan_firefox_7.config.yml index 48a8e808a..7c86cee25 100644 --- a/spec/support/browserstack/osx/elcapitan/elcapitan_firefox_6.config.yml +++ b/spec/support/browserstack/osx/elcapitan/elcapitan_firefox_7.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "OSX El Capitan Firefox 6" + "build": "OSX El Capitan 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": "el capitan" \ No newline at end of file diff --git a/spec/support/browserstack/windows/xp/xp_firefox_25.config.yml b/spec/support/browserstack/windows/xp/xp_firefox_26.config.yml similarity index 76% rename from spec/support/browserstack/windows/xp/xp_firefox_25.config.yml rename to spec/support/browserstack/windows/xp/xp_firefox_26.config.yml index 8c0f9b881..2b2da9e0a 100644 --- a/spec/support/browserstack/windows/xp/xp_firefox_25.config.yml +++ b/spec/support/browserstack/windows/xp/xp_firefox_26.config.yml @@ -1,7 +1,7 @@ server: "hub-cloud.browserstack.com" common_caps: - "build": "Windows XP Firefox 25" + "build": "Windows XP Firefox 26" "project": "BeEF" "browserstack.local": true "browserstack.video": false @@ -9,6 +9,6 @@ common_caps: browser_caps: - "browser": "firefox" - "browser_version": "25.0" + "browser_version": "26.0" "os": "windows" "os_version": "xp" \ No newline at end of file