diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 12:08:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 12:08:56 +0300 |
| commit | b4ded0ba7b4d2cdbed5b1f331cf2083a25ee4d7c (patch) | |
| tree | 6694fa9d8f3e226597cc01dfb8e3e07b50ae85b6 /spec/support | |
| parent | 2aaef94c80937d9d188f7b9cbbad2dcd1508c3c1 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/helpers/filter_spec_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/helpers/filter_spec_helper.rb b/spec/support/helpers/filter_spec_helper.rb index e27b0de2497..c165128040f 100644 --- a/spec/support/helpers/filter_spec_helper.rb +++ b/spec/support/helpers/filter_spec_helper.rb @@ -15,7 +15,7 @@ module FilterSpecHelper # context - Hash context for the filter. (default: {project: project}) # # Returns a Nokogiri::XML::DocumentFragment - def filter(html, context = {}) + def filter(html, context = {}, result = nil) if defined?(project) context.reverse_merge!(project: project) end @@ -25,7 +25,7 @@ module FilterSpecHelper context = context.merge(render_context: render_context) - described_class.call(html, context) + described_class.call(html, context, result) end # Get an instance of the Filter class |