Skip to content

Commit

Permalink
Updated versions
Browse files Browse the repository at this point in the history
  • Loading branch information
wakaleo committed Mar 31, 2014
1 parent 6927746 commit 9771970
Show file tree
Hide file tree
Showing 11 changed files with 36 additions and 13 deletions.
4 changes: 2 additions & 2 deletions maven-thucydides-plugin/pom.xml
Expand Up @@ -4,12 +4,12 @@
<parent>
<artifactId>thucydides</artifactId>
<groupId>net.thucydides</groupId>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
</parent>
<groupId>net.thucydides.maven.plugins</groupId>
<artifactId>maven-thucydides-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
<name>Thucydides Maven Plugin</name>
<dependencies>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Expand Up @@ -8,7 +8,7 @@
</parent>
<groupId>net.thucydides</groupId>
<artifactId>thucydides</artifactId>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
<packaging>pom</packaging>
<name>thucydides</name>
<description>An Acceptance Testing framework for web applications
Expand Down Expand Up @@ -51,7 +51,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.version>2.15</surefire.version>
<junit.version>4.11</junit.version>
<selenium.version>2.40.0</selenium.version>
<selenium.version>2.41.0</selenium.version>
<hamcrest.version>1.3</hamcrest.version>
<easyb.version>1.5</easyb.version>
<groovy.version>2.0.5</groovy.version>
Expand Down
2 changes: 1 addition & 1 deletion thucydides-browsermob-plugin/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>thucydides</artifactId>
<groupId>net.thucydides</groupId>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
</parent>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-browsermob-plugin</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions thucydides-core/pom.xml
Expand Up @@ -4,11 +4,11 @@
<parent>
<artifactId>thucydides</artifactId>
<groupId>net.thucydides</groupId>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
</parent>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-core</artifactId>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
<name>thucydides-core</name>
<properties>
<root.package>net.thucydides.core</root.package>
Expand Down
Expand Up @@ -163,4 +163,16 @@ class WhenFormattingDataForTheHTMLReports extends Specification {
embeddedTable == "<table class='embedded'><thead><th>owner</th><th>points</th></thead><tbody><tr><td>Jane</td><td>80000</td></tr><tr><td>Joe</td><td>50000</td></tr></tbody></table>"
}

def "should identify a table within a step using new lines"() {
given:
def singleCellTable = "A table like this:\n| owner | points |\n| Jane | 80000 |\n| Joe | 50000 |]"

def formatter = new Formatter(issueTracking);
when:
def embeddedTable = formatter.convertAnyTables(singleCellTable)
then:
embeddedTable == "A table like this:\n<table class='embedded'><thead><th>owner</th><th>points</th></thead><tbody><tr><td>Jane</td><td>80000</td></tr><tr><td>Joe</td><td>50000</td></tr></tbody></table>"

}

}
Expand Up @@ -237,6 +237,17 @@ public void should_convert_embedded_text_tables_into_html_tables() {
assertThat(formattedValue, is("A table:\n<table class='embedded'><thead><th>name</th><th>age</th></thead><tbody><tr><td>Bill</td><td>20</td></tr></tbody></table>"));
}

@Test
public void should_convert_embedded_text_tables__with_square_brackets_into_html_tables() {
when(issueTracking.getShortenedIssueTrackerUrl()).thenReturn(null);
Formatter formatter = new Formatter(issueTracking);

String formattedValue = formatter.convertAnyTables("A table:\n[| name | age |\n|Bill|20|]");

assertThat(formattedValue, is("A table:\n<table class='embedded'><thead><th>name</th><th>age</th></thead><tbody><tr><td>Bill</td><td>20</td></tr></tbody></table>"));
}


@Test
public void should_ignore_isolated_pipes() {
when(issueTracking.getShortenedIssueTrackerUrl()).thenReturn(null);
Expand Down
2 changes: 1 addition & 1 deletion thucydides-junit/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>thucydides</artifactId>
<groupId>net.thucydides</groupId>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
</parent>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-junit</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion thucydides-maven-integration-tests/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>thucydides</artifactId>
<groupId>net.thucydides</groupId>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
</parent>
<groupId>net.thucydides.maven.plugins</groupId>
<artifactId>thucydides-maven-integration-tests</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion thucydides-report-resources/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>thucydides</artifactId>
<groupId>net.thucydides</groupId>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
</parent>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-report-resources</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion thucydides-sample-alternative-resources/pom.xml
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>thucydides</artifactId>
<groupId>net.thucydides</groupId>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
</parent>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-sample-alternative-resources</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions thucydides-test-utils/pom.xml
Expand Up @@ -4,11 +4,11 @@
<parent>
<artifactId>thucydides</artifactId>
<groupId>net.thucydides</groupId>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
</parent>
<groupId>net.thucydides</groupId>
<artifactId>thucydides-test-utils</artifactId>
<version>0.9.237-SNAPSHOT</version>
<version>0.9.238-SNAPSHOT</version>
<name>thucydides-test-utils</name>
<url>http://maven.apache.org</url>
<dependencies>
Expand Down

0 comments on commit 9771970

Please sign in to comment.