Skip to content

Commit a35a06c

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 b5559a2 commit a35a06c

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

src/pytest_selenium/drivers/browserstack.py

+18-2
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,31 @@ 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 ["BROWSERSTACK_USERNAME", "YOUR_USERNAME", "BROWSERSTACK_USR"]:
29+
return self.get_credential(
30+
"", ["BROWSERSTACK_USERNAME", "BROWSERSTACK_USR"]
31+
)
32+
else:
33+
return user
2834

2935
@property
3036
def key(self):
31-
return self.get_credential(
37+
access_key = self.get_credential(
3238
"key", ["BROWSERSTACK_ACCESS_KEY", "BROWSERSTACK_PSW"]
3339
)
40+
if access_key in [
41+
"BROWSERSTACK_ACCESS_KEY",
42+
"YOUR_ACCESS_KEY",
43+
"BROWSERSTACK_PSW",
44+
]:
45+
return self.get_credential(
46+
"", ["BROWSERSTACK_ACCESS_KEY", "BROWSERSTACK_PSW"]
47+
)
48+
else:
49+
return access_key
3450

3551
@property
3652
def job_access(self):

0 commit comments

Comments
 (0)