From e9a012c04bfc027c20f5b6806712eacc887a35b0 Mon Sep 17 00:00:00 2001 From: Jack Walker Date: Wed, 29 Apr 2020 11:02:49 +1000 Subject: [PATCH] Testing new client side wait to increase hook consistency in test. --- spec/beef/core/main/handlers/browser_details_handler_spec.rb | 4 ++-- spec/beef/modules/debug/test_beef_debugs_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 1f6461e68..4536b5856 100644 --- a/spec/beef/core/main/handlers/browser_details_handler_spec.rb +++ b/spec/beef/core/main/handlers/browser_details_handler_spec.rb @@ -91,8 +91,8 @@ RSpec.describe 'Browser Details Handler', :run_on_browserstack => true do # Give time for browser hook to occur wait = Selenium::WebDriver::Wait.new(:timeout => 30) # seconds - wait.until { @driver.execute_script("return !!window.beef.session").equal? true} - puts @driver.execute_script("return window.beef.session") + wait.until { @driver.execute_script("return window.beef.session.get_hook_session_id").greater_than 0} + 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'] diff --git a/spec/beef/modules/debug/test_beef_debugs_spec.rb b/spec/beef/modules/debug/test_beef_debugs_spec.rb index 20929aa0e..cb590b4ea 100644 --- a/spec/beef/modules/debug/test_beef_debugs_spec.rb +++ b/spec/beef/modules/debug/test_beef_debugs_spec.rb @@ -90,8 +90,8 @@ RSpec.describe 'BeEF Debug Command Modules:', :run_on_browserstack => true do # Give time for browser hook to occur wait = Selenium::WebDriver::Wait.new(:timeout => 30) # seconds - wait.until { @driver.execute_script("return !!window.beef.session").equal? true} - puts @driver.execute_script("return window.beef.session") + wait.until { @driver.execute_script("return window.beef.session.get_hook_session_id").greater_than 0} + 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']