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.

Sign up for GitHub

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

Jump to bottom

Browserstack credentials #192

Merged
merged 16 commits into from
Sep 17, 2018
Merged

Browserstack credentials #192

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
278c331
pre commit config
BeyondEvil Aug 24, 2018
b960f49
fixes by BLACK and badge in readme
BeyondEvil Aug 24, 2018
14eec91
Updates based on comments
BeyondEvil Aug 24, 2018
44e0e2f
Fix deprecation and add doc and test
BeyondEvil Aug 26, 2018
a3295b5
Fix tests that fail locally
BeyondEvil Sep 2, 2018
8e1f00f
requested changes
BeyondEvil Sep 3, 2018
26636c5
run tests in parallel
BeyondEvil Sep 5, 2018
44be6c2
Merge branch 'master' into run_parallel
BeyondEvil Sep 6, 2018
24af5f3
Browserstack credentials in capabilities
BeyondEvil Sep 7, 2018
1bef6fd
mark failing test as xfail
BeyondEvil Sep 14, 2018
2b3a58e
Merge branch 'run_parallel' into browserstack_credentials
BeyondEvil Sep 14, 2018
cd93ed2
Merge branch 'master' into run_parallel
BeyondEvil Sep 16, 2018
e7021ab
Merge branch 'run_parallel' into browserstack_credentials
BeyondEvil Sep 16, 2018
d179ba0
remove string format from url
BeyondEvil Sep 16, 2018
6351c46
Merge branch 'master' into browserstack_credentials
BeyondEvil Sep 16, 2018
f9bb3e1
Merge branch 'master' into browserstack_credentials
BeyondEvil Sep 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions pytest_selenium/drivers/browserstack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ def auth(self):

@property
def executor(self):
return "http://{0}:{1}@hub.browserstack.com:80/wd/hub".format(
self.username, self.key
)
return "https://hub.browserstack.com/wd/hub"

@property
def username(self):
Expand Down Expand Up @@ -80,6 +78,8 @@ def pytest_selenium_runtest_makereport(item, report, summary, extra):
def driver_kwargs(request, test, capabilities, **kwargs):
provider = BrowserStack()
capabilities.setdefault("name", test)
capabilities.setdefault("browserstack.user", provider.username)
capabilities.setdefault("browserstack.key", provider.key)
kwargs = {
"command_executor": provider.executor,
"desired_capabilities": capabilities,
Expand Down