revert json formatter mime type (#995)

cucumber · Jan 4, 2018 · ab0eb00 · ab0eb00
1 parent 7bf5936
commit ab0eb00
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 20 deletions.
diff --git a/features/attachments.feature b/features/attachments.feature
@@ -29,8 +29,8 @@ Feature: Attachments
       """
     When I run cucumber.js
     Then the "Before" hook has the attachment
-      | DATA     | MEDIA ENCODING | MEDIA TYPE |
-      | iVBORw== | base64         | image/png  |
+      | DATA     | MIME TYPE |
+      | iVBORw== | image/png |
 
   Scenario: Attach a stream (callback)
     Given a file named "features/support/hooks.js" with:
@@ -50,8 +50,8 @@ Feature: Attachments
       """
     When I run cucumber.js
     Then the "Before" hook has the attachment
-      | DATA     | MEDIA ENCODING | MEDIA TYPE |
-      | iVBORw== | base64         | image/png  |
+      | DATA     | MIME TYPE |
+      | iVBORw== | image/png |
 
     Scenario: Attach a stream (promise)
       Given a file named "features/support/hooks.js" with:
@@ -72,8 +72,8 @@ Feature: Attachments
         """
       When I run cucumber.js
       Then the "Before" hook has the attachment
-        | DATA     | MEDIA ENCODING | MEDIA TYPE |
-        | iVBORw== | base64         | image/png  |
+        | DATA     | MIME TYPE |
+        | iVBORw== | image/png |
 
   Scenario: Attach from a before hook
     Given a file named "features/support/hooks.js" with:
@@ -88,7 +88,7 @@ Feature: Attachments
       """
     When I run cucumber.js
     Then the "Before" hook has the attachment
-      | DATA | MEDIA TYPE |
+      | DATA | MIME TYPE  |
       | text | text/plain |
 
   Scenario: Attach from an after hook
@@ -104,7 +104,7 @@ Feature: Attachments
       """
     When I run cucumber.js
     Then the "After" hook has the attachment
-      | DATA | MEDIA TYPE |
+      | DATA | MIME TYPE  |
       | text | text/plain |
 
   Scenario: Attach from a step definition
@@ -120,5 +120,5 @@ Feature: Attachments
       """
     When I run cucumber.js
     Then the step "a step" has the attachment
-      | DATA | MEDIA TYPE |
+      | DATA | MIME TYPE  |
       | text | text/plain |
diff --git a/features/step_definitions/json_output_steps.js b/features/step_definitions/json_output_steps.js
@@ -89,10 +89,7 @@ defineSupportCode(({ Then }) => {
     const tableRowData = table.hashes()[0]
     const expectedAttachment = {
       data: tableRowData.DATA,
-      media: { type: tableRowData['MEDIA TYPE'] }
-    }
-    if (tableRowData['MEDIA ENCODING']) {
-      expectedAttachment.media.encoding = tableRowData['MEDIA ENCODING']
+      mime_type: tableRowData['MIME TYPE']
     }
     expect(step.embeddings[0]).to.eql(expectedAttachment)
   })
@@ -105,10 +102,7 @@ defineSupportCode(({ Then }) => {
     const tableRowData = table.hashes()[0]
     const expectedAttachment = {
       data: tableRowData.DATA,
-      media: { type: tableRowData['MEDIA TYPE'] }
-    }
-    if (tableRowData['MEDIA ENCODING']) {
-      expectedAttachment.media.encoding = tableRowData['MEDIA ENCODING']
+      mime_type: tableRowData['MIME TYPE']
     }
     expect(hook.embeddings[0]).to.eql(expectedAttachment)
   })

diff --git a/src/formatter/json_formatter.js b/src/formatter/json_formatter.js
@@ -152,7 +152,12 @@ export default class JsonFormatter extends Formatter {
       }
     }
     if (_.size(testStep.attachments) > 0) {
-      data.embeddings = testStep.attachments
+      data.embeddings = testStep.attachments.map(attachment => {
+        return {
+          data: attachment.data,
+          mime_type: attachment.media.type
+        }
+      })
     }
     return data
   }

diff --git a/src/formatter/json_formatter_spec.js b/src/formatter/json_formatter_spec.js
@@ -253,8 +253,8 @@ describe('JsonFormatter', function() {
       it('outputs the step with embeddings', function() {
         const features = JSON.parse(this.output)
         expect(features[0].elements[0].steps[0].embeddings).to.eql([
-          { data: 'first data', media: { type: 'first media type' } },
-          { data: 'second data', media: { type: 'second media type' } }
+          { data: 'first data', mime_type: 'first media type' },
+          { data: 'second data', mime_type: 'second media type' }
         ])
       })
     })