From ca1df1095349f824a9e93eef6dd4750326cf45d1 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Wed, 29 Apr 2020 12:50:12 +1000 Subject: [PATCH] Testing new client side wait to increase hook consistency in test. --- spec/beef/core/main/autorun_engine/autorun_engine_spec.rb | 6 +++++- .../beef/core/main/handlers/browser_details_handler_spec.rb | 6 +++++- spec/beef/modules/debug/test_beef_debugs_spec.rb | 6 +++++- 3 files changed, 15 insertions(+), 3 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 1103f220a..e359e3d58 100644 --- a/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb +++ b/spec/beef/core/main/autorun_engine/autorun_engine_spec.rb @@ -98,7 +98,11 @@ RSpec.describe 'AutoRunEngine Test', :run_on_browserstack => true do puts @driver.execute_script("return window.beef.session.get_hook_session_id()") @hooks = JSON.parse(RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}") - @session = @hooks['hooked-browsers']['online']['0']['session'] || @driver.execute_script("return window.beef.session.get_hook_session_id()") + if @hooks['hooked-browsers']['online'].empty? + @session = @driver.execute_script("return window.beef.session.get_hook_session_id()") + else + @session = @hooks['hooked-browsers']['online']['0']['session'] + end end after(:all) do 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 33cbc4a7e..fc9b2c4b0 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -95,7 +95,11 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do puts @driver.execute_script("return window.beef.session.get_hook_session_id()") @hooks = JSON.parse(RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}") - @session = @hooks['hooked-browsers']['online']['0']['session'] || @driver.execute_script("return window.beef.session.get_hook_session_id()") + if @hooks['hooked-browsers']['online'].empty? + @session = @driver.execute_script("return window.beef.session.get_hook_session_id()") + else + @session = @hooks['hooked-browsers']['online']['0']['session'] + end end after(:all) do diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb index e841f7953..4ec2a808c 100644 --- a/spec/beef/modules/debug/test_beef_debugs_spec.rb +++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb @@ -94,7 +94,11 @@ RSpec.describe 'BeEF Debug Command Modules:', :run_on_browserstack => true do puts @driver.execute_script("return window.beef.session.get_hook_session_id()") @hooks = JSON.parse(RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}") - @session = @hooks['hooked-browsers']['online']['0']['session'] || @driver.execute_script("return window.beef.session.get_hook_session_id()") + if @hooks['hooked-browsers']['online'].empty? + @session = @driver.execute_script("return window.beef.session.get_hook_session_id()") + else + @session = @hooks['hooked-browsers']['online']['0']['session'] + end # Grab Command Module IDs as they can differ from machine to machine @debug_mod_ids = JSON.parse(RestClient.get "#{RESTAPI_MODULES}?token=#{@token}")