Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 8 deletions

diff --git a/spec/frontend/helpers/dom_shims/index.js b/spec/frontend/helpers/dom_shims/index.js
index d18bb94c107..2ba5701fc77 100644
--- a/spec/frontend/helpers/dom_shims/index.js
+++ b/spec/frontend/helpers/dom_shims/index.js
@@ -4,7 +4,7 @@ import './element_scroll_to';
 import './form_element';
 import './get_client_rects';
 import './inner_text';
-import './mutation_observer';
+import './range';
 import './window_scroll_to';
 import './scroll_by';
 import './size_properties';
diff --git a/spec/frontend/helpers/dom_shims/mutation_observer.js b/spec/frontend/helpers/dom_shims/mutation_observer.js
deleted file mode 100644
index 68c494f19ea..00000000000
--- a/spec/frontend/helpers/dom_shims/mutation_observer.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* eslint-disable class-methods-use-this */
-class MutationObserverStub {
-  disconnect() {}
-  observe() {}
-}
-
-global.MutationObserver = MutationObserverStub;
diff --git a/spec/frontend/helpers/dom_shims/range.js b/spec/frontend/helpers/dom_shims/range.js
new file mode 100644
index 00000000000..4ffdf3280ad
--- /dev/null
+++ b/spec/frontend/helpers/dom_shims/range.js
@@ -0,0 +1,13 @@
+if (window.Range.prototype.getBoundingClientRect) {
+  throw new Error('window.Range.prototype.getBoundingClientRect already exists. Remove this stub!');
+}
+window.Range.prototype.getBoundingClientRect = function getBoundingClientRect() {
+  return { x: 0, y: 0, width: 0, height: 0, top: 0, right: 0, bottom: 0, left: 0 };
+};
+
+if (window.Range.prototype.getClientRects) {
+  throw new Error('window.Range.prototype.getClientRects already exists. Remove this stub!');
+}
+window.Range.prototype.getClientRects = function getClientRects() {
+  return [this.getBoundingClientRect()];
+};