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

spec/components/file_store/s3_store_spec.rb

@@ -303,21 +303,12 @@ describe FileStore::S3Store do
   end
 
   describe ".path_for" do
-
-    def assert_path(path, expected)
-      upload = Upload.new(url: path)
-
-      path = store.path_for(upload)
-      expected = FileStore::LocalStore.new.path_for(upload) if expected
-
-      expect(path).to eq(expected)
-    end
-
     it "correctly falls back to local" do
-      assert_path("/hello", "/hello")
-      assert_path("//hello", nil)
-      assert_path("http://hello", nil)
-      assert_path("https://hello", nil)
+      local_upload = Fabricate(:upload)
+      s3_upload =  Fabricate(:upload_s3)
+
+      expect(Discourse.store.path_for(local_upload)).to eq(local_upload.url)
+      expect(Discourse.store.path_for(s3_upload)).to eq(s3_upload.url)
     end
   end
 

spec/components/pretty_text_spec.rb

@@ -1260,9 +1260,11 @@ HTML
 
   end
 
-  describe "image decoding" do
+  describe "upload decoding" do
 
     it "can decode upload:// for default setup" do
+      set_cdn_url('https://cdn.com')
+
       upload = Fabricate(:upload)
 
       raw = <<~RAW
@@ -1274,6 +1276,12 @@ HTML
           - ![upload](#{upload.short_url})
 
       ![upload](#{upload.short_url.gsub(".png", "")})
+
+      [some attachment](#{upload.short_url})
+
+      [some attachment|attachment](#{upload.short_url})
+
+      [some attachment|random](#{upload.short_url})
       RAW
 
       cooked = <<~HTML
@@ -1290,6 +1298,9 @@ HTML
         </li>
         </ul>
         <p><img src="#{upload.url}" alt="upload"></p>
+        <p><a href="#{upload.short_path}">some attachment</a></p>
+        <p><a class="attachment" href="#{upload.short_path}">some attachment</a></p>
+        <p><a href="#{upload.short_path}">some attachment|random</a></p>
       HTML
 
       expect(PrettyText.cook(raw)).to eq(cooked.strip)
@@ -1297,10 +1308,15 @@ HTML
 
     it "can place a blank image if we can not find the upload" do
 
-      raw = "![upload](upload://abcABC.png)"
+      raw = <<~MD
+      ![upload](upload://abcABC.png)
+
+      [some attachment|attachment](upload://abcdefg.png)
+      MD
 
       cooked = <<~HTML
-        <p><img src="/images/transparent.png" alt="upload" data-orig-src="upload://abcABC.png"></p>
+      <p><img src="/images/transparent.png" alt="upload" data-orig-src="upload://abcABC.png"></p>
+      <p><a href="/404" data-orig-href="upload://abcdefg.png">some attachment|attachment</a></p>
       HTML
 
       expect(PrettyText.cook(raw)).to eq(cooked.strip)