Remove attributes on attachments

Aztec/Classes/Formatters/Implementations/ImageFormatter.swift

@@ -63,7 +63,7 @@ class ImageFormatter: StandardAttributeFormatter {
                 attributeValue = ImageAttachment(identifier: UUID().uuidString)
             }
         }
-
-        return super.apply(to: attributes, andStore: representation)
+        // Comment: Sergio Estevao (2017-10-30) - We are not passing the representation because it's all save inside the extraAttributes property of the attachment.
+        return super.apply(to: attributes, andStore: nil)
     }
 }

Aztec/Classes/Formatters/Implementations/VideoFormatter.swift

@@ -52,7 +52,7 @@ class VideoFormatter: StandardAttributeFormatter {
             //
             assert(representation == nil)
         }
-
-        return super.apply(to: attributes, andStore: representation)
+        // Comment: Sergio Estevao (2017-10-30) - We are not passing the representation because it's all save inside the extraAttributes property of the attachment.
+        return super.apply(to: attributes, andStore: nil)
     }
 }

AztecTests/TextKit/TextViewTests.swift

@@ -1567,7 +1567,7 @@ class TextViewTests: XCTestCase {
         let html = "<img src=\"image.jpg\" class=\"alignnone\" alt=\"Alt\" title=\"Title\">"
         let textView = createTextView(withHTML: html)
 
-        XCTAssertEqual(textView.getHTML(), "<p><img src=\"image.jpg\" class=\"alignnone\" alt=\"Alt\" title=\"Title\"></p>")
+        XCTAssertEqual(textView.getHTML(), "<p><img src=\"image.jpg\" class=\"alignnone\" title=\"Title\" alt=\"Alt\"></p>")
 
         guard let attachment = textView.storage.mediaAttachments.first as? ImageAttachment else {
             XCTFail("An video attachment should be present")
@@ -1579,7 +1579,7 @@ class TextViewTests: XCTestCase {
         attachment.extraAttributes["alt"] = "Changed Alt"
         attachment.extraAttributes["class"] = "wp-image-169"
 
-        XCTAssertEqual(textView.getHTML(), "<p><img src=\"image.jpg\" class=\"alignnone wp-image-169\" alt=\"Changed Alt\" title=\"Title\"></p>")
+        XCTAssertEqual(textView.getHTML(), "<p><img src=\"image.jpg\" class=\"alignnone wp-image-169\" title=\"Title\" alt=\"Changed Alt\"></p>")
     }
 
 
@@ -1609,7 +1609,7 @@ class TextViewTests: XCTestCase {
     /// This test verifies that img class attributes are not duplicated
     ///
     func testParseImageDoesntDuplicateExtraAttributes() {
-        let html = "<img src=\"image.jpg\" class=\"wp-image-test\" alt=\"Alt\" title=\"Title\">"
+        let html = "<img src=\"image.jpg\" class=\"wp-image-test\" title=\"Title\" alt=\"Alt\">"
         let textView = createTextView(withHTML: html)
         let generatedHTML = textView.getHTML()
 
@@ -1776,4 +1776,30 @@ class TextViewTests: XCTestCase {
         XCTAssert(textView.getHTML(prettyPrint: false) == expected)
     }
 
+    /// This test verifies that attributes on media attachment are being removed properly.
+    /// of text that never had H1 style, to begin with!.
+    ///
+    func testAttributesOnMediaAttachmentsAreRemoved() {
+        let textView = createTextView(withHTML: "<img src=\"http://placeholder\" data-wp_upload_id=\"ABCDE\" >")
+
+        guard let attachment = textView.storage.mediaAttachments.first else {
+            XCTFail("There must be an attachment")
+            return
+        }
+
+        guard let attributedValue = attachment.extraAttributes["data-wp_upload_id"] else {
+            XCTFail("There must be an attribute with the name data-wp_upload_i")
+            return
+        }
+
+        XCTAssertEqual(attributedValue, "ABCDE")
+
+        // Remove attribute
+        attachment.extraAttributes["data-wp_upload_id"] = nil
+
+        let html = textView.getHTML()
+
+        XCTAssertEqual(html, "<p><img src=\"http://placeholder\"></p>" )
+    }
+
 }