Skip to content

Commit

Permalink
Merge branch 'develop' into #77-support-for-testingbot
Browse files Browse the repository at this point in the history
  • Loading branch information
Marcel Pfotenhauer committed Apr 17, 2019
2 parents c72f7e4 + 7f6f816 commit 8398f88
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<maven.compiler.target.version>1.8</maven.compiler.target.version>
<surefire.version>2.22.1</surefire.version>
<allure.version>2.10.0</allure.version>
<cucumber.version>4.2.3</cucumber.version>
<cucumber.version>4.3.0</cucumber.version>
<log4j.version>2.11.1</log4j.version>
</properties>

Expand Down Expand Up @@ -196,7 +196,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.23</version>
<version>1.24</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -240,13 +240,13 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>27.0.1-jre</version>
<version>27.1-jre</version>
</dependency>

<dependency>
<groupId>com.codeborne</groupId>
<artifactId>selenide</artifactId>
<version>5.1.0</version>
<version>5.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand All @@ -261,12 +261,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
<version>3.9</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.7.25</version>
<version>1.7.26</version>
</dependency>

<!-- Test only dependencies -->
Expand Down
11 changes: 10 additions & 1 deletion src/main/java/com/xceptance/neodymium/util/WebDriverUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,16 @@ public static void setUpWithBrowserTag(Scenario scenario)
**/
public static void tearDown(Scenario scenario)
{
browserStatement.get().teardown(scenario.isFailed());
tearDown(scenario.isFailed());
}

/**
* @param isFailed
* boolean to pass if the test failed in order to use Neodymium's keepBrowserOpenOnFailure feature
**/
public static void tearDown(boolean isFailed)
{
browserStatement.get().teardown(isFailed);
}

static String getFirstMatchingBrowserTag(Scenario scenario)
Expand Down

0 comments on commit 8398f88

Please sign in to comment.