Merge branch 'rs-markdown-feature-parity-ee' into 'master'

CE-EE parity for Markdown (Banzai) feature specs

Closes #6498

See merge request gitlab-org/gitlab-ee!6249

ee/spec/features/markdown/markdown_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'EE-specific GitLab Markdown', :aggregate_failures do
+  include Capybara::Node::Matchers
+  include MarkupHelper
+  include MarkdownMatchers
+
+  def doc(html = @html)
+    @doc ||= Nokogiri::HTML::DocumentFragment.parse(html)
+  end
+
+  before do
+    stub_licensed_features(epics: true)
+
+    @feat = ::EE::MarkdownFeature
+      .new(Rails.root.join('ee/spec/fixtures/markdown.md.erb'))
+
+    # `markdown` helper expects a `@project` and `@group` variable
+    @project = @feat.project
+    @group = @feat.group
+  end
+
+  context 'default pipeline' do
+    before do
+      @html = markdown(@feat.raw_markdown)
+    end
+
+    it 'includes custom filters' do
+      aggregate_failures 'all reference filters' do
+        expect(doc).to reference_epics
+      end
+    end
+  end
+end

ee/spec/fixtures/markdown.md.erb

+# EE-specific GitLab Markdown
+
+## EpicReferenceFilter
+
+- Epic by ID: <%= epic.to_reference %>
+- Epic in another group: <%= epic_other_group.to_reference(group) %>
+- Epic by url: <%= urls.group_epic_url(epic.group, epic) %>
+- Link to epic by reference: [Epic](<%= epic.to_reference(group) %>)
+- Link to epic by URL: [Epic](<%= urls.group_epic_url(epic.group, epic) %>)

ee/spec/support/helpers/ee/markdown_feature.rb

+# frozen_string_literal: true
+
+require 'support/helpers/markdown_feature'
+
+module EE
+  class MarkdownFeature < ::MarkdownFeature
+    def epic
+      @epic ||= create(:epic, title: 'epic', group: group)
+    end
+
+    def epic_other_group
+      @epic ||= create(:epic, title: 'epic')
+    end
+  end
+end

spec/features/markdown/markdown_spec.rb

@@ -42,15 +42,6 @@ describe 'GitLab Markdown', :aggregate_failures do
     @doc ||= Nokogiri::HTML::DocumentFragment.parse(html)
   end
 
-  before do
-    stub_licensed_features(epics: true)
-    @feat = MarkdownFeature.new
-
-    # `markdown` helper expects a `@project` and `@group` variable
-    @project = @feat.project
-    @group = @feat.group
-  end
-
   # Shared behavior that all pipelines should exhibit
   shared_examples 'all pipelines' do
     it 'includes extensions' do
@@ -207,6 +198,14 @@ describe 'GitLab Markdown', :aggregate_failures do
     end
   end
 
+  before do
+    @feat = MarkdownFeature.new
+
+    # `markdown` helper expects a `@project` and `@group` variable
+    @project = @feat.project
+    @group = @feat.group
+  end
+
   context 'default pipeline' do
     before do
       @html = markdown(@feat.raw_markdown)
@@ -240,7 +239,6 @@ describe 'GitLab Markdown', :aggregate_failures do
         expect(doc).to reference_commits
         expect(doc).to reference_labels
         expect(doc).to reference_milestones
-        expect(doc).to reference_epics
       end
 
       aggregate_failures 'TaskListFilter' do
@@ -302,7 +300,6 @@ describe 'GitLab Markdown', :aggregate_failures do
         expect(doc).to reference_commits
         expect(doc).to reference_labels
         expect(doc).to reference_milestones
-        expect(doc).to reference_epics
       end
 
       aggregate_failures 'TaskListFilter' do

spec/fixtures/markdown.md.erb

@@ -239,14 +239,6 @@ References should be parseable even inside _<%= merge_request.to_reference %>_ e
 - Group milestone by name in quotes: <%= group_milestone.to_reference(format: :name) %>
 - Group milestone by URL is ignore: <%= urls.milestone_url(group_milestone) %>
 
-#### EpicReferenceFilter
-
-- Epic by ID: <%= epic.to_reference %>
-- Epic in another group: <%= epic_other_group.to_reference(group) %>
-- Epic by url: <%= urls.group_epic_url(epic.group, epic) %>
-- Link to epic by reference: [Epic](<%= epic.to_reference(group) %>)
-- Link to epic by URL: [Epic](<%= urls.group_epic_url(epic.group, epic) %>)
-
 ### Task Lists
 
 - [ ] Incomplete task 1

spec/support/helpers/markdown_feature.rb

@@ -10,6 +10,12 @@
 class MarkdownFeature
   include FactoryBot::Syntax::Methods
 
+  attr_reader :fixture_path
+
+  def initialize(fixture_path = Rails.root.join('spec/fixtures/markdown.md.erb'))
+    @fixture_path = fixture_path
+  end
+
   def user
     @user ||= create(:user)
   end
@@ -79,14 +85,6 @@ class MarkdownFeature
     @group_milestone ||= create(:milestone, name: 'group-milestone', group: group)
   end
 
-  def epic
-    @epic ||= create(:epic, title: 'epic', group: group)
-  end
-
-  def epic_other_group
-    @epic ||= create(:epic, title: 'epic')
-  end
-
   # Cross-references -----------------------------------------------------------
 
   def xproject
@@ -130,7 +128,7 @@ class MarkdownFeature
   end
 
   def raw_markdown
-    markdown = File.read(Rails.root.join('spec/fixtures/markdown.md.erb'))
+    markdown = File.read(fixture_path)
     ERB.new(markdown).result(binding)
   end
 end