Temporarily revert "FEATURE: Support [description|attachment](upload://<short-sha>) in MD. (#7603)"

This reverts commit b1d3c678ca.

We need to make sure post_upload records are correctly stored.

test/javascripts/lib/image-short-url-test.js.es6

@@ -0,0 +1,56 @@
+import {
+  lookupCachedUploadUrl,
+  resolveAllShortUrls,
+  resetCache
+} from "pretty-text/image-short-url";
+import { ajax } from "discourse/lib/ajax";
+
+QUnit.module("lib:pretty-text/image-short-url", {
+  beforeEach() {
+    const response = object => {
+      return [200, { "Content-Type": "application/json" }, object];
+    };
+
+    const srcs = [
+      {
+        short_url: "upload://a.jpeg",
+        url: "/uploads/default/original/3X/c/b/1.jpeg"
+      },
+      {
+        short_url: "upload://b.jpeg",
+        url: "/uploads/default/original/3X/c/b/2.jpeg"
+      }
+    ];
+
+    // prettier-ignore
+    server.post("/uploads/lookup-urls", () => { //eslint-disable-line
+      return response(srcs);
+    });
+
+    fixture().html(
+      srcs.map(src => `<img data-orig-src="${src.url}">`).join("")
+    );
+  },
+
+  afterEach() {
+    resetCache();
+  }
+});
+
+QUnit.test("resolveAllShortUrls", async assert => {
+  let lookup;
+
+  lookup = lookupCachedUploadUrl("upload://a.jpeg");
+  assert.notOk(lookup);
+
+  await resolveAllShortUrls(ajax);
+
+  lookup = lookupCachedUploadUrl("upload://a.jpeg");
+  assert.equal(lookup, "/uploads/default/original/3X/c/b/1.jpeg");
+
+  lookup = lookupCachedUploadUrl("upload://b.jpeg");
+  assert.equal(lookup, "/uploads/default/original/3X/c/b/2.jpeg");
+
+  lookup = lookupCachedUploadUrl("upload://c.jpeg");
+  assert.notOk(lookup);
+});

test/javascripts/lib/upload-short-url-test.js.es6

@@ -1,81 +0,0 @@
-import {
-  lookupCachedUploadUrl,
-  resolveAllShortUrls,
-  resetCache
-} from "pretty-text/upload-short-url";
-import { ajax } from "discourse/lib/ajax";
-
-QUnit.module("lib:pretty-text/upload-short-url", {
-  beforeEach() {
-    const response = object => {
-      return [200, { "Content-Type": "application/json" }, object];
-    };
-
-    const imageSrcs = [
-      {
-        short_url: "upload://a.jpeg",
-        url: "/uploads/default/original/3X/c/b/1.jpeg",
-        short_path: "/uploads/short-url/a.jpeg"
-      },
-      {
-        short_url: "upload://b.jpeg",
-        url: "/uploads/default/original/3X/c/b/2.jpeg",
-        short_path: "/uploads/short-url/b.jpeg"
-      }
-    ];
-
-    const attachmentSrcs = [
-      {
-        short_url: "upload://c.pdf",
-        url: "/uploads/default/original/3X/c/b/3.pdf",
-        short_path: "/uploads/short-url/c.pdf"
-      }
-    ];
-
-    // prettier-ignore
-    server.post("/uploads/lookup-urls", () => { //eslint-disable-line
-      return response(imageSrcs.concat(attachmentSrcs));
-    });
-
-    fixture().html(
-      imageSrcs.map(src => `<img data-orig-src="${src.url}">`).join("") +
-        attachmentSrcs.map(src => `<a data-orig-href="${src.url}">`).join("")
-    );
-  },
-
-  afterEach() {
-    resetCache();
-  }
-});
-
-QUnit.test("resolveAllShortUrls", async assert => {
-  let lookup;
-
-  lookup = lookupCachedUploadUrl("upload://a.jpeg");
-  assert.deepEqual(lookup, {});
-
-  await resolveAllShortUrls(ajax);
-
-  lookup = lookupCachedUploadUrl("upload://a.jpeg");
-
-  assert.deepEqual(lookup, {
-    url: "/uploads/default/original/3X/c/b/1.jpeg",
-    short_path: "/uploads/short-url/a.jpeg"
-  });
-
-  lookup = lookupCachedUploadUrl("upload://b.jpeg");
-
-  assert.deepEqual(lookup, {
-    url: "/uploads/default/original/3X/c/b/2.jpeg",
-    short_path: "/uploads/short-url/b.jpeg"
-  });
-
-  lookup = lookupCachedUploadUrl("upload://c.jpeg");
-  assert.deepEqual(lookup, {});
-
-  lookup = lookupCachedUploadUrl("upload://c.pdf");
-  assert.deepEqual(lookup, {
-    url: "/uploads/default/original/3X/c/b/3.pdf",
-    short_path: "/uploads/short-url/c.pdf"
-  });
-});

test/javascripts/lib/utilities-test.js.es6

@@ -165,19 +165,14 @@ QUnit.test("allows valid uploads to go through", assert => {
   assert.not(bootbox.alert.calledOnce);
 });
 
-var testUploadMarkdown = function(filename, opts = {}) {
-  return getUploadMarkdown(
-    Object.assign(
-      {
-        original_filename: filename,
-        filesize: 42,
-        thumbnail_width: 100,
-        thumbnail_height: 200,
-        url: "/uploads/123/abcdef.ext"
-      },
-      opts
-    )
-  );
+var testUploadMarkdown = function(filename) {
+  return getUploadMarkdown({
+    original_filename: filename,
+    filesize: 42,
+    thumbnail_width: 100,
+    thumbnail_height: 200,
+    url: "/uploads/123/abcdef.ext"
+  });
 };
 
 QUnit.test("getUploadMarkdown", assert => {
@@ -189,12 +184,9 @@ QUnit.test("getUploadMarkdown", assert => {
     testUploadMarkdown("[foo|bar].png"),
     "![%5Bfoo%7Cbar%5D|100x200](/uploads/123/abcdef.ext)"
   );
-
-  const short_url = "uploads://asdaasd.ext";
-
-  assert.equal(
-    testUploadMarkdown("important.txt", { short_url }),
-    `[important.txt (42 Bytes)|attachment](${short_url})`
+  assert.ok(
+    testUploadMarkdown("important.txt") ===
+      '<a class="attachment" href="/uploads/123/abcdef.ext">important.txt</a> (42 Bytes)\n'
   );
 });