From 49abdb108a4d3c3f2ef9b27c7c4dcde43da1016a Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 21 Jun 2023 09:09:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/controllers/groups/children_controller_spec.rb | 6 +++--- .../design_management/designs/resized_image_controller_spec.rb | 2 +- spec/controllers/projects/issues_controller_spec.rb | 2 +- spec/controllers/projects/pipelines_controller_spec.rb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'spec/controllers') diff --git a/spec/controllers/groups/children_controller_spec.rb b/spec/controllers/groups/children_controller_spec.rb index ee8b2dce298..82dd8c18cfd 100644 --- a/spec/controllers/groups/children_controller_spec.rb +++ b/spec/controllers/groups/children_controller_spec.rb @@ -222,13 +222,13 @@ RSpec.describe Groups::ChildrenController, feature_category: :groups_and_project control = ActiveRecord::QueryRecorder.new { get_list } _new_project = create(:project, :public, namespace: group) - expect { get_list }.not_to exceed_query_limit(control).with_threshold(expected_queries_per_project) + expect { get_list }.not_to exceed_query_limit(control).with_threshold(expected_queries_per_project + 1) end context 'when rendering hierarchies' do # When loading hierarchies we load the all the ancestors for matched projects - # in 2 separate queries - let(:extra_queries_for_hierarchies) { 2 } + # in 3 separate queries + let(:extra_queries_for_hierarchies) { 3 } def get_filtered_list get :index, params: { group_id: group.to_param, filter: 'filter' }, format: :json diff --git a/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb b/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb index 5ed670a4f0b..b4667b4568f 100644 --- a/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb +++ b/spec/controllers/projects/design_management/designs/resized_image_controller_spec.rb @@ -59,7 +59,7 @@ RSpec.describe Projects::DesignManagement::Designs::ResizedImageController, feat end it 'sets appropriate caching headers' do - expect(response.header['Cache-Control']).to eq('private') + expect(response.header['Cache-Control']).to eq('max-age=0, private, must-revalidate') expect(response.header['ETag']).to be_present end end diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb index 5e9135c00e3..f9ce77a44ba 100644 --- a/spec/controllers/projects/issues_controller_spec.rb +++ b/spec/controllers/projects/issues_controller_spec.rb @@ -1809,7 +1809,7 @@ RSpec.describe Projects::IssuesController, :request_store, feature_category: :te create(:user_status, user: second_discussion.author) expect { get :discussions, params: { namespace_id: project.namespace, project_id: project, id: issue.iid } } - .not_to exceed_query_limit(control) + .not_to exceed_query_limit(control).with_threshold(9) end context 'when user is setting notes filters' do diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb index 8c5f8fc6259..a5542a2b825 100644 --- a/spec/controllers/projects/pipelines_controller_spec.rb +++ b/spec/controllers/projects/pipelines_controller_spec.rb @@ -328,7 +328,7 @@ RSpec.describe Projects::PipelinesController, feature_category: :continuous_inte expect do get_pipeline_html expect(response).to have_gitlab_http_status(:ok) - end.not_to exceed_all_query_limit(control) + end.not_to exceed_all_query_limit(control).with_threshold(3) end end -- cgit v1.2.3