Skip to content

Commit 583a4d3

Browse files
committed
fix: add fallback check for username and key
ignore username/key from config file if those are default values and pick from env variables if available
1 parent 9f31717 commit 583a4d3

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

src/pytest_selenium/drivers/browserstack.py

+22-2
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,35 @@ def executor(self):
2222

2323
@property
2424
def username(self):
25-
return self.get_credential(
25+
user = self.get_credential(
2626
"username", ["BROWSERSTACK_USERNAME", "BROWSERSTACK_USR"]
2727
)
28+
if user in [
29+
"BROWSERSTACK_USERNAME",
30+
"YOUR_USERNAME",
31+
"BROWSERSTACK_USR",
32+
]:
33+
return self.get_credential(
34+
"", ["BROWSERSTACK_USERNAME", "BROWSERSTACK_USR"]
35+
)
36+
else:
37+
return user
2838

2939
@property
3040
def key(self):
31-
return self.get_credential(
41+
access_key = self.get_credential(
3242
"key", ["BROWSERSTACK_ACCESS_KEY", "BROWSERSTACK_PSW"]
3343
)
44+
if access_key in [
45+
"BROWSERSTACK_ACCESS_KEY",
46+
"YOUR_ACCESS_KEY",
47+
"BROWSERSTACK_PSW",
48+
]:
49+
return self.get_credential(
50+
"", ["BROWSERSTACK_ACCESS_KEY", "BROWSERSTACK_PSW"]
51+
)
52+
else:
53+
return access_key
3454

3555
@property
3656
def job_access(self):

0 commit comments

Comments
 (0)