relax http exchange attachment type (via #3340)

Author: baev

allure-generator/src/main/java/io/qameta/allure/detect/WellKnownFileExtensionsUtils.java

@@ -1356,6 +1356,7 @@ public final class WellKnownFileExtensionsUtils {
         for (Map.Entry<String, String> stringStringEntry : EXT_TO_MIME_TYPE.entrySet()) {
             extToMimeType.putIfAbsent(stringStringEntry.getValue(), stringStringEntry.getKey());
         }
+        extToMimeType.put("application/vnd.allure.http", "httpexchange");
         MIME_TYPE_TO_EXT = Collections.unmodifiableMap(extToMimeType);
     }
 

allure-generator/src/main/javascript/features/attachments/index.mts

@@ -1,4 +1,4 @@
-import { HTTP_EXCHANGE_ATTACHMENT_MIME } from "./model/httpAttachment.mts";
+import { HTTP_EXCHANGE_ATTACHMENT_MIME_TYPES } from "./model/httpAttachment.mts";
 import { HttpAttachmentView } from "./views/HttpAttachmentView.mts";
 import { ScreenDiffAttachmentView, ScreenDiffTestResultView } from "./views/ScreenDiffView.mts";
 
@@ -7,10 +7,15 @@ type TestResultBlockFactory = import("../../core/registry/types.mts").TestResult
 type TestResultBlocks = import("../../core/registry/types.mts").TestResultBlocks;
 
 export const attachmentViewers: AttachmentViewers = {
-  [HTTP_EXCHANGE_ATTACHMENT_MIME]: {
-    create: HttpAttachmentView,
-    icon: "lineDevDataflow3",
-  },
+  ...Object.fromEntries(
+    HTTP_EXCHANGE_ATTACHMENT_MIME_TYPES.map((type) => [
+      type,
+      {
+        create: HttpAttachmentView,
+        icon: "lineDevDataflow3",
+      },
+    ]),
+  ),
   "application/vnd.allure.image.diff": {
     create: ScreenDiffAttachmentView,
     icon: "lineLayoutsColumns2",

allure-generator/src/main/javascript/features/attachments/model/httpAttachment.mts

@@ -1,4 +1,9 @@
-export const HTTP_EXCHANGE_ATTACHMENT_MIME = "application/vnd.allure.http+json";
+const HTTP_EXCHANGE_ATTACHMENT_MIME = "application/vnd.allure.http+json";
+const HTTP_EXCHANGE_ATTACHMENT_MIME_ALIAS = "application/vnd.allure.http";
+export const HTTP_EXCHANGE_ATTACHMENT_MIME_TYPES = [
+  HTTP_EXCHANGE_ATTACHMENT_MIME,
+  HTTP_EXCHANGE_ATTACHMENT_MIME_ALIAS,
+];
 export const HTTP_EXCHANGE_REDACTED_VALUE = "__ALLURE_REDACTED__";
 
 export type HttpExchangeSchemaVersion = 1;

allure-generator/src/test/java/io/qameta/allure/detect/WellKnownFileExtensionsUtilsTest.java

@@ -74,6 +74,7 @@ static Stream<Arguments> expectedExtensions() {
                 Arguments.of("application/gzip", "tgz"),
                 Arguments.of("application/vnd.allure.image.diff", "imagediff"),
                 Arguments.of("application/vnd.allure.http+json", "httpexchange"),
+                Arguments.of("application/vnd.allure.http", "httpexchange"),
                 Arguments.of("text/plain", "txt"),
                 Arguments.of("application/octet-stream", ""),
                 Arguments.of("", ""),

allure-generator/tests/e2e/attachments.spec.mts

@@ -227,6 +227,21 @@ test.describe("Generic Attachments", () => {
         .toBe(false);
       await expect(preview.getByRole("button", { name: "Copy as curl" })).toHaveCount(0);
       await expect(preview.locator("[data-body-mode]")).toHaveCount(0);
+
+      const httpAliasRow = attachmentRow(page, attachmentsFixture.attachments.httpAlias);
+      await expect(httpAliasRow).toBeVisible();
+      await expect(httpAliasRow).toHaveAttribute("data-type", "application/vnd.allure.http");
+      await httpAliasRow.click();
+
+      const aliasPreview = previewContainerFor(httpAliasRow);
+      await expect(aliasPreview.locator(".http-attachment__summary")).toBeVisible();
+      await expect(aliasPreview.locator(".http-attachment__method")).toHaveText("GET");
+      await expect(aliasPreview.locator(".http-attachment__url")).toHaveText(
+        "https://api.example.com/v1/mime-alias",
+      );
+      await expect(aliasPreview.locator(".http-attachment__status")).toHaveText(
+        "204 No Content",
+      );
     });
 
     test(`renders rich HTTP Exchange response bodies with attachment viewers (${mode})`, async ({

allure-generator/tests/e2e/support/fixtures.mts

@@ -71,6 +71,7 @@ export const fixtures = {
       css: "text/css",
       imageDiff: "application/vnd.allure.image.diff",
       http: "HTTP Exchange",
+      httpAlias: "HTTP Exchange MIME alias",
       httpBinary: "HTTP Exchange binary",
       httpForm: "HTTP Exchange form",
       httpImage: "HTTP Exchange image",
@@ -94,6 +95,7 @@ export const fixtures = {
       css: "text/css",
       imageDiff: "application/vnd.allure.image.diff",
       http: "HTTP Exchange",
+      httpAlias: "HTTP Exchange MIME alias",
       httpBinary: "HTTP Exchange binary",
       httpForm: "HTTP Exchange form",
       httpImage: "HTTP Exchange image",

allure-generator/tests/fixtures/raw/attachments/attachment-http-alias.httpexchange

@@ -0,0 +1,21 @@
+{
+  "schemaVersion": 1,
+  "start": 1710000186680,
+  "stop": 1710000186700,
+  "request": {
+    "method": "GET",
+    "url": "https://api.example.com/v1/mime-alias",
+    "httpVersion": "HTTP/1.1",
+    "headers": [
+      {
+        "name": "accept",
+        "value": "application/json"
+      }
+    ]
+  },
+  "response": {
+    "status": 204,
+    "statusText": "No Content",
+    "httpVersion": "HTTP/1.1"
+  }
+}

allure-generator/tests/fixtures/raw/attachments/attachments-01-result.json

@@ -156,6 +156,19 @@
         }
       ]
     },
+    {
+      "status": "passed",
+      "name": "HTTP Exchange MIME alias",
+      "start": 1710000186680,
+      "stop": 1710000186700,
+      "attachments": [
+        {
+          "name": "HTTP Exchange MIME alias",
+          "type": "application/vnd.allure.http",
+          "source": "attachment-http-alias.httpexchange"
+        }
+      ]
+    },
     {
       "status": "passed",
       "name": "HTTP Exchange image",

allurerc.mjs

@@ -3,7 +3,6 @@ const { ALLURE_SERVICE_TOKEN } = process.env;
 const allureService = ALLURE_SERVICE_TOKEN
     ? {
         accessToken: ALLURE_SERVICE_TOKEN,
-        legacy: true,
     }
     : undefined;