From 202d0ff8ab3a3f6fc3759312654a0b0c7b635a9a Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Wed, 22 Apr 2020 13:27:21 +1000 Subject: [PATCH] testing new matrix expansion config. --- .travis.yml | 11 +++++++---- .../main/autorun_engine/autorun_engine_spec.rb | 2 +- .../main/handlers/browser_details_handler_spec.rb | 2 +- spec/beef/extensions/requester_spec.rb | 2 +- .../extensions/websocket_hooked_browser_spec.rb | 2 +- spec/beef/modules/debug/test_beef_debugs_spec.rb | 2 +- .../windows/win_10/win10_ie_11.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_8-1/win8-1_ie_11.config.yml | 14 ++++++++++++++ .../windows/win_8/win8_ie_10.config.yml | 14 ++++++++++++++ .../browserstack/windows/xp/xp_ie_6.config.yml | 14 ++++++++++++++ .../browserstack/windows/xp/xp_ie_7.config.yml | 14 ++++++++++++++ 15 files changed, 138 insertions(+), 9 deletions(-) create mode 100644 spec/support/browserstack/windows/win_10/win10_ie_11.config.yml create mode 100644 spec/support/browserstack/windows/win_7/win7_ie_10.config.yml create mode 100644 spec/support/browserstack/windows/win_7/win7_ie_11.config.yml create mode 100644 spec/support/browserstack/windows/win_7/win7_ie_8.config.yml create mode 100644 spec/support/browserstack/windows/win_7/win7_ie_9.config.yml create mode 100644 spec/support/browserstack/windows/win_8-1/win8-1_ie_11.config.yml create mode 100644 spec/support/browserstack/windows/win_8/win8_ie_10.config.yml create mode 100644 spec/support/browserstack/windows/xp/xp_ie_6.config.yml create mode 100644 spec/support/browserstack/windows/xp/xp_ie_7.config.yml diff --git a/.travis.yml b/.travis.yml index 30cbb2e2b..e5103699c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,10 +13,13 @@ before_script: - RUBY_VERSION=/bin/bash rvm current - sed -i -E 's/system\((.*?)\)/""/g' /home/travis/.rvm/gems/$RUBY_VERSION/gems/browserstack-local-1.3.0/lib/browserstack/local.rb - yes | ./update-geoipdb -script: - # - bundle exec rake - - CONFIG_FILE='windows/windows_chrome_latest.config.yml' bundle exec rspec --tag run_on_browserstack - - CONFIG_FILE='osx/osx_safari_latest.config.yml' bundle exec rspec --tag run_on_browserstack +jobs: + - name: "Standard Test Suite" + env: CONFIG_FILE=windows/windows_chrome_latest.config.yaml + script: bundle exec rake + - name: "OSX Safari Latest" + env: CONFIG_FILE=osx/osx_safari_latest_config.yaml + script: bundle exec rspec --tag run_on_browserstack addons: apt: packages: diff --git a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb index 91410724d..d2a31a327 100644 --- a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb +++ b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb @@ -94,7 +94,7 @@ RSpec.describe 'AutoRunEngine test' do @victim = @driver.navigate.to "#{VICTIM_URL}" # Give time for browser hook to occur - sleep 2.5 + sleep 5 # Identify Session ID of victim generated above @hooks = RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}" 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 4f5365f20..b6f96b8fe 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -87,7 +87,7 @@ RSpec.describe 'Browser details handler' do @victim = @driver.navigate.to "#{VICTIM_URL}" # Give time for browser hook to occur - sleep 2.5 + sleep 5 # Identify Session ID of victim generated above @hooks = RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}" diff --git a/spec/beef/extensions/requester_spec.rb b/spec/beef/extensions/requester_spec.rb index e7f498706..402b9a2a2 100644 --- a/spec/beef/extensions/requester_spec.rb +++ b/spec/beef/extensions/requester_spec.rb @@ -69,7 +69,7 @@ RSpec.describe 'BeEF Extension Requester' do victim = @driver.navigate.to "#{VICTIM_URL}" # Give time for browser hook to occur - sleep 2.5 + sleep 5 response = RestClient.get "#{RESTAPI_HOOKS}", {:params => {:token => @token}} puts "hooks response: #{response}" diff --git a/spec/beef/extensions/websocket_hooked_browser_spec.rb b/spec/beef/extensions/websocket_hooked_browser_spec.rb index fe24ac8e2..0c16b6cfc 100644 --- a/spec/beef/extensions/websocket_hooked_browser_spec.rb +++ b/spec/beef/extensions/websocket_hooked_browser_spec.rb @@ -69,7 +69,7 @@ RSpec.describe 'BeEF WebSockets enabled' do victim = @driver.navigate.to "#{VICTIM_URL}" # Give time for browser hook to occur - sleep 2.5 + sleep 5 #Uses the response and hooked browser details to get the response response = RestClient.get "#{RESTAPI_HOOKS}", {:params => {:token => @token}} diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb index a3ddce349..cef1ba3bb 100644 --- a/spec/beef/modules/debug/test_beef_debugs_spec.rb +++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb @@ -95,7 +95,7 @@ RSpec.describe 'BeEF Debug Command Modules:' do @victim = @driver.navigate.to "#{VICTIM_URL}" # Give time for browser hook to occur - sleep 2.5 + sleep 5 # Identify Session ID of victim generated above @hooks = RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}" diff --git a/spec/support/browserstack/windows/win_10/win10_ie_11.config.yml b/spec/support/browserstack/windows/win_10/win10_ie_11.config.yml new file mode 100644 index 000000000..cf3aad47d --- /dev/null +++ b/spec/support/browserstack/windows/win_10/win10_ie_11.config.yml @@ -0,0 +1,14 @@ +server: "hub-cloud.browserstack.com" + +common_caps: + "build": "Windows 10 IE 11" + "project": "BeEF" + "browserstack.local": true + "browserstack.video": false + +browser_caps: + - + "browser": "internet explorer" + "browser_version": "11.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 new file mode 100644 index 000000000..7554752cf --- /dev/null +++ b/spec/support/browserstack/windows/win_7/win7_ie_10.config.yml @@ -0,0 +1,14 @@ +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 new file mode 100644 index 000000000..49fb40d8b --- /dev/null +++ b/spec/support/browserstack/windows/win_7/win7_ie_11.config.yml @@ -0,0 +1,14 @@ +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 new file mode 100644 index 000000000..f26fa781b --- /dev/null +++ b/spec/support/browserstack/windows/win_7/win7_ie_8.config.yml @@ -0,0 +1,14 @@ +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 new file mode 100644 index 000000000..a68e1c266 --- /dev/null +++ b/spec/support/browserstack/windows/win_7/win7_ie_9.config.yml @@ -0,0 +1,14 @@ +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_8-1/win8-1_ie_11.config.yml b/spec/support/browserstack/windows/win_8-1/win8-1_ie_11.config.yml new file mode 100644 index 000000000..05e0f3030 --- /dev/null +++ b/spec/support/browserstack/windows/win_8-1/win8-1_ie_11.config.yml @@ -0,0 +1,14 @@ +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/win_8/win8_ie_10.config.yml b/spec/support/browserstack/windows/win_8/win8_ie_10.config.yml new file mode 100644 index 000000000..a59193cb8 --- /dev/null +++ b/spec/support/browserstack/windows/win_8/win8_ie_10.config.yml @@ -0,0 +1,14 @@ +server: "hub-cloud.browserstack.com" + +common_caps: + "build": "Windows 8 IE 10" + "project": "BeEF" + "browserstack.local": true + "browserstack.video": false + +browser_caps: + - + "browser": "internet explorer" + "browser_version": "10.0" + "os": "windows" + "os_version": "8" \ 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_ie_6.config.yml new file mode 100644 index 000000000..1f9d0338d --- /dev/null +++ b/spec/support/browserstack/windows/xp/xp_ie_6.config.yml @@ -0,0 +1,14 @@ +server: "hub-cloud.browserstack.com" + +common_caps: + "build": "Windows XP IE 6" + "project": "BeEF" + "browserstack.local": true + "browserstack.video": false + +browser_caps: + - + "browser": "internet explorer" + "browser_version": "6.0" + "os": "windows" + "os_version": "xp" \ No newline at end of file diff --git a/spec/support/browserstack/windows/xp/xp_ie_7.config.yml b/spec/support/browserstack/windows/xp/xp_ie_7.config.yml new file mode 100644 index 000000000..877bef28f --- /dev/null +++ b/spec/support/browserstack/windows/xp/xp_ie_7.config.yml @@ -0,0 +1,14 @@ +server: "hub-cloud.browserstack.com" + +common_caps: + "build": "Windows XP IE 7" + "project": "BeEF" + "browserstack.local": true + "browserstack.video": false + +browser_caps: + - + "browser": "internet explorer" + "browser_version": "7.0" + "os": "windows" + "os_version": "xp" \ No newline at end of file