Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BrowserStack Integration #1920

Merged
merged 246 commits into from
May 31, 2020
Merged
Show file tree
Hide file tree
Changes from 244 commits
Commits
Show all changes
246 commits
Select commit Hold shift + click to select a range
4771889
Browserstack config added to .travis.yml
jackdwalker Apr 14, 2020
33c97ae
Added browserstack to list of branches Travis will build and test
jackdwalker Apr 14, 2020
c2c8b87
Testing different access_key format
jackdwalker Apr 14, 2020
7a27db0
Reverting.
jackdwalker Apr 14, 2020
a271d76
Pushing changes that should enable BrowserStack. Partly pushing to se…
jackdwalker Apr 14, 2020
3619567
Removed broken tests. Check for pass.
jackdwalker Apr 14, 2020
45034fc
Removed a bunch of browsers, see if we can get tests passing.
jackdwalker Apr 14, 2020
ba81a38
Test cleanup.
jackdwalker Apr 15, 2020
7406360
Converted RSpec BrowserStack config to use Capybara instead of Seleni…
jackdwalker Apr 15, 2020
fd9c475
Testing env var w/ Travis
jackdwalker Apr 15, 2020
7a2f905
Fixed envvar?
jackdwalker Apr 15, 2020
0a7f9ec
Envvars pls
jackdwalker Apr 15, 2020
667b773
PLEASE
jackdwalker Apr 15, 2020
4319f73
This time for sure
jackdwalker Apr 15, 2020
6c503e4
Committing to merge latest prod-beef master
jackdwalker Apr 21, 2020
dc20e03
Resolved merge conflicts from prod-beef master
jackdwalker Apr 21, 2020
eada815
Merge branch 'master' of github.com:beefproject/beef into browserstack
jackdwalker Apr 21, 2020
539860e
Commit to test new travis.yml
jackdwalker Apr 21, 2020
68a78c0
Fixed YAML extension. Was .yaml instead of .yml
jackdwalker Apr 21, 2020
2a5d377
Testing new .travis.yml script variant
jackdwalker Apr 21, 2020
ab8af27
Trying to ascertain where travis installs its gems
jackdwalker Apr 22, 2020
68e9487
Hopes and dreams
jackdwalker Apr 22, 2020
6d74889
Added missing dependency
jackdwalker Apr 22, 2020
d2e295c
/ not - <sigh>
jackdwalker Apr 22, 2020
b44275a
A wise man once sed writing build scripts is difficult
jackdwalker Apr 22, 2020
fe93c4e
Third sed lucky
jackdwalker Apr 22, 2020
71a5d88
Debugging travis
jackdwalker Apr 22, 2020
0b1ab14
The case of the missing -E
jackdwalker Apr 22, 2020
4a020fc
Added code to allow sed script to find gems based on ruby version
jackdwalker Apr 22, 2020
0b78cf7
Fixed last code from last commit so it doesn't fail on grabbing Ruby …
jackdwalker Apr 22, 2020
d15d68a
Missing config.yaml file added
jackdwalker Apr 22, 2020
9509b68
Updated BrowserStack access keys for new account
jackdwalker Apr 22, 2020
80dd706
Testing slower hook for more consistent results
jackdwalker Apr 22, 2020
764e54f
update-geoipdb fix will hopefully solve some failing tests
jackdwalker Apr 22, 2020
02fa3af
update-geoipdb fix will hopefully solve some failing tests
jackdwalker Apr 22, 2020
6a32aa9
Fixed GeoIPDB install script
jackdwalker Apr 22, 2020
202d0ff
testing new matrix expansion config.
jackdwalker Apr 22, 2020
746ef4b
Please
jackdwalker Apr 22, 2020
4d8395e
Hopefully found the final fix for the Travis/Browserstack local tunne…
jackdwalker Apr 22, 2020
d21438a
yml not yaml
jackdwalker Apr 22, 2020
e957d77
Debugging travis
jackdwalker Apr 22, 2020
a59c4d6
Debugging travis
jackdwalker Apr 22, 2020
4467a9e
Debugging travis
jackdwalker Apr 22, 2020
97fd3f1
Example error fix
jackdwalker Apr 22, 2020
02f34ca
Pls fix
jackdwalker Apr 22, 2020
1df856b
Attempt 1231829038102931
jackdwalker Apr 22, 2020
96ef0f3
This is it
jackdwalker Apr 22, 2020
a51a555
This is it fixed
jackdwalker Apr 22, 2020
af8b001
How about this
jackdwalker Apr 22, 2020
709e748
Getting closer?
jackdwalker Apr 22, 2020
6bf4750
oops
jackdwalker Apr 22, 2020
44092d8
fixed config.around hook
jackdwalker Apr 22, 2020
1250a45
Was the browser on bstacks the issue?
jackdwalker Apr 22, 2020
1cb7103
Today is a new day
jackdwalker Apr 22, 2020
6100c77
y
jackdwalker Apr 22, 2020
91dbaa8
y
jackdwalker Apr 22, 2020
c6f9f18
debugging
jackdwalker Apr 22, 2020
4234bf4
maybe?
jackdwalker Apr 22, 2020
b2cb798
maybee
jackdwalker Apr 22, 2020
f5ee021
Separated Selenium driver + BrowserStack code based on hook loadtime
jackdwalker Apr 23, 2020
9f5452d
Separated Selenium driver + BrowserStack code based on hook loadtime
jackdwalker Apr 23, 2020
a32f4ec
Separated Selenium driver + BrowserStack code based on hook loadtime
jackdwalker Apr 23, 2020
8b69279
Separated Selenium driver + BrowserStack code based on hook loadtime
jackdwalker Apr 23, 2020
5ee6ac4
Separated Selenium driver + BrowserStack code based on hook loadtime
jackdwalker Apr 23, 2020
f82d464
Separated Selenium driver + BrowserStack code based on hook loadtime
jackdwalker Apr 23, 2020
3389a73
Removed line causing error, see if it works w/out
jackdwalker Apr 23, 2020
f6fdaa3
Removed line causing error from all files.
jackdwalker Apr 23, 2020
a4f06bb
And now for something completely different
jackdwalker Apr 23, 2020
0703758
Took an easier route of acquiring the Auth token
jackdwalker Apr 23, 2020
4fae78b
Fix for driver time out.
jackdwalker Apr 23, 2020
f1e3664
Fix for driver time out.
jackdwalker Apr 23, 2020
25f45ba
Fixed test error
jackdwalker Apr 23, 2020
18357db
Hopefully the final fix. Mis-assigned variable fix.
jackdwalker Apr 23, 2020
faaac27
Debugging last 2/5 failing tests
jackdwalker Apr 23, 2020
7886232
Debugging last 2/5 failing tests
jackdwalker Apr 23, 2020
0fbb46d
Does this need to sleep until after first keep-alive?
jackdwalker Apr 23, 2020
539a17b
Missing necessary requires?
jackdwalker Apr 23, 2020
0376aa5
Re-added deleted code that may have impacted this test.
jackdwalker Apr 23, 2020
6db311d
Wrong require relative path for websocket test
jackdwalker Apr 23, 2020
12317c0
Wrong require relative path for websocket test
jackdwalker Apr 23, 2020
b78ff67
Continuing attempts to debug websocket hook test
jackdwalker Apr 23, 2020
0b30172
Added long sleep to definitively exclude this as a possibly for the e…
jackdwalker Apr 23, 2020
6ff10cb
Code intended to be deleted still present. Removed to check if issue …
jackdwalker Apr 23, 2020
a279c16
Code intended to be deleted still present. Removed to check if issue …
jackdwalker Apr 23, 2020
8fd71d6
Running an API call prior to grabbing session - possibly keep-alive p…
jackdwalker Apr 23, 2020
d61b38e
Is it only that API call failiing?
jackdwalker Apr 23, 2020
434a13c
Re-build w/ new debugging info
jackdwalker Apr 23, 2020
6fb1618
Re-build w/ new debugging info
jackdwalker Apr 23, 2020
2317714
Run tests against Browserstack w/ full OS/Browser compatability matrix.
jackdwalker Apr 23, 2020
9f5b3c5
Re-running failing tests.
jackdwalker Apr 24, 2020
5658009
eql -> eq
jackdwalker Apr 24, 2020
b15a8bc
.or for compound expectations
jackdwalker Apr 24, 2020
d34ff17
Potential fix for erroring compound matcher.
jackdwalker Apr 24, 2020
b7b78b8
Bumped lowest version of Firefox compability to 7.
jackdwalker Apr 24, 2020
9903c02
Bumped lowest version of Firefox compability to 7.
jackdwalker Apr 24, 2020
6e3ac8a
updated travis
Apr 24, 2020
66f1c25
Bumped lowest version of Firefox compability to 7.
jackdwalker Apr 24, 2020
2f70b7c
updated key
Apr 24, 2020
c5f9cb9
Bumped XP min FF version compatibility to 8.
jackdwalker Apr 24, 2020
31cd483
Fixed issue causing misidentification of debug modules.
jackdwalker Apr 24, 2020
e9da991
updated travis
Apr 24, 2020
17ae1c9
Removed unnecessary line in build matrix causing duplciate
jackdwalker Apr 24, 2020
bf24583
Fixed issue causing misidentification of debug modules.
jackdwalker Apr 24, 2020
5e51c9f
update yaml
Apr 24, 2020
41459e3
updated travis
Apr 24, 2020
60c307b
updated travis
Apr 24, 2020
9da4056
updated travis
Apr 24, 2020
0086c38
Updated Edge fingerprinting, was incorrectly being identified as Chro…
jackdwalker Apr 24, 2020
8f1f2d3
Updated Edge fingerprinting, was incorrectly being identified as Chro…
jackdwalker Apr 24, 2020
4198363
Updated Edge fingerprinting, was incorrectly being identified as Chro…
jackdwalker Apr 26, 2020
d44b6e6
Testing the 3 failing browsers
jackdwalker Apr 26, 2020
b048352
Merge pull request #2 from jackdwalker/browserstack
jcrew99 Apr 26, 2020
7d709c7
Additional Edge fingerprinting fixes. Bumped min XP FF ver.
jackdwalker Apr 26, 2020
e2c1956
updated a catupdated travis file
Apr 27, 2020
847cba4
Additional Edge fingerprinting fixes. Bumped min XP FF ver.
jackdwalker Apr 27, 2020
4daff89
updated travis
Apr 27, 2020
d643388
Additional Edge fingerprinting fixes. Bumped min XP FF ver.
jackdwalker Apr 27, 2020
11bb90c
Bumped min XP FF ver.
jackdwalker Apr 27, 2020
ba83d05
Bumped min XP FF ver.
jackdwalker Apr 27, 2020
a0d74e9
Bumped min XP FF ver.
jackdwalker Apr 27, 2020
b81f16b
Bumped min XP FF ver.
jackdwalker Apr 27, 2020
6edc5ab
Bumped min XP FF ver.
jackdwalker Apr 27, 2020
bd74310
Re-enabling full BrowserStack test suite. Test run before final merge.
jackdwalker Apr 27, 2020
4fb1a32
Fixed bug in IE10 detection. Missing bang on git add .window.XDomainR…
jackdwalker Apr 27, 2020
5ed9293
Merge branch 'master' of github.com:beefproject/beef into browserstack
jackdwalker Apr 27, 2020
383bfb9
checking websocket_hooked_brrowser
Apr 27, 2020
5ac339d
update
Apr 27, 2020
27af3e9
fixed travis spacing erros
Apr 27, 2020
d6ee378
fast_finish
Apr 27, 2020
c230cd0
debugging the websocket_hooked_browser_spec
Apr 27, 2020
f0de378
removed fast_finish to confirm thats the issue
Apr 27, 2020
c059799
updated .travis.yml
Apr 27, 2020
3040576
updated test
Apr 27, 2020
1f8a66a
websocket
Apr 27, 2020
72ebcc0
updated for testing
Apr 27, 2020
d257109
final check for the delete_all
Apr 27, 2020
3318b1e
update api token
Apr 27, 2020
b62e4c0
Bumping version of failing configs.
jackdwalker Apr 27, 2020
febe80d
bugfix? (badly formatted)
Apr 27, 2020
0e1efd0
bugfix v0.0.1?
Apr 27, 2020
1784347
Re-enabling full BrowserStack compat. checking.
jackdwalker Apr 27, 2020
49459fd
websocket hooked browser spec
Apr 27, 2020
7fcc325
added token which was mistakenly removed
Apr 27, 2020
df617fd
updated webbrowser
Apr 27, 2020
b0f6f02
Small bump up to hook time to get more consistent test results.
jackdwalker Apr 27, 2020
0147ab4
updated websocket
Apr 28, 2020
3a9d94f
updated debugging
Apr 28, 2020
f17e631
removed the delete_all
Apr 28, 2020
fbe3d35
websocket stop killing @driver
Apr 28, 2020
ef76639
moved more to the before :all
Apr 28, 2020
0d196aa
updated debugging information
Apr 28, 2020
d3db1d5
Small bump up to hook time to get more consistent test results.
jackdwalker Apr 28, 2020
630270b
updated debug
Apr 28, 2020
1386e3e
change debug method
Apr 28, 2020
25e139d
browser details
Apr 28, 2020
23b53d3
see if there is output?
Apr 28, 2020
1ec3546
updated changes
Apr 28, 2020
696e6b7
update test reference
Apr 28, 2020
cbae450
checking to see if it passes with websockets diabl
Apr 28, 2020
ac4412e
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 28, 2020
993b288
updated websocket
Apr 28, 2020
3a46868
this should break
Apr 28, 2020
44aadbc
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 28, 2020
00ee6df
should work
Apr 28, 2020
ea461c3
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 28, 2020
2ffbe66
updated travis for the whole stack
Apr 28, 2020
afdbe70
fixed left-over debugging
Apr 28, 2020
b5c7cd3
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 28, 2020
944e4e1
removed a debugging peice
Apr 28, 2020
f0ad679
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 28, 2020
d0c0763
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 28, 2020
6b1290b
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 28, 2020
ce29f9d
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 28, 2020
9a4ad1e
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 28, 2020
bf085bd
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 29, 2020
e9a012c
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 29, 2020
4726647
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 29, 2020
822bd61
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 29, 2020
0b44289
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 29, 2020
ca1df10
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 29, 2020
daef8b0
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 29, 2020
70a9db2
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 29, 2020
423ae6b
Testing new client side wait to increase hook consistency in test.
jackdwalker Apr 29, 2020
7decd7a
Adding some handling for potential issue in BeEF recognising hooks
jackdwalker Apr 29, 2020
59c34d5
Adding some handling for potential issue in BeEF recognising hooks
jackdwalker Apr 29, 2020
bf0f22a
Handling for last commit's issue successful. Testing against full suite.
jackdwalker Apr 29, 2020
192c666
Reverted to previous method of auth rather than just pulling API toke…
jackdwalker Apr 29, 2020
43dd0a2
Reverted back to taking token directly, auth was causing issues.:
jackdwalker Apr 29, 2020
dd2fad3
Added more handling to allow browser room to hook comfortably
jackdwalker Apr 29, 2020
4a7f338
Added more handling to allow browser room to be hooked comfortably
jackdwalker Apr 29, 2020
f4370bc
Update browser_details_handler_spec.rb
jcrew99 Apr 29, 2020
887f550
Update browser_details_handler_spec.rb
jcrew99 Apr 29, 2020
bb2879a
Added more handling to allow browser room to be hooked comfortably
jackdwalker Apr 29, 2020
334cbf8
Added more handling to allow browser room to be hooked comfortably
jackdwalker Apr 29, 2020
dc80537
Added additional logic to handle inconsistencies in test results
jackdwalker Apr 29, 2020
b397c2f
Added additional logic to handle inconsistencies in test results
jackdwalker Apr 29, 2020
8ff669c
Added additional logic to handle inconsistencies in test results
jackdwalker Apr 29, 2020
3f47d2f
Added additional logic to handle inconsistencies in test results
jackdwalker Apr 30, 2020
5f8bf6b
Added error handling to try/catch block.
jackdwalker Apr 30, 2020
5555d32
Added error handling to try/catch block.
jackdwalker Apr 30, 2020
8e1edf5
Added error handling to try/catch block.
jackdwalker Apr 30, 2020
66868e7
Added error handling to try/catch block.
jackdwalker Apr 30, 2020
3e6b758
Added error handling to try/catch block.
jackdwalker Apr 30, 2020
ece8151
Re-enabling full test suite.
jackdwalker Apr 30, 2020
6480127
Explicitly added Selenium driver version
jackdwalker May 6, 2020
8488bc3
Removed explicit Selenium driver versions. Causing multiple testing e…
jackdwalker May 6, 2020
e449537
Merged Josh's fix for the websocket hook test.
jackdwalker May 6, 2020
0f14e4d
Generated secure BrowserStack user + access key for beefproject/beef …
jackdwalker May 8, 2020
9849bab
Added error handling in the event hooked browser information also can…
jackdwalker May 8, 2020
e9b31e4
Added error handling in the event hooked browser information also can…
jackdwalker May 8, 2020
92f3bdb
Added additionally error handling to BrowserStack test cases
jackdwalker May 11, 2020
878e235
Broadened timeout exception handling.
jackdwalker May 11, 2020
8b8e19f
Added more descriptive exception CLI output for BrowserStack tests.
jackdwalker May 12, 2020
31a1969
Moved TIMEOUT error handling to teardown.
jackdwalker May 14, 2020
0c429a8
Forced latest Selenium version in El Capitan + Catalina Safari tests.…
jackdwalker May 15, 2020
45f6595
Fixed BrowserStack timeout error handling.
jackdwalker May 15, 2020
0375acd
Fixed BrowserStack timeout error handling.
jackdwalker May 15, 2020
a85f0d7
Reversed logic gate for incorrectly handled exception.
jackdwalker May 15, 2020
a82e520
Flipped localhost/127.0.0.1 in ATTACK/VICTIM_DOMAIN test constants. S…
jackdwalker May 18, 2020
d51c6ae
Added error handling for initial failed connection/timeout to Browser…
jackdwalker May 18, 2020
443e8df
Added error handling for initial failed connection/timeout to Browser…
jackdwalker May 18, 2020
d43e0ba
Missing closing paren from last commit.
jackdwalker May 18, 2020
69998ee
Missing wait definition specifically in websocket_hooked_browser_spec.rb
jackdwalker May 18, 2020
bf0e209
Changed error handling to account for any false fails. Should now onl…
jackdwalker May 27, 2020
93df669
Changed error handling to account for any false fails. Should now onl…
jackdwalker May 27, 2020
e94ac01
Fixed incorrect variable referencing
jackdwalker May 27, 2020
18e7651
Added some additional session handling code in the server setup.
jackdwalker May 27, 2020
dbb6cb1
Missing key on hook variable assignment
jackdwalker May 27, 2020
af6db74
Final exception fix. This should be the last change needed.. said eve…
jackdwalker May 27, 2020
e1430f5
Tightened up some of the test cases.
jackdwalker May 27, 2020
fa406ed
Tightened up some of the test cases.
jackdwalker May 27, 2020
053c98c
Added the stack trace to exception handling for easier debugging.
jackdwalker May 27, 2020
f7e46c5
Forced session identification to be performed client side. Server-sid…
jackdwalker May 27, 2020
f33dc7a
Forced session identification to be performed client side. Server-sid…
jackdwalker May 27, 2020
4a3deb5
Checking if another auth method helps solve browser details issue.
jackdwalker May 27, 2020
dc838ae
Changed method of retrieving browser details. Hopeful fix.
jackdwalker May 27, 2020
5d82ddb
Added debugging to browser details handler testing.
jackdwalker May 27, 2020
7ae51d2
Additional debugging
jackdwalker May 27, 2020
3c97f03
debugging
jackdwalker May 27, 2020
00f20fd
Potential fix for erroring browser details handler.
jackdwalker May 27, 2020
a8115f1
Debugging
jackdwalker May 27, 2020
7c7c561
Small adjustment to hopefully fix the incorrect data being pulled fro…
jackdwalker May 27, 2020
796b3ad
debugging
jackdwalker May 27, 2020
ef5ecf3
Parsing browser details blob.
jackdwalker May 27, 2020
a5e865f
Removed conditional preventing valid test failures.
jackdwalker May 29, 2020
753bc36
Added BrowserStacks log to .gitignore, and re-enabled Wade's email no…
jackdwalker May 29, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 85 additions & 20 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,93 @@
language: ruby
rvm:
- 2.5.3
- 2.6.0
- 2.6.3
- 2.6.5
- 2.7.0
notifications:
email:
recipients:
- wade@bindshell.net
on_success: always
on_failure: always
# safelist
- 2.5.3
- 2.6.0
- 2.6.3
- 2.6.5
- 2.7.0
branches:
only:
- master
- browserstack
before_script:
- RUBY_VERSION=/bin/bash rvm current
- sed -i -E 's/system\((.*?)\)/""/g' /home/travis/.rvm/gems/$RUBY_VERSION/gems/browserstack-local-1.3.0/lib/browserstack/local.rb
env:
- CONFIG_FILE=osx/catalina/catalina_chrome_41.config.yml
- CONFIG_FILE=osx/catalina/catalina_chrome_59.config.yml
- CONFIG_FILE=osx/catalina/catalina_chrome_81.config.yml
- CONFIG_FILE=osx/catalina/catalina_firefox_11.config.yml
- CONFIG_FILE=osx/catalina/catalina_firefox_68esr.config.yml
- CONFIG_FILE=osx/catalina/catalina_firefox_75.config.yml
- CONFIG_FILE=osx/catalina/catalina_safari_13.config.yml
- CONFIG_FILE=osx/elcapitan/elcapitan_chrome_14.config.yml
- CONFIG_FILE=osx/elcapitan/elcapitan_chrome_81.config.yml
- CONFIG_FILE=osx/elcapitan/elcapitan_firefox_7.config.yml
- CONFIG_FILE=osx/elcapitan/elcapitan_firefox_75.config.yml
- CONFIG_FILE=osx/elcapitan/elcapitan_safari_9-1.config.yml
- CONFIG_FILE=osx/snowleopard/snowleopard_chrome_14.config.yml
- CONFIG_FILE=osx/snowleopard/snowleopard_chrome_35.config.yml
- CONFIG_FILE=osx/snowleopard/snowleopard_chrome_49.config.yml
- CONFIG_FILE=osx/snowleopard/snowleopard_firefox_7.config.yml
- CONFIG_FILE=osx/snowleopard/snowleopard_firefox_38esr.config.yml
- CONFIG_FILE=osx/snowleopard/snowleopard_firefox_42.config.yml
- CONFIG_FILE=osx/snowleopard/snowleopard_safari_5-1.config.yml
- CONFIG_FILE=windows/win10/win10_chrome_37.config.yml
- CONFIG_FILE=windows/win10/win10_chrome_59.config.yml
- CONFIG_FILE=windows/win10/win10_firefox_32.config.yml
- CONFIG_FILE=windows/win10/win10_firefox_68esr.config.yml
- CONFIG_FILE=windows/win10/win10_firefox_75.config.yml
- CONFIG_FILE=windows/win10/win10_edge_81.config.yml
- CONFIG_FILE=windows/win10/win10_ie_11.config.yml
- CONFIG_FILE=windows/win8/win8_chrome_22.config.yml
- CONFIG_FILE=windows/win8/win8_chrome_81.config.yml
- CONFIG_FILE=windows/win8/win8_firefox_32.config.yml
- CONFIG_FILE=windows/win8/win8_firefox_75.config.yml
- CONFIG_FILE=windows/win8/win8_edge_81.config.yml
- CONFIG_FILE=windows/win8/win8_ie_10.config.yml
- CONFIG_FILE=windows/xp/xp_chrome_14.config.yml
- CONFIG_FILE=windows/xp/xp_chrome_28.config.yml
- CONFIG_FILE=windows/xp/xp_chrome_43.config.yml
- CONFIG_FILE=windows/xp/xp_firefox_16.config.yml
- CONFIG_FILE=windows/xp/xp_firefox_26.config.yml
- CONFIG_FILE=windows/xp/xp_firefox_45.config.yml
- CONFIG_FILE=windows/xp/xp_ie_7.config.yml
jobs:
include:
- name: "Full Test Suite 2.5.3"
rvm: 2.5.3
env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
script: bundle exec rspec
- name: "Full Test Suite 2.6.0"
rvm: 2.6.0
env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
script: bundle exec rspec
- name: "Full Test Suite 2.6.3"
rvm: 2.6.3
env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
script: bundle exec rspec
- name: "Full Test Suite 2.6.5"
rvm: 2.6.5
env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
script: bundle exec rspec
- name: "Full Test Suite 2.7.0"
rvm: 2.7.0
env: CONFIG_FILE=windows/win10/win10_chrome_81.config.yml
script: bundle exec rspec
script:
- bundle exec rspec --tag run_on_browserstack
addons:
apt:
packages:
- libsqlite3-dev
- build-essential
- patch
- ruby-dev
- zlib1g-dev
- liblzma-dev
- libcurl4-openssl-dev

- libsqlite3-dev
- build-essential
- patch
- ruby-dev
- zlib1g-dev
- liblzma-dev
- libcurl4-openssl-dev
browserstack:
username:
secure: "Yj+a2jY56dFqJwXdU6JdSXeKhhS01CiToBoB922SXVnA2D2WclGOFiTi0YrkAS9PuOJX5AjC9eUw7VFUcp8DiLmeDGLWo8klYrWQoJOH55FmSWKjdkqDopJFYr0ZXk/ZuXzzpuMvKkCT5MGFnySXyheTW8aUj33GetJ6/sNq5BoA36jH04OE3iPgdBaFPRNDVXEIWLaLUDQsAyZsHNNYC+/cj3cxjXLHu+mbNuXsXEHgrHJ2A94EWdrdGODWL8mRtlSDNkIaYHZKCBnUlHWwCwBitLsjhzdy0YFrIGVbX96FV+C41sjPWLFjZhjAaNDuJ3FoTplbzFNvrw5oxQAAI8ZZqUwF4MRIrQbN8BLFVISX7JooQjfyrNVWvhpZWGPB4GZTN4CThrlQ7G7CJRYDVyqZ7nen6y0+osBr9DRKN+EemlVG73aNP3mXaZr6BmS1BpQJ6tlqDdLCvC5j/PdguKwvt4EmgHA8Pzn20UElV+8BPblcYGjsWplk/cxW1adW0pu2vIxskKxDKJ/ReY3l5yUpiQPZHbuMidq2ffSX0B3yALe7vx+3AvMb2Fk9yWh52EVJXPkVlLvhP7wDd22MHCemvrC2nLhkVR4MglLWs7dZKHswExlKJdWK4OSXprOStjZSA47sjF2nPdztWTpdI77SKaBcoLGR5WOV+JtcQgk="
access_key:
secure: "KHlR8NHPnoF9U1CJKgUhS1YhPSeTILI2lIu+JilQ5Xeo7rcbWg9lT2xwQQNnLYrISG1vC6OzsbkcnC/3ZnAv7jYff4iUTc3Syszs5wIhhvnhBx4qCxM+/UD78TJNQ0AuY7NOIK6OXcmwbpZrOBUojZkooEkc8bpG56nb2v7dOIafFLV+tv9xcc5DtMSfh7FavhqRFRO+PCybqOW8yWMc2NiMYy3p9jKBC3qYRqme4hx1NRrLo5BZQ+UIcO3Rf+vAjUP+3gGuhWeu2kDCvZYDnI2GN1/WacRVY2cqDPGiYlD6pHNMqU0raYKyWdK0QD4KwYpfjxBGRmwBfz8xU8KWUEZ3P11mJn+BvIt0qe3VpomR0/60/fok1BEso3nea8oENXur5G/5SOfpkPLjzd4P4f7JYnST1PeeWwpzV305wktDv9aLc+Ne9cFCaxSaaCnOk82rKDhtnktwnK7krFj1lM6oygtOD+arAytPKaURRgV2izaoophiXuLFb+9XKSkMGtJ3e+rQATonnDPaFTzouKaXSEPxZQQ2bnsp9tETAReDrYIwPHuYL778UbbBICgNk54CZSfTeRFLroRGNPb/0gPXbu6SryPnknfCMNd7ksSndVoyKsDo1plTHQJGVweP2hxR3R/9syk9Z6DU6H5H3dc/RbkkmoRPVooUtR/mZ/c="
6 changes: 5 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ group :test do
gem 'test-unit'
gem 'test-unit-full'
gem 'rspec'
gem 'rdoc'
gem 'rdoc'
# curb gem requires curl libraries
# sudo apt-get install libcurl4-openssl-dev
gem 'curb'
Expand All @@ -82,8 +82,12 @@ group :test do
gem 'irb'
gem 'pry-byebug'
gem "websocket-client-simple", "~> 0.3.0"
gem "browserstack-local", "~> 1.3"
end

source 'https://rubygems.org'





8 changes: 4 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ end

## RSPEC
require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:spec)



RSpec::Core::RakeTask.new(:spec) do |task|
task.rspec_opts = ['--tag ~run_on_browserstack']
end

################################
# SSL/TLS certificate
Expand Down Expand Up @@ -244,4 +244,4 @@ namespace :db do
task :environment do
require_relative "beef"
end
end
end
5 changes: 3 additions & 2 deletions core/main/client/browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ beef.browser = {
* @example: beef.browser.isIE10()
*/
isIE10: function () {
return !!window.XMLHttpRequest && !window.chrome && !window.opera && !!document.documentMode && !window.XDomainRequest && !!window.performance && typeof navigator.msMaxTouchPoints !== "undefined";
return !!window.XMLHttpRequest && !window.chrome && !window.opera && !!document.documentMode && !!window.XDomainRequest && !!window.performance && typeof navigator.msMaxTouchPoints !== "undefined";
},

/**
Expand All @@ -127,7 +127,7 @@ beef.browser = {
* @example: beef.browser.isEdge()
*/
isEdge: function () {
return !beef.browser.isIE() && !!window.StyleMedia;
return !beef.browser.isIE() && !!window.styleMedia && (/Edg\/\d+\.\d/.test(window.navigator.userAgent) || /Edge\/\d+\.\d/.test(window.navigator.userAgent));
},

/**
Expand Down Expand Up @@ -2495,6 +2495,7 @@ beef.browser = {
type: function () {

return {
E: this.isEdge(), // Edge any version
C5: this.isC5(), // Chrome 5
C6: this.isC6(), // Chrome 6
C7: this.isC7(), // Chrome 7
Expand Down
2 changes: 1 addition & 1 deletion core/main/constants/browsers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module Browsers
FRIENDLY_FF_NAME = 'Firefox'
FRIENDLY_M_NAME = 'Mozilla'
FRIENDLY_IE_NAME = 'Internet Explorer'
FRIENDLY_E_NAME = 'Microsoft Edge'
FRIENDLY_E_NAME = 'MSEdge'
FRIENDLY_S_NAME = 'Safari'
FRIENDLY_EP_NAME = 'Epiphany'
FRIENDLY_K_NAME = 'Konqueror'
Expand Down
Loading