Add latest changes from gitlab-org/gitlab@master

2 files changed, 13 insertions, 0 deletions

diff --git a/spec/frontend/helpers/dom_shims/image_element_properties.js b/spec/frontend/helpers/dom_shims/image_element_properties.js
new file mode 100644
index 00000000000..525246e6ade
--- /dev/null
+++ b/spec/frontend/helpers/dom_shims/image_element_properties.js
@@ -0,0 +1,12 @@
+Object.defineProperty(global.HTMLImageElement.prototype, 'src', {
+  get() {
+    return this.$_jest_src;
+  },
+  set(val) {
+    this.$_jest_src = val;
+
+    if (this.onload) {
+      this.onload();
+    }
+  },
+});
diff --git a/spec/frontend/helpers/dom_shims/index.js b/spec/frontend/helpers/dom_shims/index.js
index 1b73f0e2ef5..855b707a4cf 100644
--- a/spec/frontend/helpers/dom_shims/index.js
+++ b/spec/frontend/helpers/dom_shims/index.js
@@ -4,3 +4,4 @@ import './inner_text';
 import './window_scroll_to';
 import './scroll_by';
 import './size_properties';
+import './image_element_properties';