Attempt 1231829038102931

spec/beef/core/main/autorun_engine/autorun_engine_spec.rb

@@ -86,21 +86,19 @@ RSpec.describe 'AutoRunEngine test' do
 		# 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']
+
+		# Hook new victim
+		print_info 'Hooking a new victim, waiting a few seconds...'
+		@victim = @driver.navigate.to "#{VICTIM_URL}"
+
+		# Give time for browser hook to occur
+		sleep 2
+
+		# Identify Session ID of victim generated above
+		@hooks = RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}"
+		@session = JSON.parse(@hooks)['hooked-browsers']['online']['0']['session']
 	end
 
-	before(:each) do
-			# Hook new victim
-			print_info 'Hooking a new victim, waiting a few seconds...'
-			@victim = @driver.navigate.to "#{VICTIM_URL}"
-
-			# Give time for browser hook to occur
-			sleep 2
-
-			# Identify Session ID of victim generated above
-			@hooks = RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}"
-			@session = JSON.parse(@hooks)['hooked-browsers']['online']['0']['session']
-	end
-  
 	after(:all) do
 		print_info "Shutting down server"
 		Process.kill("KILL",@pid)

spec/beef/core/main/handlers/browser_details_handler_spec.rb

@@ -79,9 +79,7 @@ RSpec.describe 'Browser details handler' do
 		# 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']
-	end
 
-	before(:each) do
 		# Hook new victim
 		print_info 'Hooking a new victim, waiting a few seconds...'
 		@victim = @driver.navigate.to "#{VICTIM_URL}"
@@ -93,7 +91,7 @@ RSpec.describe 'Browser details handler' do
 		@hooks = RestClient.get "#{RESTAPI_HOOKS}?token=#{@token}"
 		@session = JSON.parse(@hooks)['hooked-browsers']['online']['0']['session']
 	end
-  
+
 	after(:all) do
 		print_info "Shutting down server"
 		Process.kill("KILL",@pid)

spec/beef/modules/debug/test_beef_debugs_spec.rb

@@ -87,9 +87,7 @@ RSpec.describe 'BeEF Debug Command Modules:' do
                                     .map do |debug_mod|
                                         @debug_mod_names_ids[debug_mod[1]['class']] = debug_mod[0]
                                     end
-    end
 
-    before(:each) do
         # Hook new victim
 		print_info 'Hooking a new victim, waiting a few seconds...'
         @victim = @driver.navigate.to "#{VICTIM_URL}"

spec/spec_helper.rb

@@ -69,9 +69,9 @@ RSpec.configure do |config|
     end
   end
   # BrowserStack
-  config.around(:test, :run_on_browserstack => true) do |test|
+  config.around(:example, :run_on_browserstack => true) do |example|
     @caps = CONFIG['common_caps'].merge(CONFIG['browser_caps'][TASK_ID])
-    @caps["name"] = ENV['name'] || test.metadata[:name] || test.metadata[:file_path].split('/').last.split('.').first
+    @caps["name"] = ENV['name'] || example.metadata[:name] || example.metadata[:file_path].split('/').last.split('.').first
     enable_local = @caps["browserstack.local"] && @caps["browserstack.local"].to_s == "true"
 
     # Code to start browserstack local before start of test
@@ -88,7 +88,7 @@ RSpec.configure do |config|
       :desired_capabilities => @caps)
 
     begin
-      test.run
+      example.run
     ensure 
       @driver.quit
       # Code to stop browserstack local after end of test

spec/support/browserstack/osx/el_capitan/elcapitan_chrome_59.config.yml

@@ -1,7 +1,7 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "OSX Catalina Chrome 59"
+  "build": "OSX El Capitan Chrome 59"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
@@ -11,4 +11,4 @@ browser_caps:
     "browser": "chrome"
     "browser_version": "59.0"
     "os": "osx"
-    "os_version": "catalina"
+    "os_version": "el capitan"

spec/support/browserstack/osx/el_capitan/elcapitan_chrome_81.config.yml

@@ -1,7 +1,7 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "OSX Catalina Chrome 81"
+  "build": "OSX El Capitan Chrome 81"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
@@ -11,4 +11,4 @@ browser_caps:
     "browser": "chrome"
     "browser_version": "81.0"
     "os": "osx"
-    "os_version": "catalina"
+    "os_version": "el capitan"

spec/support/browserstack/osx/el_capitan/elcapitan_firefox_5.config.yml

@@ -1,7 +1,7 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "OSX Catalina Firefox 11"
+  "build": "OSX El Capitan Firefox 5"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
@@ -9,6 +9,6 @@ common_caps:
 browser_caps:
   -
     "browser": "firefox"
-    "browser_version": "11.0"
+    "browser_version": "5.0"
     "os": "osx"
-    "os_version": "catalina"
+    "os_version": "el capitan"

spec/support/browserstack/osx/el_capitan/elcapitan_firefox_68esr.config.yml

@@ -1,7 +1,7 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "OSX Catalina Firefox 68 ESR"
+  "build": "OSX El Capitan Firefox 68 ESR"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
@@ -11,4 +11,4 @@ browser_caps:
     "browser": "firefox"
     "browser_version": "68.0"
     "os": "osx"
-    "os_version": "catalina"
+    "os_version": "el capitan"

spec/support/browserstack/osx/el_capitan/elcapitan_firefox_75.config.yml

@@ -1,7 +1,7 @@
 server: "hub-cloud.browserstack.com"
 
 common_caps:
-  "build": "OSX Catalina Firefox 75"
+  "build": "OSX El Capitan Firefox 75"
   "project": "BeEF"
   "browserstack.local": true
   "browserstack.video": false
@@ -11,4 +11,4 @@ browser_caps:
     "browser": "firefox"
     "browser_version": "75.0"
     "os": "osx"
-    "os_version": "catalina"
+    "os_version": "el capitan"

spec/support/browserstack/osx/snow_leopard/catalina_chrome_81.config.yml

@@ -9,6 +9,6 @@ common_caps:
 browser_caps:
   -
     "browser": "chrome"
-    "browser_version": "81.0"
+    "browser_version": "49.0"
     "os": "osx"
-    "os_version": "catalina"
+    "os_version": "snow leopard"