Skip to content

Commit

Permalink
Updated core to 1.1.31
Browse files Browse the repository at this point in the history
  • Loading branch information
wakaleo committed Apr 20, 2016
2 parents f9dd8c2 + 7543521 commit 32fb284
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
## Serenity BDD JBehave change Log

### upcoming (2016/03/25 12:02 +00:00)
### v1.9.0 (2016/03/29 20:33 +00:00)

**Pull requests:**

- [#66](https://github.com/serenity-bdd/serenity-jbehave/pull/66) Implemented filtering using jbehave metafilters. Scenarios and Stories should be processed after filtering skip and ignore stories ([@YamStranger](https://github.com/YamStranger))
- [#67](https://github.com/serenity-bdd/serenity-jbehave/pull/67) Resolved version conflicts for xml-apis and commons-codec to use latest serenity core ([@YamStranger](https://github.com/YamStranger))
- [#64](https://github.com/serenity-bdd/serenity-jbehave/pull/64) Updated resetting If browser died it should be restarted even if not shouldRestartDriverBeforeEachScenario ([@YamStranger](https://github.com/YamStranger))

**Commits:**

- [14f6fc3](https://github.com/serenity-bdd/serenity-jbehave/commit/14f6fc3f1d961edef70145b8050883a9e926d486) feat: implemented filtering by ignore, skip, wip annotations. Updated tests to check Skipped and Ignored scenarios. ([@YamStranger](https://github.com/YamStranger))

> Now it is possible mark story, scenario, scenarios with examples with skip or ignore or wip annotation and
> they will included in report, but not executed.
- [37a9620](https://github.com/serenity-bdd/serenity-jbehave/commit/37a9620458abd95d71d0daaedb7066ec35025390) fix: implemented filtering using jbehave metafilters. Scenarios and Stories should be processed after filtering skip and ignore stories ([@YamStranger](https://github.com/YamStranger))
- [55e4bed](https://github.com/serenity-bdd/serenity-jbehave/commit/55e4bed44901adc43a24d59ede1e06111901366b) fix: updated jbehave to use priorities for assign scenario status based on story status (ignored, skipped) ([@YamStranger](https://github.com/YamStranger))
- [b7e656d](https://github.com/serenity-bdd/serenity-jbehave/commit/b7e656de0196e56936f8c09f7995b277ed539ef6) fix: added ignored and skipped scenarios with examples in report ([@YamStranger](https://github.com/YamStranger))
- [d0c6745](https://github.com/serenity-bdd/serenity-jbehave/commit/d0c6745d3183f9da47354cf3407ea74ef57df724) fix: if browser died it should be resetted ([@YamStranger](https://github.com/YamStranger))
- [f00d190](https://github.com/serenity-bdd/serenity-jbehave/commit/f00d190d7183332814bc2746c882cbaa4a83c10d) fix: resolved version conflicts for xml-apis and commons-codec to use latest serenty core ([@YamStranger](https://github.com/YamStranger))

### v1.8.0 (2016/03/11 07:18 +00:00)

Expand Down
11 changes: 7 additions & 4 deletions src/main/java/net/serenitybdd/jbehave/SerenityReporter.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import net.thucydides.core.util.NameConverter;
import net.thucydides.core.webdriver.Configuration;
import net.thucydides.core.webdriver.ThucydidesWebDriverSupport;
import net.thucydides.core.webdriver.WebDriverFacade;
import net.thucydides.core.webdriver.WebdriverProxyFactory;
import org.codehaus.plexus.util.StringUtils;
import org.jbehave.core.configuration.Keywords;
Expand Down Expand Up @@ -211,10 +212,12 @@ public void beforeScenario(String scenarioTitle) {
}

private boolean managedDriverIsNotAlive() {
try {
ThucydidesWebDriverSupport.getDriver().getTitle();
} catch (Exception e) {
return true;
if(((WebDriverFacade)ThucydidesWebDriverSupport.getDriver()).isInstantiated()) {
try {
ThucydidesWebDriverSupport.getDriver().getTitle();
} catch (Exception e) {
return true;
}
}
return false;
}
Expand Down

0 comments on commit 32fb284

Please sign in to comment.