From a4f06bbaac433fe8adaff5cc1e95ef63d5cc9531 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Thu, 23 Apr 2020 11:56:34 +1000 Subject: [PATCH] And now for something completely different --- .../autorun_engine/autorun_engine_spec.rb | 26 +++++++++++-------- .../handlers/browser_details_handler_spec.rb | 22 ++++++++-------- .../websocket_hooked_browser_spec.rb | 22 ++++++++-------- .../modules/debug/test_beef_debugs_spec.rb | 22 ++++++++-------- 4 files changed, 48 insertions(+), 44 deletions(-) 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 d63c6e130..2a71e59a7 100644 --- a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb +++ b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb @@ -80,19 +80,23 @@ RSpec.describe 'AutoRunEngine test', :run_on_browserstack => true do http_hook_server.start end + # Authenticate to REST API & pull the token from the response + @response = RestClient.post "#{RESTAPI_ADMIN}/login", { 'username': "#{@username}", 'password': "#{@password}" }.to_json, :content_type => :json + @token = JSON.parse(@response)['token'] + @caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID]) @caps["name"] = @caps['name'] || ENV['name'] || 'no-name' - @enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true" - puts "enable_local is #{@enable_local.to_s.upcase}" + @caps["browserstack.local"] = true + @caps['browserstack.localIdentifier'] = ENV['BROWSERSTACK_LOCAL_IDENTIFIER'] + # @enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true" + # puts "enable_local is #{@enable_local.to_s.upcase}" - # Code to start browserstack local before start of test - if @enable_local && - @bs_local = BrowserStack::Local.new - bs_local_args = { "key" => CONFIG['key'], "forcelocal" => true } - @bs_local.start(bs_local_args) - @caps["browserstack.local"] = true - @caps['browserstack.localIdentifier'] = ENV['BROWSERSTACK_LOCAL_IDENTIFIER'] - end + # # Code to start browserstack local before start of test + # if @enable_local && + # @bs_local = BrowserStack::Local.new + # bs_local_args = { "key" => CONFIG['key'], "forcelocal" => true } + # @bs_local.start(bs_local_args) + # end @driver = Selenium::WebDriver.for(:remote, :url => "http://#{CONFIG['user']}:#{CONFIG['key']}@#{CONFIG['server']}/wd/hub", @@ -113,7 +117,7 @@ RSpec.describe 'AutoRunEngine test', :run_on_browserstack => true do # @driver.quit # Code to stop browserstack local after end of test - @bs_local.stop if @enable_local + # @bs_local.stop if @enable_local print_info "Shutting down server" Process.kill("KILL",@pid) 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 f4a591063..5ff9c93eb 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -82,17 +82,17 @@ RSpec.describe 'Browser details handler', :run_on_browserstack => true do @caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID]) @caps["name"] = @caps['name'] || ENV['name'] || 'no-name' - @enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true" - puts "enable_local is #{@enable_local.to_s.upcase}" + @caps["browserstack.local"] = true + @caps['browserstack.localIdentifier'] = ENV['BROWSERSTACK_LOCAL_IDENTIFIER'] + # @enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true" + # puts "enable_local is #{@enable_local.to_s.upcase}" - # Code to start browserstack local before start of test - if @enable_local && - @bs_local = BrowserStack::Local.new - bs_local_args = { "key" => CONFIG['key'], "forcelocal" => true } - @bs_local.start(bs_local_args) - @caps["browserstack.local"] = true - @caps['browserstack.localIdentifier'] = ENV['BROWSERSTACK_LOCAL_IDENTIFIER'] - end + # # Code to start browserstack local before start of test + # if @enable_local && + # @bs_local = BrowserStack::Local.new + # bs_local_args = { "key" => CONFIG['key'], "forcelocal" => true } + # @bs_local.start(bs_local_args) + # end @driver = Selenium::WebDriver.for(:remote, :url => "http://#{CONFIG['user']}:#{CONFIG['key']}@#{CONFIG['server']}/wd/hub", @@ -113,7 +113,7 @@ RSpec.describe 'Browser details handler', :run_on_browserstack => true do # @driver.quit # Code to stop browserstack local after end of test - @bs_local.stop if @enable_local + # @bs_local.stop if @enable_local print_info "Shutting down server" Process.kill("KILL",@pid) diff --git a/spec/beef/extensions/websocket_hooked_browser_spec.rb b/spec/beef/extensions/websocket_hooked_browser_spec.rb index 35978f2a1..988687905 100644 --- a/spec/beef/extensions/websocket_hooked_browser_spec.rb +++ b/spec/beef/extensions/websocket_hooked_browser_spec.rb @@ -60,17 +60,17 @@ RSpec.describe 'BeEF WebSockets enabled', :run_on_browserstack => true do @caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID]) @caps["name"] = @caps['name'] || ENV['name'] || 'no-name' - @enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true" - puts "enable_local is #{@enable_local.to_s.upcase}" + @caps["browserstack.local"] = true + @caps['browserstack.localIdentifier'] = ENV['BROWSERSTACK_LOCAL_IDENTIFIER'] + # @enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true" + # puts "enable_local is #{@enable_local.to_s.upcase}" - # Code to start browserstack local before start of test - if @enable_local && - @bs_local = BrowserStack::Local.new - bs_local_args = { "key" => CONFIG['key'], "forcelocal" => true } - @bs_local.start(bs_local_args) - @caps["browserstack.local"] = true - @caps['browserstack.localIdentifier'] = ENV['BROWSERSTACK_LOCAL_IDENTIFIER'] - end + # # Code to start browserstack local before start of test + # if @enable_local && + # @bs_local = BrowserStack::Local.new + # bs_local_args = { "key" => CONFIG['key'], "forcelocal" => true } + # @bs_local.start(bs_local_args) + # end @driver = Selenium::WebDriver.for(:remote, :url => "http://#{CONFIG['user']}:#{CONFIG['key']}@#{CONFIG['server']}/wd/hub", @@ -88,7 +88,7 @@ RSpec.describe 'BeEF WebSockets enabled', :run_on_browserstack => true do # @driver.quit # Code to stop browserstack local after end of test - @bs_local.stop if @enable_local + # @bs_local.stop if @enable_local # cleanup: delete test browser entries and session # kill the server diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb index 9c6b54627..73565999e 100644 --- a/spec/beef/modules/debug/test_beef_debugs_spec.rb +++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb @@ -82,17 +82,17 @@ RSpec.describe 'BeEF Debug Command Modules:', :run_on_browserstack => true do @caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID]) @caps["name"] = @caps['name'] || ENV['name'] || 'no-name' - @enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true" - puts "enable_local is #{@enable_local.to_s.upcase}" + @caps["browserstack.local"] = true + @caps['browserstack.localIdentifier'] = ENV['BROWSERSTACK_LOCAL_IDENTIFIER'] + # @enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true" + # puts "enable_local is #{@enable_local.to_s.upcase}" - # Code to start browserstack local before start of test - if @enable_local && - @bs_local = BrowserStack::Local.new - bs_local_args = { "key" => CONFIG['key'], "forcelocal" => true } - @bs_local.start(bs_local_args) - @caps["browserstack.local"] = true - @caps['browserstack.localIdentifier'] = ENV['BROWSERSTACK_LOCAL_IDENTIFIER'] - end + # # Code to start browserstack local before start of test + # if @enable_local && + # @bs_local = BrowserStack::Local.new + # bs_local_args = { "key" => CONFIG['key'], "forcelocal" => true } + # @bs_local.start(bs_local_args) + # end @driver = Selenium::WebDriver.for(:remote, :url => "http://#{CONFIG['user']}:#{CONFIG['key']}@#{CONFIG['server']}/wd/hub", @@ -122,7 +122,7 @@ RSpec.describe 'BeEF Debug Command Modules:', :run_on_browserstack => true do # @driver.quit # Code to stop browserstack local after end of test - @bs_local.stop if @enable_local + # @bs_local.stop if @enable_local print_info "Shutting down server" Process.kill("KILL",@pid)