From 97719707c8797fab066eea96ec454d52d880bf06 Mon Sep 17 00:00:00 2001 From: --global Date: Mon, 31 Mar 2014 11:36:14 +1100 Subject: [PATCH] Updated versions --- maven-thucydides-plugin/pom.xml | 4 ++-- pom.xml | 4 ++-- thucydides-browsermob-plugin/pom.xml | 2 +- thucydides-core/pom.xml | 4 ++-- .../html/WhenFormattingDataForTheHTMLReports.groovy | 12 ++++++++++++ .../core/reports/html/WhenFormattingForHTML.java | 11 +++++++++++ thucydides-junit/pom.xml | 2 +- thucydides-maven-integration-tests/pom.xml | 2 +- thucydides-report-resources/pom.xml | 2 +- thucydides-sample-alternative-resources/pom.xml | 2 +- thucydides-test-utils/pom.xml | 4 ++-- 11 files changed, 36 insertions(+), 13 deletions(-) diff --git a/maven-thucydides-plugin/pom.xml b/maven-thucydides-plugin/pom.xml index 75afada53..476a94c5d 100644 --- a/maven-thucydides-plugin/pom.xml +++ b/maven-thucydides-plugin/pom.xml @@ -4,12 +4,12 @@ thucydides net.thucydides - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT net.thucydides.maven.plugins maven-thucydides-plugin maven-plugin - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT Thucydides Maven Plugin diff --git a/pom.xml b/pom.xml index acd85d16f..2f2520810 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ net.thucydides thucydides - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT pom thucydides An Acceptance Testing framework for web applications @@ -51,7 +51,7 @@ UTF-8 2.15 4.11 - 2.40.0 + 2.41.0 1.3 1.5 2.0.5 diff --git a/thucydides-browsermob-plugin/pom.xml b/thucydides-browsermob-plugin/pom.xml index 0bf4eb4d4..85889aa25 100644 --- a/thucydides-browsermob-plugin/pom.xml +++ b/thucydides-browsermob-plugin/pom.xml @@ -4,7 +4,7 @@ thucydides net.thucydides - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT net.thucydides thucydides-browsermob-plugin diff --git a/thucydides-core/pom.xml b/thucydides-core/pom.xml index fe6fec47b..6709ace0d 100644 --- a/thucydides-core/pom.xml +++ b/thucydides-core/pom.xml @@ -4,11 +4,11 @@ thucydides net.thucydides - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT net.thucydides thucydides-core - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT thucydides-core net.thucydides.core diff --git a/thucydides-core/src/test/groovy/net/thucydides/core/reports/html/WhenFormattingDataForTheHTMLReports.groovy b/thucydides-core/src/test/groovy/net/thucydides/core/reports/html/WhenFormattingDataForTheHTMLReports.groovy index 75a601e48..9b2e4d036 100644 --- a/thucydides-core/src/test/groovy/net/thucydides/core/reports/html/WhenFormattingDataForTheHTMLReports.groovy +++ b/thucydides-core/src/test/groovy/net/thucydides/core/reports/html/WhenFormattingDataForTheHTMLReports.groovy @@ -163,4 +163,16 @@ class WhenFormattingDataForTheHTMLReports extends Specification { embeddedTable == "
ownerpoints
Jane80000
Joe50000
" } + 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
ownerpoints
Jane80000
Joe50000
" + + } + } diff --git a/thucydides-core/src/test/java/net/thucydides/core/reports/html/WhenFormattingForHTML.java b/thucydides-core/src/test/java/net/thucydides/core/reports/html/WhenFormattingForHTML.java index fb1cb0429..60fe906e0 100644 --- a/thucydides-core/src/test/java/net/thucydides/core/reports/html/WhenFormattingForHTML.java +++ b/thucydides-core/src/test/java/net/thucydides/core/reports/html/WhenFormattingForHTML.java @@ -237,6 +237,17 @@ public void should_convert_embedded_text_tables_into_html_tables() { assertThat(formattedValue, is("A table:\n
nameage
Bill20
")); } + @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
nameage
Bill20
")); + } + + @Test public void should_ignore_isolated_pipes() { when(issueTracking.getShortenedIssueTrackerUrl()).thenReturn(null); diff --git a/thucydides-junit/pom.xml b/thucydides-junit/pom.xml index d3a715e73..a5be84b92 100644 --- a/thucydides-junit/pom.xml +++ b/thucydides-junit/pom.xml @@ -4,7 +4,7 @@ thucydides net.thucydides - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT net.thucydides thucydides-junit diff --git a/thucydides-maven-integration-tests/pom.xml b/thucydides-maven-integration-tests/pom.xml index a4ed7b0f5..86eac30b5 100644 --- a/thucydides-maven-integration-tests/pom.xml +++ b/thucydides-maven-integration-tests/pom.xml @@ -4,7 +4,7 @@ thucydides net.thucydides - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT net.thucydides.maven.plugins thucydides-maven-integration-tests diff --git a/thucydides-report-resources/pom.xml b/thucydides-report-resources/pom.xml index ae3d3bdf9..0ca8d8f35 100644 --- a/thucydides-report-resources/pom.xml +++ b/thucydides-report-resources/pom.xml @@ -4,7 +4,7 @@ thucydides net.thucydides - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT net.thucydides thucydides-report-resources diff --git a/thucydides-sample-alternative-resources/pom.xml b/thucydides-sample-alternative-resources/pom.xml index a86c2af13..0f5162670 100644 --- a/thucydides-sample-alternative-resources/pom.xml +++ b/thucydides-sample-alternative-resources/pom.xml @@ -4,7 +4,7 @@ thucydides net.thucydides - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT net.thucydides thucydides-sample-alternative-resources diff --git a/thucydides-test-utils/pom.xml b/thucydides-test-utils/pom.xml index f8e95f349..464960b8e 100644 --- a/thucydides-test-utils/pom.xml +++ b/thucydides-test-utils/pom.xml @@ -4,11 +4,11 @@ thucydides net.thucydides - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT net.thucydides thucydides-test-utils - 0.9.237-SNAPSHOT + 0.9.238-SNAPSHOT thucydides-test-utils http://maven.apache.org