Commit Graph

3616 Commits

Author SHA1 Message Date
Jack Walker
dc20e03569 Resolved merge conflicts from prod-beef master 2020-04-21 13:11:00 +10:00
Jack Walker
6c503e4143 Committing to merge latest prod-beef master 2020-04-21 13:05:26 +10:00
jcrew99
bd35469757 Merge pull request #1915 from beefproject/new_websocket_spec
made a new websocket test for the browser
2020-04-20 16:45:40 +10:00
Josh
54929dad9f changed the extension name 2020-04-19 23:39:57 -07:00
Josh
549df7480a updated due to feedback from reviewer 2020-04-19 23:30:20 -07:00
Josh
e43b79fa5b made a new websocket test for the browser 2020-04-19 22:24:49 -07:00
jcrew99
9649a0f857 Merge pull request #1902 from beefproject/debug_unit_tests
Added debug unit tests
2020-04-20 12:01:57 +10:00
Jack Walker
5014771060 Merge branch 'master' of github.com:beefproject/beef into debug_unit_tests 2020-04-20 11:27:20 +10:00
Jack Walker
b645a730fa Fixed extensions loading issue causing tests to run with previously loaded config. 2020-04-20 11:26:09 +10:00
Jack Walker
6ced8acd8b Found the fix for the browser hooking issues. Resolved where necessary and cleaned up tests. 2020-04-20 10:55:00 +10:00
jcrew99
1989e49df0 Merge pull request #1914 from beefproject/port_scanner_update
Final config with version details
2020-04-20 09:09:47 +10:00
salmong1t
d5d7542be2 Final config with version details 2020-04-17 00:02:57 -07:00
Jack Walker
31b039b0c5 Merge branch 'debug_unit_tests' of github.com:beefproject/beef into debug_unit_tests 2020-04-16 16:20:03 +10:00
Jack Walker
1ba8b6d29a Removed byebug + other unneeded requires. Shortened some sleeps. 2020-04-16 13:15:25 +10:00
Jack Walker
0a39de17e0 Add handling to only load modules and extensions if they are not already loaded. 2020-04-16 13:11:26 +10:00
jcrew99
abbe9db66b Merge pull request #1912 from beefproject/update_sw_port_scanner
fixed a few spelling mistakes and changed the name
2020-04-16 10:46:07 +10:00
Jack Walker
3b20c8eee9 Missing class variable tags 2020-04-16 10:33:33 +10:00
Jack Walker
55112fe492 Fixed hard coded command modules 2020-04-16 10:30:16 +10:00
Josh
1aa76f93cb fixed a few spelling mistakes and changed the name 2020-04-15 16:00:19 -07:00
Jack Walker
804fc6363a Implemented BrowserStack testing into debug module tests. 2020-04-16 08:54:04 +10:00
Jack Walker
4319f73fe7 This time for sure 2020-04-15 14:52:31 +10:00
Jack Walker
667b773cc5 PLEASE 2020-04-15 14:37:08 +10:00
Jack Walker
0a7f9ec222 Envvars pls 2020-04-15 14:13:53 +10:00
Jack Walker
7a2f90534f Fixed envvar? 2020-04-15 13:32:29 +10:00
Jack Walker
fd9c4758d5 Testing env var w/ Travis 2020-04-15 13:24:51 +10:00
Jack Walker
7406360065 Converted RSpec BrowserStack config to use Capybara instead of Selenium as we primarily use Capybara sessions in testing. 2020-04-15 12:37:28 +10:00
Jack Walker
ba81a386e1 Test cleanup. 2020-04-15 11:59:29 +10:00
Jack Walker
45034fcfe6 Removed a bunch of browsers, see if we can get tests passing. 2020-04-14 17:03:33 +10:00
Jack Walker
3619567116 Removed broken tests. Check for pass. 2020-04-14 17:02:10 +10:00
Jack Walker
a271d7656b Pushing changes that should enable BrowserStack. Partly pushing to see if we get these results in Travis. 2020-04-14 16:21:40 +10:00
Jack Walker
7a27db0b3d Reverting. 2020-04-14 12:39:06 +10:00
Jack Walker
c2c8b87cfb Testing different access_key format 2020-04-14 12:34:45 +10:00
Jack Walker
33c97ae9bb Added browserstack to list of branches Travis will build and test 2020-04-14 12:15:05 +10:00
Jack Walker
477188944d Browserstack config added to .travis.yml 2020-04-14 12:11:58 +10:00
Jack Walker
815d2e4bb8 Resolved merge conflicts from other working branch 2020-04-14 10:50:34 +10:00
Jack Walker
c610aa1666 Fixed change to config.yaml creds 2020-04-14 10:41:32 +10:00
Jack Walker
0ffd87059a Resolved issues preventing server starting w/ test. Tests now passing. 2020-04-14 10:40:50 +10:00
jcrew99
6431df68cf Merge pull request #1905 from beefproject/refining_websocket_tests
Refining websocket tests
2020-04-09 13:48:52 +10:00
jcrew99
4a0f8360c9 Merge pull request #1904 from beefproject/fix_default_values
moving these back to defaults
2020-04-09 13:45:20 +10:00
Grant Burgess
340279f91c Removed byebug dependency 2020-04-09 13:45:11 +10:00
jcrew99
5837502670 Merge pull request #1903 from beefproject/dockerize_beef
Added Dockerfile
2020-04-09 13:29:56 +10:00
Josh
4e0a2bb465 moving these back to defaults 2020-04-08 20:26:15 -07:00
Jack Walker
a3eca63504 Added Dockerfile 2020-04-09 13:03:37 +10:00
Jack Walker
d8fac13f8f Trying to automate API server 2020-04-09 13:03:08 +10:00
Grant Burgess
3c6aca28fd Added websocket client gem for testing 2020-04-09 12:30:28 +10:00
Grant Burgess
67d0c8bca2 Added a new test and modified the others. 2020-04-09 12:30:08 +10:00
Jack Walker
71cecf4e5e Added debug unit tests 2020-04-09 12:12:09 +10:00
jcrew99
e5381e3c93 Merge pull request #1900 from beefproject/update_ARE_rules
fiexed broken values
2020-04-07 17:58:39 +10:00
Josh
6db2a6f4f8 fiexed broken values 2020-04-07 00:56:18 -07:00
jcrew99
5841265ffa Merge pull request #1898 from beefproject/update_sw_port_scanner_module
updated command.js for sw_network_proxy
2020-04-07 09:58:38 +10:00