Merge branch 'html-formatter-embedded-text' of github.com:tomdcc/cucumber-jvm

Author: aslakhellesoy

core/src/main/java/cucumber/runtime/formatter/HTMLFormatter.java

@@ -135,12 +135,17 @@ public void match(Match match) {
 
     @Override
     public void embedding(String mimeType, byte[] data) {
-        // Creating a file instead of using data urls to not clutter the js file
-        String extension = MIME_TYPES_EXTENSIONS.get(mimeType);
-        if (extension != null) {
-            StringBuilder fileName = new StringBuilder("embedded").append(embeddedIndex++).append(".").append(extension);
-            writeBytesAndClose(data, reportFileOutputStream(fileName.toString()));
-            jsFunctionCall("embedding", mimeType, fileName);
+        if(mimeType.startsWith("text/")) {
+            // just pass straight to the formatter to output in the html
+            jsFunctionCall("embedding", mimeType, new String(data));
+        } else {
+            // Creating a file instead of using data urls to not clutter the js file
+            String extension = MIME_TYPES_EXTENSIONS.get(mimeType);
+            if (extension != null) {
+                StringBuilder fileName = new StringBuilder("embedded").append(embeddedIndex++).append(".").append(extension);
+                writeBytesAndClose(data, reportFileOutputStream(fileName.toString()));
+                jsFunctionCall("embedding", mimeType, fileName);
+            }
         }
     }
 

core/src/test/java/cucumber/runtime/formatter/HTMLFormatterTest.java

@@ -65,6 +65,7 @@ public void includes_uri() throws IOException {
     public void included_embedding() throws IOException {
         String reportJs = FixJava.readReader(new InputStreamReader(new URL(outputDir, "report.js").openStream(), "UTF-8"));
         assertContains("formatter.embedding(\"image/png\", \"embedded0.png\");", reportJs);
+        assertContains("formatter.embedding(\"text/plain\", \"dodgy stack trace here\");", reportJs);
     }
 
     private void assertContains(String substring, String string) {
@@ -78,6 +79,7 @@ private void runFeaturesWithFormatter(URL outputDir) throws IOException {
         f.uri("some\\windows\\path\\some.feature");
         f.scenario(new Scenario(Collections.<Comment>emptyList(), Collections.<Tag>emptyList(), "Scenario", "some cukes", "", 10, "id"));
         f.embedding("image/png", "fakedata".getBytes("US-ASCII"));
+        f.embedding("text/plain", "dodgy stack trace here".getBytes("US-ASCII"));
         f.done();
         f.close();
     }