Skip to content

Commit aadc158

Browse files
committed
[java] do not start test driver when @NoDriverBeforeTest set
1 parent 735ba4f commit aadc158

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

java/test/org/openqa/selenium/testing/SeleniumTestRule.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public class SeleniumTestRule implements TestRule {
4444
private final Duration regularWait;
4545
private final Duration shortWait;
4646
private final RuleChain chain;
47+
private boolean nullDriver = false;
4748

4849
public SeleniumTestRule() {
4950
this(Duration.ofSeconds(10), Duration.ofSeconds(5));
@@ -77,6 +78,10 @@ public <X> X shortWaitUntil(Function<? super WebDriver, X> condition) {
7778

7879

7980
public WebDriver getDriver() {
81+
if (nullDriver) {
82+
return null;
83+
}
84+
8085
LOG.info("CREATING DRIVER");
8186
WebDriver driver = actuallyCreateDriver();
8287
LOG.info("CREATED " + driver);
@@ -100,6 +105,7 @@ private WebDriver actuallyCreateDriver(Capabilities capabilities) {
100105
(current.driver instanceof RemoteWebDriver && ((RemoteWebDriver) current.driver).getSessionId() == null)) {
101106
StaticResources.ensureAvailable();
102107
WebDriver driver = new WebDriverBuilder().get(capabilities);
108+
nullDriver = false;
103109
instances.set(new Instances(driver, regularWait, shortWait));
104110
}
105111
return instances.get().driver;
@@ -148,6 +154,7 @@ protected void starting(Description description) {
148154
if (killSharedDriver != null && current.matches(killSharedDriver.value())) {
149155
LOG.info("Destroying driver before test " + description);
150156
removeDriver();
157+
nullDriver = true;
151158
return;
152159
}
153160
NeedsFreshDriver annotation = description.getAnnotation(NeedsFreshDriver.class);

0 commit comments

Comments
 (0)