Browserstack plugin now allows either BROWSERSTACK_USER or BROWSERSTA…

…CK_USERNAME, and BROWSERSTACK_KEY or BROWSERSTACK_ACCESS_KEY environment variables
serenity-bdd · Dec 4, 2023 · 62b5db1 · 62b5db1
1 parent 3b6549a
commit 62b5db1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/...wserstack/src/main/java/net/serenitybdd/plugins/browserstack/BrowserStackCredentials.java b/...wserstack/src/main/java/net/serenitybdd/plugins/browserstack/BrowserStackCredentials.java
@@ -23,12 +23,16 @@ public static BrowserStackCredentials from(EnvironmentVariables environmentVaria
 
     public String getUser() {
         String userDefinedInSerenityConf = EnvironmentSpecificConfiguration.from(environmentVariables).getOptionalProperty("browserstack.user").orElse("");
-        return Optional.ofNullable(environmentVariables.getValue("BROWSERSTACK_USER")).orElse(userDefinedInSerenityConf);
+        Optional<String> browserstackUser = Optional.ofNullable(environmentVariables.getValue("BROWSERSTACK_USER"));
+        Optional<String> browserstackUsername = Optional.ofNullable(environmentVariables.getValue("BROWSERSTACK_USERNAME"));
+        return browserstackUser.orElse(browserstackUsername.orElse(userDefinedInSerenityConf));
     }
 
     public String getAccessKey() {
         String keyDefinedInSerenityConf = EnvironmentSpecificConfiguration.from(environmentVariables).getOptionalProperty("browserstack.key").orElse("");
-        return Optional.ofNullable(environmentVariables.getValue("BROWSERSTACK_KEY")).orElse(keyDefinedInSerenityConf);
+        Optional<String> browserstackKey = Optional.ofNullable(environmentVariables.getValue("BROWSERSTACK_KEY"));
+        Optional<String> browserstackAccessKey = Optional.ofNullable(environmentVariables.getValue("BROWSERSTACK_ACCESS_KEY"));
+        return browserstackKey.orElse(browserstackAccessKey.orElse(keyDefinedInSerenityConf));
     }
 
     public boolean areDefined() {