Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 171 deletions

diff --git a/spec/requests/api/graphql/ci/runner_spec.rb b/spec/requests/api/graphql/ci/runner_spec.rb
index 52b548ce8b9..63a657f3962 100644
--- a/spec/requests/api/graphql/ci/runner_spec.rb
+++ b/spec/requests/api/graphql/ci/runner_spec.rb
@@ -74,6 +74,8 @@ RSpec.describe 'Query.runner(id)', feature_category: :runner_fleet do
     end
 
     it 'retrieves expected fields' do
+      stub_commonmark_sourcepos_disabled
+
       post_graphql(query, current_user: user)
 
       runner_data = graphql_data_at(:runner)
diff --git a/spec/requests/projects/metrics_dashboard_spec.rb b/spec/requests/projects/metrics_dashboard_spec.rb
deleted file mode 100644
index 7e94bc6134d..00000000000
--- a/spec/requests/projects/metrics_dashboard_spec.rb
+++ /dev/null
@@ -1,171 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe 'Projects::MetricsDashboardController', feature_category: :metrics do
-  let_it_be(:project) { create(:project) }
-  let_it_be(:environment) { create(:environment, project: project) }
-  let_it_be(:environment2) { create(:environment, project: project) }
-  let_it_be(:user) { project.first_owner }
-
-  before do
-    stub_feature_flags(remove_monitor_metrics: false)
-    project.add_developer(user)
-    login_as(user)
-    stub_feature_flags(remove_monitor_metrics: false)
-  end
-
-  shared_examples 'metrics dashboard is unavailable' do
-    context 'when metrics dashboard feature is unavailable' do
-      before do
-        stub_feature_flags(remove_monitor_metrics: true)
-      end
-
-      it 'returns 404 not found' do
-        send_request
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
-  end
-
-  describe 'GET /:namespace/:project/-/metrics' do
-    include_examples 'metrics dashboard is unavailable'
-
-    it "redirects to default environment's metrics dashboard" do
-      send_request
-      expect(response).to redirect_to(dashboard_route(environment: environment))
-    end
-
-    it 'assigns default_environment' do
-      send_request
-      expect(assigns(:default_environment).id).to eq(environment.id)
-    end
-
-    it 'retains existing parameters when redirecting' do
-      params = {
-        dashboard_path: '.gitlab/dashboards/dashboard_path.yml',
-        page: 'panel/new',
-        group: 'System metrics (Kubernetes)',
-        title: 'Memory Usage (Pod average)',
-        y_label: 'Memory Used per Pod (MB)'
-      }
-      send_request(params)
-
-      expect(response).to redirect_to(dashboard_route(params.merge(environment: environment.id)))
-    end
-
-    context 'with remove_monitor_metrics returning true' do
-      before do
-        stub_feature_flags(remove_monitor_metrics: true)
-      end
-
-      it 'renders 404 page' do
-        send_request
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
-
-    context 'with anonymous user and public dashboard visibility' do
-      let(:anonymous_user) { create(:user) }
-      let(:project) do
-        create(:project, :public, :metrics_dashboard_enabled)
-      end
-
-      before do
-        project.update!(metrics_dashboard_access_level: 'enabled')
-
-        login_as(anonymous_user)
-      end
-
-      it 'returns 200' do
-        send_request
-
-        expect(response).to have_gitlab_http_status(:ok)
-      end
-    end
-  end
-
-  describe 'GET /:namespace/:project/-/metrics?environment=:environment.id' do
-    include_examples 'metrics dashboard is unavailable'
-
-    it 'returns 200' do
-      send_request(environment: environment2.id)
-      expect(response).to have_gitlab_http_status(:ok)
-    end
-
-    it 'assigns query param environment' do
-      send_request(environment: environment2.id)
-      expect(assigns(:environment).id).to eq(environment2.id)
-    end
-
-    context 'when query param environment does not exist' do
-      it 'responds with 404' do
-        send_request(environment: non_existing_record_id)
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
-  end
-
-  describe 'GET /:namespace/:project/-/metrics/:dashboard_path' do
-    let(:dashboard_path) { '.gitlab/dashboards/dashboard_path.yml' }
-
-    include_examples 'metrics dashboard is unavailable'
-
-    it 'returns 200' do
-      send_request(dashboard_path: dashboard_path, environment: environment.id)
-      expect(response).to have_gitlab_http_status(:ok)
-    end
-
-    it 'assigns environment' do
-      send_request(dashboard_path: dashboard_path, environment: environment.id)
-      expect(assigns(:environment).id).to eq(environment.id)
-    end
-  end
-
-  describe 'GET :/namespace/:project/-/metrics/:dashboard_path?environment=:environment.id' do
-    let(:dashboard_path) { '.gitlab/dashboards/dashboard_path.yml' }
-
-    include_examples 'metrics dashboard is unavailable'
-
-    it 'returns 200' do
-      send_request(dahboard_path: dashboard_path, environment: environment.id)
-      expect(response).to have_gitlab_http_status(:ok)
-    end
-
-    it 'assigns query param environment' do
-      send_request(dashboard_path: dashboard_path, environment: environment2.id)
-      expect(assigns(:environment).id).to eq(environment2.id)
-    end
-
-    context 'when query param environment does not exist' do
-      it 'responds with 404' do
-        send_request(dashboard_path: dashboard_path, environment: non_existing_record_id)
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
-  end
-
-  describe 'GET :/namespace/:project/-/metrics/:page' do
-    include_examples 'metrics dashboard is unavailable'
-
-    it 'returns 200 with path param page' do
-      send_request(page: 'panel/new', environment: environment.id)
-
-      expect(response).to have_gitlab_http_status(:ok)
-    end
-
-    it 'returns 200 with dashboard and path param page' do
-      send_request(dashboard_path: 'dashboard.yml', page: 'panel/new', environment: environment.id)
-
-      expect(response).to have_gitlab_http_status(:ok)
-    end
-  end
-
-  def send_request(params = {})
-    get dashboard_route(params)
-  end
-
-  def dashboard_route(params = {})
-    namespace_project_metrics_dashboard_path(namespace_id: project.namespace, project_id: project, **params)
-  end
-end