Merge branch 'jprovazn-remove-redcarpet' into 'master'

Remove Redcarpet markdown engine

Closes #51374

See merge request gitlab-org/gitlab-ce!24819

2 files changed, 32 insertions, 92 deletions

diff --git a/spec/services/preview_markdown_service_spec.rb b/spec/services/preview_markdown_service_spec.rb
index 458cb8f1f31..85515d548a7 100644
--- a/spec/services/preview_markdown_service_spec.rb
+++ b/spec/services/preview_markdown_service_spec.rb
@@ -114,23 +114,4 @@ describe PreviewMarkdownService do
       expect(result[:commands]).to eq 'Tags this commit to v1.2.3 with "Stable release".'
     end
   end
-
-  it 'sets correct markdown engine' do
-    service = described_class.new(project, user, { markdown_version: CacheMarkdownField::CACHE_REDCARPET_VERSION })
-    result  = service.execute
-
-    expect(result[:markdown_engine]).to eq :redcarpet
-
-    service = described_class.new(project, user, { markdown_version: CacheMarkdownField::CACHE_COMMONMARK_VERSION })
-    result  = service.execute
-
-    expect(result[:markdown_engine]).to eq :common_mark
-  end
-
-  it 'honors the legacy_render parameter' do
-    service = described_class.new(project, user, { legacy_render: '1' })
-    result  = service.execute
-
-    expect(result[:markdown_engine]).to eq :redcarpet
-  end
 end
diff --git a/spec/services/task_list_toggle_service_spec.rb b/spec/services/task_list_toggle_service_spec.rb
index 750ac4c40ba..cc64dd25085 100644
--- a/spec/services/task_list_toggle_service_spec.rb
+++ b/spec/services/task_list_toggle_service_spec.rb
@@ -3,7 +3,6 @@
 require 'spec_helper'
 
 describe TaskListToggleService do
-  let(:sourcepos) { true }
   let(:markdown) do
     <<-EOT.strip_heredoc
       * [ ] Task 1
@@ -40,87 +39,47 @@ describe TaskListToggleService do
     EOT
   end
 
-  shared_examples 'task lists' do
-    it 'checks Task 1' do
-      toggler = described_class.new(markdown, markdown_html,
-                                    index: 1, toggle_as_checked: true,
-                                    line_source: '* [ ] Task 1', line_number: 1,
-                                    sourcepos: sourcepos)
+  it 'checks Task 1' do
+    toggler = described_class.new(markdown, markdown_html,
+                                  toggle_as_checked: true,
+                                  line_source: '* [ ] Task 1', line_number: 1)
 
-      expect(toggler.execute).to be_truthy
-      expect(toggler.updated_markdown.lines[0]).to eq "* [x] Task 1\n"
-      expect(toggler.updated_markdown_html).to include('disabled checked> Task 1')
-    end
-
-    it 'unchecks Item 1' do
-      toggler = described_class.new(markdown, markdown_html,
-                                    index: 3, toggle_as_checked: false,
-                                    line_source: '1. [X] Item 1', line_number: 6,
-                                    sourcepos: sourcepos)
-
-      expect(toggler.execute).to be_truthy
-      expect(toggler.updated_markdown.lines[5]).to eq "1. [ ] Item 1\n"
-      expect(toggler.updated_markdown_html).to include('disabled> Item 1')
-    end
-
-    it 'returns false if line_source does not match the text' do
-      toggler = described_class.new(markdown, markdown_html,
-                                    index: 2, toggle_as_checked: false,
-                                    line_source: '* [x] Task Added', line_number: 2,
-                                    sourcepos: sourcepos)
-
-      expect(toggler.execute).to be_falsey
-    end
+    expect(toggler.execute).to be_truthy
+    expect(toggler.updated_markdown.lines[0]).to eq "* [x] Task 1\n"
+    expect(toggler.updated_markdown_html).to include('disabled checked> Task 1')
+  end
 
-    it 'returns false if markdown is nil' do
-      toggler = described_class.new(nil, markdown_html,
-                                    index: 2, toggle_as_checked: false,
-                                    line_source: '* [x] Task Added', line_number: 2,
-                                    sourcepos: sourcepos)
+  it 'unchecks Item 1' do
+    toggler = described_class.new(markdown, markdown_html,
+                                  toggle_as_checked: false,
+                                  line_source: '1. [X] Item 1', line_number: 6)
 
-      expect(toggler.execute).to be_falsey
-    end
+    expect(toggler.execute).to be_truthy
+    expect(toggler.updated_markdown.lines[5]).to eq "1. [ ] Item 1\n"
+    expect(toggler.updated_markdown_html).to include('disabled> Item 1')
+  end
 
-    it 'returns false if markdown_html is nil' do
-      toggler = described_class.new(markdown, nil,
-                                    index: 2, toggle_as_checked: false,
-                                    line_source: '* [x] Task Added', line_number: 2,
-                                    sourcepos: sourcepos)
+  it 'returns false if line_source does not match the text' do
+    toggler = described_class.new(markdown, markdown_html,
+                                  toggle_as_checked: false,
+                                  line_source: '* [x] Task Added', line_number: 2)
 
-      expect(toggler.execute).to be_falsey
-    end
+    expect(toggler.execute).to be_falsey
   end
 
-  context 'when using sourcepos' do
-    it_behaves_like 'task lists'
+  it 'returns false if markdown is nil' do
+    toggler = described_class.new(nil, markdown_html,
+                                  toggle_as_checked: false,
+                                  line_source: '* [x] Task Added', line_number: 2)
+
+    expect(toggler.execute).to be_falsey
   end
 
-  context 'when using checkbox indexing' do
-    let(:sourcepos) { false }
-    let(:markdown_html) do
-      <<-EOT.strip_heredoc
-      <ul class="task-list" dir="auto">
-        <li class="task-list-item">
-          <input type="checkbox" class="task-list-item-checkbox" disabled> Task 1
-        </li>
-        <li class="task-list-item">
-          <input type="checkbox" class="task-list-item-checkbox" disabled checked> Task 2
-        </li>
-      </ul>
-      <p dir="auto">A paragraph</p>
-      <ol class="task-list" dir="auto">
-        <li class="task-list-item">
-          <input type="checkbox" class="task-list-item-checkbox" disabled checked> Item 1
-          <ul class="task-list">
-            <li class="task-list-item">
-              <input type="checkbox" class="task-list-item-checkbox" disabled> Sub-item 1
-            </li>
-          </ul>
-        </li>
-      </ol>
-      EOT
-    end
+  it 'returns false if markdown_html is nil' do
+    toggler = described_class.new(markdown, nil,
+                                  toggle_as_checked: false,
+                                  line_source: '* [x] Task Added', line_number: 2)
 
-    it_behaves_like 'task lists'
+    expect(toggler.execute).to be_falsey
   end
 end