Skip to content

Commit c6f3d4a

Browse files
mialeskamialeska
authored
ExcludedArguments functionality for Chromium-based drivers (#144) +semver: feature
* Implement excludedArguments functionality for Chromium-based drivers +semver: feature closes #143 Also remove "--remote-allow-origins=*" workaround Add --disable-search-engine-choice-screen to settings.json * Fix loc message for "excludedArguments"
1 parent e59afe5 commit c6f3d4a

File tree

10 files changed

+48
-14
lines changed

10 files changed

+48
-14
lines changed

‎src/main/java/aquality/selenium/configuration/driversettings/ChromeSettings.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public AbstractDriverOptions<?> getDriverOptions() {
2020
setChromePrefs(chromeOptions);
2121
setCapabilities(chromeOptions);
2222
setChromeArgs(chromeOptions);
23+
setExcludedArguments(chromeOptions);
2324
chromeOptions.setPageLoadStrategy(getPageLoadStrategy());
2425
setLoggingPreferences(chromeOptions, ChromeOptions.LOGGING_PREFS);
2526
return chromeOptions;
@@ -42,11 +43,6 @@ private void setChromeArgs(ChromeOptions options) {
4243
for (String arg : getBrowserStartArguments()) {
4344
options.addArguments(arg);
4445
}
45-
// workaround for Selenium issue https://github.com/SeleniumHQ/selenium/issues/11750
46-
final String allowOriginsArgument = "--remote-allow-origins=*";
47-
if (!getBrowserStartArguments().contains(allowOriginsArgument)) {
48-
options.addArguments(allowOriginsArgument);
49-
}
5046
}
5147

5248
@Override

‎src/main/java/aquality/selenium/configuration/driversettings/DriverSettings.java‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.apache.commons.lang3.StringUtils;
88
import org.openqa.selenium.MutableCapabilities;
99
import org.openqa.selenium.PageLoadStrategy;
10+
import org.openqa.selenium.chromium.ChromiumOptions;
1011
import org.openqa.selenium.logging.LoggingPreferences;
1112

1213
import java.io.File;
@@ -25,6 +26,7 @@ abstract class DriverSettings implements IDriverSettings {
2526
private Map<String, Object> capabilities;
2627
private Map<String, Level> loggingPreferences;
2728
private List<String> startArguments;
29+
private List<String> excludedArguments;
2830

2931
protected DriverSettings(ISettingsFile settingsFile) {
3032
this.settingsFile = settingsFile;
@@ -81,6 +83,23 @@ protected List<String> getBrowserStartArguments() {
8183
return startArguments;
8284
}
8385

86+
protected List<String> getExcludedArguments() {
87+
if (excludedArguments == null) {
88+
String path = getDriverSettingsPath(CapabilityType.EXCLUDED_ARGS);
89+
boolean isValuePresent;
90+
try {
91+
getSettingsFile().getValue(path);
92+
isValuePresent = true;
93+
}
94+
catch (IllegalArgumentException e) {
95+
isValuePresent = false;
96+
}
97+
excludedArguments = isValuePresent ? getSettingsFile().getList(path) : Collections.emptyList();
98+
logCollection("loc.browser.excludedArguments", excludedArguments);
99+
}
100+
return excludedArguments;
101+
}
102+
84103
protected String getBinaryLocation(String defaultBinaryLocation) {
85104
String value = (String) getSettingsFile().getValueOrDefault(getDriverSettingsPath("binaryLocation"), defaultBinaryLocation);
86105
int varStartIndex = value.indexOf('%');
@@ -91,7 +110,7 @@ protected String getBinaryLocation(String defaultBinaryLocation) {
91110
}
92111

93112
@SafeVarargs
94-
private final <T> void logCollection(String messageKey, final T... elements) {
113+
private <T> void logCollection(String messageKey, final T... elements) {
95114
if (elements.length == 1 &&
96115
((elements[0] instanceof Map && !((Map)elements[0]).isEmpty())
97116
|| (elements[0] instanceof List && !((List)elements[0]).isEmpty()))) {
@@ -119,6 +138,10 @@ void setCapabilities(MutableCapabilities options) {
119138
getBrowserCapabilities().forEach(options::setCapability);
120139
}
121140

141+
<T extends ChromiumOptions<T>> void setExcludedArguments(T chromiumOptions) {
142+
chromiumOptions.setExperimentalOption("excludeSwitches", getExcludedArguments());
143+
}
144+
122145
void setLoggingPreferences(MutableCapabilities options, String capabilityKey) {
123146
if (!getLoggingPreferences().isEmpty()) {
124147
LoggingPreferences logs = new LoggingPreferences();
@@ -143,6 +166,7 @@ private enum CapabilityType {
143166
CAPABILITIES("capabilities"),
144167
OPTIONS("options"),
145168
START_ARGS("startArguments"),
169+
EXCLUDED_ARGS("excludedArguments"),
146170
LOGGING_PREFERENCES("loggingPreferences");
147171

148172
private final String key;

‎src/main/java/aquality/selenium/configuration/driversettings/EdgeSettings.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public AbstractDriverOptions<?> getDriverOptions() {
2020
setCapabilities(edgeOptions);
2121
setPrefs(edgeOptions);
2222
getBrowserStartArguments().forEach(edgeOptions::addArguments);
23+
setExcludedArguments(edgeOptions);
2324
edgeOptions.setPageLoadStrategy(getPageLoadStrategy());
2425
setLoggingPreferences(edgeOptions, EdgeOptions.LOGGING_PREFS);
2526
return edgeOptions;

‎src/main/resources/localization/be.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"loc.browser.arguments": "Атрымалі стартавыя аргументы браўзэра з settings файла: %s",
3+
"loc.browser.excludedArguments": "Атрымалі выключаныя аргументы браўзэра з settings файла: %s",
34
"loc.browser.back": "Вяртаемся да папярэдняй старонкі",
45
"loc.browser.forward": "Пераходзім да наступнай старонкі",
56
"loc.browser.capabilities": "Атрымалі capabilities браўзэра з settings файла: %s",

‎src/main/resources/localization/en.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"loc.browser.arguments": "Got browser start arguments from settings file: %s",
3+
"loc.browser.excludedArguments": "Got excluded browser arguments from settings file: %s",
34
"loc.browser.back": "Return to previous page",
45
"loc.browser.forward": "Proceed to the next page",
56
"loc.browser.capabilities": "Got browser capabilities from settings file: %s",

‎src/main/resources/localization/pl.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"loc.browser.arguments": "Pobrano argumenty uruchamiania przeglądarki z pliku ustawień: %s",
3+
"loc.browser.excludedArguments": "Pobrano wykluczone argumenty przeglądarki z pliku ustawień: %s",
34
"loc.browser.back": "Powrót do poprzedniej strony",
45
"loc.browser.forward": "Przejście do następnej strony",
56
"loc.browser.capabilities": "Pobrano możliwości przeglądarki z pliku ustawień: %s",

‎src/main/resources/localization/ru.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"loc.browser.arguments": "Получили стартовые аргументы браузера из settings файла: %s",
3+
"loc.browser.excludedArguments": "Получили исключённые аргументы браузера из settings файла: %s",
34
"loc.browser.back": "Возврат на предыдущую страницу",
45
"loc.browser.forward": "Перейти на следующую страницу",
56
"loc.browser.capabilities": "Получили capabilities браузера из settings файла: %s",

‎src/main/resources/localization/uk.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"loc.browser.arguments": "Отримані аргументи запуску браузера з файлу налаштувань: %s",
3+
"loc.browser.excludedArguments": "Отримані виключені аргументи браузера з файлу налаштувань: %s",
34
"loc.browser.back": "Повертання до попередньої сторінки",
45
"loc.browser.forward": "Перехід до наступної сторінки",
56
"loc.browser.capabilities": "Отримані можливості браузера з файлу налаштувань: %s",

‎src/main/resources/settings.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
"Performance": "All"
2121
},
2222
"pageLoadStrategy": "Normal",
23-
"startArguments": []
23+
"startArguments": ["--disable-search-engine-choice-screen"],
24+
"excludedArguments": []
2425
},
2526
"edge": {
2627
"capabilities": {
@@ -36,7 +37,8 @@
3637
"loggingPreferences": {
3738
"Performance": "All"
3839
},
39-
"startArguments": []
40+
"startArguments": [],
41+
"excludedArguments": []
4042
},
4143
"firefox": {
4244
"capabilities": {
@@ -79,7 +81,8 @@
7981
"download.prompt_for_download": "false",
8082
"download.default_directory": "./downloads"
8183
},
82-
"startArguments": [ "--remote-debugging-port=9222", "--no-sandbox", "--disable-dev-shm-usage" ]
84+
"startArguments": [ "--remote-debugging-port=9222", "--no-sandbox", "--disable-dev-shm-usage" ],
85+
"excludedArguments": []
8386
},
8487
"yandex": {
8588
"binaryLocation": "%USERPROFILE%\\AppData\\Local\\Yandex\\YandexBrowser\\Application\\browser.exe",
@@ -93,7 +96,8 @@
9396
"download.prompt_for_download": "false",
9497
"download.default_directory": "./downloads"
9598
},
96-
"startArguments": []
99+
"startArguments": [],
100+
"excludedArguments": []
97101
}
98102
},
99103
"timeouts": {

‎src/test/resources/settings.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
"loggingPreferences": {
2020
"Performance": "All"
2121
},
22-
"startArguments": []
22+
"startArguments": ["--disable-search-engine-choice-screen"],
23+
"excludedArguments": ["enable-automation"]
2324
},
2425
"edge": {
2526
"capabilities": {
@@ -35,7 +36,8 @@
3536
"loggingPreferences": {
3637
"Performance": "All"
3738
},
38-
"startArguments": []
39+
"startArguments": [],
40+
"excludedArguments": ["enable-automation"]
3941
},
4042
"firefox": {
4143
"capabilities": {
@@ -78,7 +80,8 @@
7880
"download.prompt_for_download": "false",
7981
"download.default_directory": "./downloads"
8082
},
81-
"startArguments": [ "--remote-debugging-port=9222", "--no-sandbox", "--disable-dev-shm-usage" ]
83+
"startArguments": [ "--remote-debugging-port=9222", "--no-sandbox", "--disable-dev-shm-usage" ],
84+
"excludedArguments": ["enable-automation"]
8285
},
8386
"yandex": {
8487
"binaryLocation": "%USERPROFILE%\\AppData\\Local\\Yandex\\YandexBrowser\\Application\\browser.exe",
@@ -92,7 +95,8 @@
9295
"download.prompt_for_download": "false",
9396
"download.default_directory": "./downloads"
9497
},
95-
"startArguments": []
98+
"startArguments": [],
99+
"excludedArguments": ["enable-automation"]
96100
}
97101
},
98102
"timeouts": {

0 commit comments

Comments
 (0)