diff --git a/core/src/main/java/net/thucydides/core/reports/html/HtmlReporter.java b/core/src/main/java/net/thucydides/core/reports/html/HtmlReporter.java index 89856d56b7..0fc4c353ce 100644 --- a/core/src/main/java/net/thucydides/core/reports/html/HtmlReporter.java +++ b/core/src/main/java/net/thucydides/core/reports/html/HtmlReporter.java @@ -24,7 +24,7 @@ public abstract class HtmlReporter extends ThucydidesReporter { private static final String DEFAULT_RESOURCE_DIRECTORY = "report-resources"; - private static final String DEFAULT_SOURCE_DIR = "target/site/thucydides"; + private static final String DEFAULT_SOURCE_DIR = "target/site/serenity"; private String resourceDirectory = DEFAULT_RESOURCE_DIRECTORY; private final TemplateManager templateManager; private final EnvironmentVariables environmentVariables; diff --git a/core/src/main/java/net/thucydides/core/webdriver/SystemPropertiesConfiguration.java b/core/src/main/java/net/thucydides/core/webdriver/SystemPropertiesConfiguration.java index 02baff29f8..a071f09b83 100644 --- a/core/src/main/java/net/thucydides/core/webdriver/SystemPropertiesConfiguration.java +++ b/core/src/main/java/net/thucydides/core/webdriver/SystemPropertiesConfiguration.java @@ -59,7 +59,7 @@ public class SystemPropertiesConfiguration implements Configuration { /** * By default, reports will go here. */ - private static final String DEFAULT_OUTPUT_DIRECTORY = "target/site/thucydides"; + private static final String DEFAULT_OUTPUT_DIRECTORY = "target/site/serenity"; /** * HTML and XML reports will be generated in this directory. @@ -124,9 +124,9 @@ private String getMavenBuildDirectory() { String mavenReportsDirectory = getEnvironmentVariables().getProperty(MAVEN_REPORTS_DIRECTORY); String defaultMavenRelativeTargetDirectory = null; if (StringUtils.isNotEmpty(mavenReportsDirectory)) { - defaultMavenRelativeTargetDirectory = mavenReportsDirectory + "/thucydides"; + defaultMavenRelativeTargetDirectory = mavenReportsDirectory + "/serenity"; } else if (StringUtils.isNotEmpty(mavenBuildDirectory)) { - defaultMavenRelativeTargetDirectory = mavenBuildDirectory + "/site/thucydides"; + defaultMavenRelativeTargetDirectory = mavenBuildDirectory + "/site/serenity"; } return defaultMavenRelativeTargetDirectory; } @@ -163,7 +163,7 @@ public void setOutputDirectory(final File outputDirectory) { /** * The output directory is where the test runner writes the XML and HTML - * reports to. By default, it will be in 'target/site/thucydides', but you can + * reports to. By default, it will be in 'target/site/serenity', but you can * override this value either programmatically or by providing a value in * the thucydides.output.dir system property. * diff --git a/core/src/test/groovy/net/thucydides/core/reports/integration/WhenGeneratingAggregateHtmlReports.groovy b/core/src/test/groovy/net/thucydides/core/reports/integration/WhenGeneratingAggregateHtmlReports.groovy index 132a22dc03..bb1ef8e99f 100644 --- a/core/src/test/groovy/net/thucydides/core/reports/integration/WhenGeneratingAggregateHtmlReports.groovy +++ b/core/src/test/groovy/net/thucydides/core/reports/integration/WhenGeneratingAggregateHtmlReports.groovy @@ -28,7 +28,7 @@ public class WhenGeneratingAggregateHtmlReports extends Specification { WebDriver driver; def setup() { - outputDirectory = new File(temporaryDirectory,"target/site/thucydides") + outputDirectory = new File(temporaryDirectory,"target/site/serenity") outputDirectory.mkdirs() reporter.outputDirectory = outputDirectory; environmentVariables.setProperty("output.formats","xml") diff --git a/core/src/test/java/net/thucydides/core/webdriver/WhenObtainingTheOutputDirectory.java b/core/src/test/java/net/thucydides/core/webdriver/WhenObtainingTheOutputDirectory.java index 5e4a72fd03..d2afa270b3 100644 --- a/core/src/test/java/net/thucydides/core/webdriver/WhenObtainingTheOutputDirectory.java +++ b/core/src/test/java/net/thucydides/core/webdriver/WhenObtainingTheOutputDirectory.java @@ -26,7 +26,7 @@ public void setupEnvironment() { public void the_default_output_directory_is_in_the_default_maven_site_directory() { File outputDirectory = configuration.getOutputDirectory(); - assertThat(outputDirectory.getPath(), is(changeSeparatorIfRequired("target/site/thucydides"))); + assertThat(outputDirectory.getPath(), is(changeSeparatorIfRequired("target/site/serenity"))); } @Test @@ -34,7 +34,7 @@ public void the_default_output_directory_can_be_overriden_if_the_maven_output_di environmentVariables.setProperty("project.build.directory","build"); File outputDirectory = configuration.getOutputDirectory(); - assertThat(outputDirectory.getPath(), is(changeSeparatorIfRequired("build/site/thucydides"))); + assertThat(outputDirectory.getPath(), is(changeSeparatorIfRequired("build/site/serenity"))); } @Test diff --git a/release-notes.md b/release-notes.md index 617c0d799f..b70d0cb6af 100644 --- a/release-notes.md +++ b/release-notes.md @@ -33,6 +33,7 @@ Deprecate Thucydides versions, but still handle them correctly ## Chores - Automated the generation of the release notes from the git commits ## Miscellaneous + - Added support for better Cucumber reporting - Updated release notes - Restored release notes - Make sure the release notes are produced dynamically diff --git a/serenity-ant-task/src/main/java/net/serenitybdd/ant/SerenityReportingTask.java b/serenity-ant-task/src/main/java/net/serenitybdd/ant/SerenityReportingTask.java index dc30e6eca5..fa25e4a124 100644 --- a/serenity-ant-task/src/main/java/net/serenitybdd/ant/SerenityReportingTask.java +++ b/serenity-ant-task/src/main/java/net/serenitybdd/ant/SerenityReportingTask.java @@ -41,7 +41,7 @@ public class SerenityReportingTask extends Task { */ public String jiraProject; - private final String DEFAULT_SOURCE = "target/site/thucydides"; + private final String DEFAULT_SOURCE = "target/site/serenity"; private PathProcessor pathProcessor = new PathProcessor(); diff --git a/serenity-gradle-plugin/src/main/groovy/net/serenitybdd/plugins/gradle/SerenityPluginExtension.groovy b/serenity-gradle-plugin/src/main/groovy/net/serenitybdd/plugins/gradle/SerenityPluginExtension.groovy index 396095ec46..bbeffaab1c 100644 --- a/serenity-gradle-plugin/src/main/groovy/net/serenitybdd/plugins/gradle/SerenityPluginExtension.groovy +++ b/serenity-gradle-plugin/src/main/groovy/net/serenitybdd/plugins/gradle/SerenityPluginExtension.groovy @@ -1,7 +1,7 @@ package net.serenitybdd.plugins.gradle class SerenityPluginExtension { - def String outputDirectory = 'target/site/thucydides' + def String outputDirectory = 'target/site/serenity' def String projectKey def String issueTrackerUrl def String jiraUrl diff --git a/serenity-gradle-plugin/src/test/groovy/net/serenitybdd/plugins/gradle/WhenUsingTheGradlePlugin.groovy b/serenity-gradle-plugin/src/test/groovy/net/serenitybdd/plugins/gradle/WhenUsingTheGradlePlugin.groovy index ce020f3b4a..df7de4f096 100644 --- a/serenity-gradle-plugin/src/test/groovy/net/serenitybdd/plugins/gradle/WhenUsingTheGradlePlugin.groovy +++ b/serenity-gradle-plugin/src/test/groovy/net/serenitybdd/plugins/gradle/WhenUsingTheGradlePlugin.groovy @@ -27,7 +27,7 @@ class WhenUsingTheGradlePlugin extends Specification { project.apply plugin: 'java' project.apply plugin: 'net.serenity-bdd.aggregator' then: - project.serenity.outputDirectory == 'target/site/thucydides' + project.serenity.outputDirectory == 'target/site/serenity' } def "should add the checkOutcomes task to a project"() { diff --git a/serenity-spock/src/test/groovy/net/thucydides/spock/acceptance/WhenGeneratingThucydidesReports.groovy b/serenity-spock/src/test/groovy/net/thucydides/spock/acceptance/WhenGeneratingThucydidesReports.groovy index b744a3c5c3..c24e797b45 100644 --- a/serenity-spock/src/test/groovy/net/thucydides/spock/acceptance/WhenGeneratingThucydidesReports.groovy +++ b/serenity-spock/src/test/groovy/net/thucydides/spock/acceptance/WhenGeneratingThucydidesReports.groovy @@ -29,7 +29,7 @@ class WhenGeneratingThucydidesReports extends Specification { } def thucydidesReportsShouldHaveBeenGenerated() { - def outputDirectory = new File("target/site/thucydides") + def outputDirectory = new File("target/site/serenity") def reportFile = new File(outputDirectory, latestTestOutcomes[0].htmlReport) assert reportFile.exists() }