Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

7 files changed, 140 insertions, 22 deletions

diff --git a/spec/frontend/fixtures/api_markdown.rb b/spec/frontend/fixtures/api_markdown.rb
new file mode 100644
index 00000000000..e012d922aad
--- /dev/null
+++ b/spec/frontend/fixtures/api_markdown.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe API::MergeRequests, '(JavaScript fixtures)', type: :request do
+  include ApiHelpers
+  include JavaScriptFixturesHelpers
+
+  fixture_subdir = 'api/markdown'
+
+  before(:all) do
+    clean_frontend_fixtures(fixture_subdir)
+  end
+
+  markdown_examples = begin
+    yaml_file_path = File.expand_path('api_markdown.yml', __dir__)
+    yaml = File.read(yaml_file_path)
+    YAML.safe_load(yaml, symbolize_names: true)
+  end
+
+  markdown_examples.each do |markdown_example|
+    name = markdown_example.fetch(:name)
+
+    context "for #{name}" do
+      let(:markdown) { markdown_example.fetch(:markdown) }
+
+      it "#{fixture_subdir}/#{name}.json" do
+        post api("/markdown"), params: { text: markdown }
+
+        expect(response).to be_successful
+      end
+    end
+  end
+end
diff --git a/spec/frontend/fixtures/api_markdown.yml b/spec/frontend/fixtures/api_markdown.yml
new file mode 100644
index 00000000000..a83d5374e2c
--- /dev/null
+++ b/spec/frontend/fixtures/api_markdown.yml
@@ -0,0 +1,50 @@
+# This data file drives the specs in
+# spec/frontend/fixtures/api_markdown.rb and
+# spec/frontend/rich_text_editor/extensions/markdown_processing_spec.js
+---
+- name: bold
+  markdown: '**bold**'
+- name: emphasis
+  markdown: '_emphasized text_'
+- name: inline_code
+  markdown: '`code`'
+- name: link
+  markdown: '[GitLab](https://gitlab.com)'
+- name: code_block
+  markdown: |-
+    ```javascript
+      console.log('hello world')
+    ```
+- name: headings
+  markdown: |-
+    # Heading 1
+
+    ## Heading 2
+
+    ### Heading 3
+
+    #### Heading 4
+
+    ##### Heading 5
+
+    ###### Heading 6
+- name: blockquote
+  markdown: |-
+    > This is a blockquote
+    >
+    > This is another one
+- name: thematic_break
+  markdown: |-
+    ---
+- name: bullet_list
+  markdown: |-
+    * list item 1
+    * list item 2
+      * embedded list item 3
+- name: ordered_list
+  markdown: |-
+    1. list item 1
+    2. list item 2
+    3. list item 3
+- name: image
+  markdown: '![alt text](https://gitlab.com/logo.png)'
diff --git a/spec/frontend/fixtures/autocomplete.rb b/spec/frontend/fixtures/autocomplete.rb
new file mode 100644
index 00000000000..8983e241aa5
--- /dev/null
+++ b/spec/frontend/fixtures/autocomplete.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ::AutocompleteController, '(JavaScript fixtures)', type: :controller do
+  include JavaScriptFixturesHelpers
+
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group, name: 'frontend-fixtures') }
+
+  let(:project) { create(:project, namespace: group, path: 'autocomplete-project') }
+  let(:merge_request) { create(:merge_request, source_project: project, author: user) }
+
+  before(:all) do
+    clean_frontend_fixtures('autocomplete/')
+  end
+
+  before do
+    group.add_owner(user)
+    sign_in(user)
+  end
+
+  it 'autocomplete/users.json' do
+    20.times do
+      user = create(:user)
+      project.add_developer(user)
+    end
+
+    get :users,
+        format: :json,
+        params: {
+          project_id: project.id,
+          active: true,
+          current_user: true,
+          author: merge_request.author.id,
+          merge_request_iid: merge_request.iid
+        }
+
+    expect(response).to be_successful
+  end
+end
diff --git a/spec/frontend/fixtures/issues.rb b/spec/frontend/fixtures/issues.rb
index d6f6ed97626..a027247bd0d 100644
--- a/spec/frontend/fixtures/issues.rb
+++ b/spec/frontend/fixtures/issues.rb
@@ -16,8 +16,6 @@ RSpec.describe Projects::IssuesController, '(JavaScript fixtures)', type: :contr
   end
 
   before do
-    stub_feature_flags(boards_filtered_search: false)
-
     project.add_maintainer(user)
     sign_in(user)
   end
diff --git a/spec/frontend/fixtures/merge_requests_diffs.rb b/spec/frontend/fixtures/merge_requests_diffs.rb
index 5ad4176f7b8..edf1fcf3c0a 100644
--- a/spec/frontend/fixtures/merge_requests_diffs.rb
+++ b/spec/frontend/fixtures/merge_requests_diffs.rb
@@ -25,6 +25,10 @@ RSpec.describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)'
   end
 
   before do
+    # Create a user that matches the project.commit author
+    # This is so that the "author" information will be populated
+    create(:user, email: project.commit.author_email, name: project.commit.author_name)
+
     sign_in(user)
   end
 
@@ -33,17 +37,21 @@ RSpec.describe Projects::MergeRequests::DiffsController, '(JavaScript fixtures)'
   end
 
   it 'merge_request_diffs/with_commit.json' do
-    # Create a user that matches the project.commit author
-    # This is so that the "author" information will be populated
-    create(:user, email: project.commit.author_email, name: project.commit.author_name)
-
     render_merge_request(merge_request, commit_id: project.commit.sha)
   end
 
+  it 'merge_request_diffs/diffs_metadata.json' do
+    render_merge_request(merge_request, action: :diffs_metadata)
+  end
+
+  it 'merge_request_diffs/diffs_batch.json' do
+    render_merge_request(merge_request, action: :diffs_batch, page: 1, per_page: 30)
+  end
+
   private
 
-  def render_merge_request(merge_request, view: 'inline', **extra_params)
-    get :show, params: {
+  def render_merge_request(merge_request, action: :show, view: 'inline', **extra_params)
+    get action, params: {
       namespace_id: project.namespace.to_param,
       project_id: project,
       id: merge_request.to_param,
diff --git a/spec/frontend/fixtures/static/mini_dropdown_graph.html b/spec/frontend/fixtures/static/mini_dropdown_graph.html
deleted file mode 100644
index cde811d4f52..00000000000
--- a/spec/frontend/fixtures/static/mini_dropdown_graph.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="js-builds-dropdown-tests dropdown dropdown" data-testid="widget-mini-pipeline-graph">
-  <button class="js-builds-dropdown-button" data-toggle="dropdown" data-stage-endpoint="foobar">
-    Dropdown
-  </button>
-  <ul class="dropdown-menu mini-pipeline-graph-dropdown-menu js-builds-dropdown-container">
-    <li class="js-builds-dropdown-list scrollable-menu">
-      <ul></ul>
-    </li>
-    <li class="js-builds-dropdown-loading hidden">
-      <span class="gl-spinner"></span>
-    </li>
-  </ul>
-</div>
diff --git a/spec/frontend/fixtures/static/whats_new_notification.html b/spec/frontend/fixtures/static/whats_new_notification.html
index 30d5eea91cc..3b4dbdf7d36 100644
--- a/spec/frontend/fixtures/static/whats_new_notification.html
+++ b/spec/frontend/fixtures/static/whats_new_notification.html
@@ -1,5 +1,5 @@
 <div class='whats-new-notification-fixture-root'>
-  <div class='app' data-storage-key='storage-key'></div>
+  <div class='app' data-version-digest='version-digest'></div>
   <div class='header-help'>
     <div class='js-whats-new-notification-count'></div>
   </div>