From ba27279f477fdcf4448755810fac3163b0870d3d Mon Sep 17 00:00:00 2001
From: "mathieu.cottret" <mathieu.cottret@rakuten.com>
Date: Wed, 4 Mar 2020 11:04:52 +0100
Subject: [PATCH] Fix ComponentImage's default src not being base64 encoded.
 Fixes #2619

---
 package-lock.json                             | 41 ++++++++++++++-----
 src/dom_components/model/ComponentImage.js    |  2 +-
 .../dom_components/model/ComponentImage.js    | 34 +++++++++++++++
 3 files changed, 65 insertions(+), 12 deletions(-)
 create mode 100644 test/specs/dom_components/model/ComponentImage.js

diff --git a/package-lock.json b/package-lock.json
index b1632436c..c08b84bb5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9935,7 +9935,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -9956,12 +9957,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -9976,17 +9979,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -10103,7 +10109,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -10115,6 +10122,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -10129,6 +10137,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -10136,12 +10145,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -10160,6 +10171,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -10240,7 +10252,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -10252,6 +10265,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -10337,7 +10351,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -10373,6 +10388,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -10392,6 +10408,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -10435,12 +10452,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/src/dom_components/model/ComponentImage.js b/src/dom_components/model/ComponentImage.js
index 040c17bb9..19e2e39a4 100644
--- a/src/dom_components/model/ComponentImage.js
+++ b/src/dom_components/model/ComponentImage.js
@@ -75,7 +75,7 @@ export default Component.extend(
      */
     getAttrToHTML(...args) {
       const attr = Component.prototype.getAttrToHTML.apply(this, args);
-      const src = this.get('src');
+      const src = this.getSrcResult();
       if (src) attr.src = src;
       return attr;
     },
diff --git a/test/specs/dom_components/model/ComponentImage.js b/test/specs/dom_components/model/ComponentImage.js
new file mode 100644
index 000000000..f99f02322
--- /dev/null
+++ b/test/specs/dom_components/model/ComponentImage.js
@@ -0,0 +1,34 @@
+import Component from '../../../../src/dom_components/model/Component';
+import ComponentImage from '../../../../src/dom_components/model/ComponentImage';
+
+describe('ComponentImage', () => {
+  let componentImage;
+
+  beforeEach(() => {
+    componentImage = new ComponentImage();
+  });
+
+  describe('.getAttrToHTML', () => {
+    let getSrcResultSpy;
+    const fakeAttributes = {};
+
+    beforeEach(() => {
+      spyOn(Component.prototype, 'getAttrToHTML').and.returnValue(
+        fakeAttributes
+      );
+      getSrcResultSpy = spyOn(componentImage, 'getSrcResult');
+    });
+
+    test('it should fill the `src` property with the result of `getSrcResult` if defined', () => {
+      let attributes = componentImage.getAttrToHTML();
+      expect(getSrcResultSpy).toHaveBeenCalled();
+      expect(attributes).toEqual(fakeAttributes);
+
+      let fakeSrcResult = 'fakeSrcResult';
+      getSrcResultSpy.and.returnValue(fakeSrcResult);
+      attributes = componentImage.getAttrToHTML();
+      expect(getSrcResultSpy).toHaveBeenCalledTimes(2);
+      expect(attributes).toEqual({ src: fakeSrcResult });
+    });
+  });
+});