Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 0 deletions

diff --git a/spec/support/helpers/markdown_helpers.rb b/spec/support/helpers/markdown_helpers.rb
new file mode 100644
index 00000000000..9a25238465a
--- /dev/null
+++ b/spec/support/helpers/markdown_helpers.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module MarkdownHelpers
+  def remove_sourcepos(html)
+    html.gsub(/\ ?data-sourcepos=".*?"/, '')
+  end
+end
diff --git a/spec/support/matchers/sourcepos_matchers.rb b/spec/support/matchers/sourcepos_matchers.rb
new file mode 100644
index 00000000000..903fe2bd201
--- /dev/null
+++ b/spec/support/matchers/sourcepos_matchers.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# remove data-sourcepos from compare
+RSpec::Matchers.define :eq_no_sourcepos do |expected|
+  include MarkdownHelpers
+
+  match do |actual|
+    remove_sourcepos(actual) == expected
+  end
+
+  description do
+    "equal ignoring sourcepos #{expected}"
+  end
+end