Add latest changes from gitlab-org/gitlab@16-2-stable-eev16.2.0-rc42

9 files changed, 72 insertions, 179 deletions

diff --git a/spec/frontend/fixtures/groups.rb b/spec/frontend/fixtures/groups.rb
index 9c22ff176ff..e69287c879b 100644
--- a/spec/frontend/fixtures/groups.rb
+++ b/spec/frontend/fixtures/groups.rb
@@ -2,24 +2,39 @@
 
 require 'spec_helper'
 
-RSpec.describe 'Groups (JavaScript fixtures)', type: :controller do
+RSpec.describe 'Groups (JavaScript fixtures)', feature_category: :groups_and_projects do
+  include ApiHelpers
   include JavaScriptFixturesHelpers
 
-  let(:user) { create(:user) }
-  let(:group) { create(:group, name: 'frontend-fixtures-group', runners_token: 'runnerstoken:intabulasreferre') }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group, name: 'frontend-fixtures-group', runners_token: 'runnerstoken:intabulasreferre') }
+  let_it_be(:projects) { create_list(:project, 2, namespace: group) }
 
-  before do
-    group.add_owner(user)
-    sign_in(user)
-  end
+  describe GroupsController, '(JavaScript fixtures)', type: :controller do
+    render_views
 
-  render_views
+    before do
+      group.add_owner(user)
+      sign_in(user)
+    end
 
-  describe GroupsController, '(JavaScript fixtures)', type: :controller do
     it 'groups/edit.html' do
       get :edit, params: { id: group }
 
       expect(response).to be_successful
     end
   end
+
+  describe API::Groups, '(JavaScript fixtures)', type: :request do
+    before do
+      group.add_owner(user)
+      sign_in(user)
+    end
+
+    it 'api/groups/projects/get.json' do
+      get api("/groups/#{group.id}/projects", user)
+
+      expect(response).to be_successful
+    end
+  end
 end
diff --git a/spec/frontend/fixtures/issues.rb b/spec/frontend/fixtures/issues.rb
index e85e683b599..73594ddf686 100644
--- a/spec/frontend/fixtures/issues.rb
+++ b/spec/frontend/fixtures/issues.rb
@@ -105,7 +105,6 @@ RSpec.describe GraphQL::Query, type: :request do
 
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project) }
-  let_it_be(:issue_type) { 'issue' }
 
   before_all do
     project.add_reporter(user)
@@ -128,8 +127,7 @@ RSpec.describe GraphQL::Query, type: :request do
         title: '15.2',
         start_date: Date.new(2020, 7, 1),
         due_date: Date.new(2020, 7, 30)
-      ),
-      issue_type: issue_type
+      )
     )
 
     post_graphql(query, current_user: user, variables: { projectPath: project.full_path, iid: issue.iid.to_s })
diff --git a/spec/frontend/fixtures/metrics_dashboard.rb b/spec/frontend/fixtures/metrics_dashboard.rb
deleted file mode 100644
index 036ce9eea3a..00000000000
--- a/spec/frontend/fixtures/metrics_dashboard.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe MetricsDashboard, '(JavaScript fixtures)', type: :controller do
-  include JavaScriptFixturesHelpers
-  include MetricsDashboardHelpers
-
-  let_it_be(:user) { create(:user) }
-  let_it_be(:namespace) { create(:namespace, name: 'monitoring') }
-  let_it_be(:project) { project_with_dashboard_namespace('.gitlab/dashboards/test.yml', nil, namespace: namespace) }
-  let_it_be(:environment) { create(:environment, id: 1, project: project) }
-  let_it_be(:params) { { environment: environment } }
-
-  controller(::ApplicationController) do
-    include MetricsDashboard
-  end
-
-  before do
-    stub_feature_flags(remove_monitor_metrics: false)
-    sign_in(user)
-    project.add_maintainer(user)
-
-    allow(controller).to receive(:project).and_return(project)
-    allow(controller).to receive(:environment).and_return(environment)
-    allow(controller)
-        .to receive(:metrics_dashboard_params)
-                .and_return(params)
-  end
-
-  after do
-    remove_repository(project)
-  end
-
-  it 'metrics_dashboard/environment_metrics_dashboard.json' do
-    routes.draw { get "metrics_dashboard" => "anonymous#metrics_dashboard" }
-
-    response = get :metrics_dashboard, format: :json
-
-    expect(response).to be_successful
-  end
-end
diff --git a/spec/frontend/fixtures/milestones.rb b/spec/frontend/fixtures/milestones.rb
deleted file mode 100644
index 5e39dcf190a..00000000000
--- a/spec/frontend/fixtures/milestones.rb
+++ /dev/null
@@ -1,43 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Projects::MilestonesController, '(JavaScript fixtures)', :with_license, feature_category: :team_planning, type: :controller do
-  include JavaScriptFixturesHelpers
-
-  let_it_be(:user) { create(:user, feed_token: 'feedtoken:coldfeed') }
-  let_it_be(:namespace) { create(:namespace, name: 'frontend-fixtures') }
-  let_it_be(:project) { create(:project_empty_repo, namespace: namespace, path: 'milestones-project') }
-
-  render_views
-
-  before do
-    project.add_maintainer(user)
-    sign_in(user)
-  end
-
-  after do
-    remove_repository(project)
-  end
-
-  it 'milestones/new-milestone.html' do
-    get :new, params: {
-      namespace_id: project.namespace.to_param,
-      project_id: project
-    }
-
-    expect(response).to be_successful
-  end
-
-  private
-
-  def render_milestone(milestone)
-    get :show, params: {
-      namespace_id: project.namespace.to_param,
-      project_id: project,
-      id: milestone.to_param
-    }
-
-    expect(response).to be_successful
-  end
-end
diff --git a/spec/frontend/fixtures/pipeline_schedules.rb b/spec/frontend/fixtures/pipeline_schedules.rb
index 3bfe9113e83..7bba7910b87 100644
--- a/spec/frontend/fixtures/pipeline_schedules.rb
+++ b/spec/frontend/fixtures/pipeline_schedules.rb
@@ -63,6 +63,12 @@ RSpec.describe 'Pipeline schedules (JavaScript fixtures)' do
       expect_graphql_errors_to_be_empty
     end
 
+    it "#{fixtures_path}#{get_pipeline_schedules_query}.single.json" do
+      post_graphql(query, current_user: user, variables: { projectPath: project.full_path, ids: pipeline_schedule_populated.id })
+
+      expect_graphql_errors_to_be_empty
+    end
+
     it "#{fixtures_path}#{get_pipeline_schedules_query}.as_guest.json" do
       guest = create(:user)
       project.add_guest(user)
diff --git a/spec/frontend/fixtures/static/line_highlighter.html b/spec/frontend/fixtures/static/line_highlighter.html
index 1667097bc3b..4e1795dfcfa 100644
--- a/spec/frontend/fixtures/static/line_highlighter.html
+++ b/spec/frontend/fixtures/static/line_highlighter.html
@@ -1,154 +1,79 @@
 <div class="file-holder">
 <div class="file-content">
 <div class="line-numbers">
-<a data-line-number="1" href="#L1" id="L1">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
+<a  data-line-number="1" href="#L1" id="L1">
 1
 </a>
-<a data-line-number="2" href="#L2" id="L2">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
+<a  data-line-number="2" href="#L2" id="L2">
 2
 </a>
-<a data-line-number="3" href="#L3" id="L3">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
+<a  data-line-number="3" href="#L3" id="L3">
 3
 </a>
-<a data-line-number="4" href="#L4" id="L4">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
+<a  data-line-number="4" href="#L4" id="L4">
 4
 </a>
-<a data-line-number="5" href="#L5" id="L5">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
+<a  data-line-number="5" href="#L5" id="L5">
 5
 </a>
 <a data-line-number="6" href="#L6" id="L6">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 6
 </a>
 <a data-line-number="7" href="#L7" id="L7">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 7
 </a>
 <a data-line-number="8" href="#L8" id="L8">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 8
 </a>
 <a data-line-number="9" href="#L9" id="L9">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 9
 </a>
 <a data-line-number="10" href="#L10" id="L10">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 10
 </a>
 <a data-line-number="11" href="#L11" id="L11">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 11
 </a>
 <a data-line-number="12" href="#L12" id="L12">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 12
 </a>
 <a data-line-number="13" href="#L13" id="L13">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 13
 </a>
 <a data-line-number="14" href="#L14" id="L14">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 14
 </a>
 <a data-line-number="15" href="#L15" id="L15">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 15
 </a>
 <a data-line-number="16" href="#L16" id="L16">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 16
 </a>
 <a data-line-number="17" href="#L17" id="L17">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 17
 </a>
 <a data-line-number="18" href="#L18" id="L18">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 18
 </a>
 <a data-line-number="19" href="#L19" id="L19">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 19
 </a>
 <a data-line-number="20" href="#L20" id="L20">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 20
 </a>
 <a data-line-number="21" href="#L21" id="L21">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 21
 </a>
 <a data-line-number="22" href="#L22" id="L22">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 22
 </a>
 <a data-line-number="23" href="#L23" id="L23">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 23
 </a>
 <a data-line-number="24" href="#L24" id="L24">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 24
 </a>
 <a data-line-number="25" href="#L25" id="L25">
-<svg data-testid="link-icon" class="s12">
-<use href="/assets/icons-795a2ef2fd636a0538bbef3b8d2787dd90927b42d7617fdda8620930016b333d.svg#link"></use>
-</svg>
 25
 </a>
 </div>
diff --git a/spec/frontend/fixtures/static/textarea.html b/spec/frontend/fixtures/static/textarea.html
new file mode 100644
index 00000000000..68d5a0f2d4d
--- /dev/null
+++ b/spec/frontend/fixtures/static/textarea.html
@@ -0,0 +1,27 @@
+<body>
+<meta charset="utf-8">
+<title>Document with Textarea</title>
+<form class="milestone-form common-note-form js-quick-submit js-requires-input" id="new_milestone"
+      action="http://test.host/frontend-fixtures/milestones-project/-/milestones"
+      accept-charset="UTF-8" method="post">
+    <div class="form-group">
+        <div class="md-write-holder">
+            <div class="zen-backdrop">
+                <textarea class="note-textarea js-gfm-input js-autosize markdown-area"
+                          placeholder="Write milestone description..." dir="auto"
+                          data-supports-quick-actions="false" data-supports-autocomplete="true"
+                          data-qa-selector="milestone_description_field" data-autofocus="false"
+                          name="milestone[description]"
+                          id="milestone_description"></textarea>
+                <a class="zen-control zen-control-leave js-zen-leave gl-text-gray-500"
+                   href="#">
+                    <svg class="s16" data-testid="minimize-icon">
+                        <use href="http://test.host/assets/icons-b8c5a9711f73b1de3c81754da0aca72f43b0e6844aa06dd03092b601a493f45b.svg#minimize"></use>
+                    </svg>
+                </a>
+            </div>
+        </div>
+    </div>
+</form>
+
+</body>
diff --git a/spec/frontend/fixtures/timezones.rb b/spec/frontend/fixtures/timezones.rb
index 2393f4e797d..f04e647c8eb 100644
--- a/spec/frontend/fixtures/timezones.rb
+++ b/spec/frontend/fixtures/timezones.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe TimeZoneHelper, '(JavaScript fixtures)' do
   include JavaScriptFixturesHelpers
-  include TimeZoneHelper
+  include described_class
 
   let(:response) { @timezones.sort_by! { |tz| tz[:name] }.to_json }
 
diff --git a/spec/frontend/fixtures/users.rb b/spec/frontend/fixtures/users.rb
index 89bffea7e4c..800a9af194e 100644
--- a/spec/frontend/fixtures/users.rb
+++ b/spec/frontend/fixtures/users.rb
@@ -7,7 +7,8 @@ RSpec.describe 'Users (JavaScript fixtures)', feature_category: :user_profile do
   include ApiHelpers
 
   let_it_be(:followers) { create_list(:user, 5) }
-  let_it_be(:user) { create(:user, followers: followers) }
+  let_it_be(:followees) { create_list(:user, 5) }
+  let_it_be(:user) { create(:user, followers: followers, followees: followees) }
 
   describe API::Users, '(JavaScript fixtures)', type: :request do
     it 'api/users/followers/get.json' do
@@ -15,6 +16,12 @@ RSpec.describe 'Users (JavaScript fixtures)', feature_category: :user_profile do
 
       expect(response).to be_successful
     end
+
+    it 'api/users/following/get.json' do
+      get api("/users/#{user.id}/following", user)
+
+      expect(response).to be_successful
+    end
   end
 
   describe UsersController, '(JavaScript fixtures)', type: :controller do