+ expect(record.description).to include('user-attachment-image')
end
it 'changes link to project blob files' do
@@ -73,6 +76,8 @@ RSpec.describe Gitlab::GithubImport::Importer::NoteAttachmentsImporter, feature_
let(:tmp_stub_doc) { Tempfile.create('attachment_download_test.txt') }
let(:tmp_stub_image) { Tempfile.create('image.jpeg') }
let(:tmp_stub_image_tag) { Tempfile.create('image-tag.jpeg') }
+ let(:tmp_stub_user_attachment) { Tempfile.create('user-attachment.jpeg') }
+
let(:access_token) { 'exampleGitHubToken' }
let(:options) { { headers: { 'Authorization' => )
status)
end
- it 'sets the MR to merge when the pipeline succeeds' do
+ it 'sets the MR to merge when checks pass' do
expect_next_instance_of(service_class) do |service|
expect(service).to receive(:execute).with(merge_request)
allow(service).to receive(:available_for?).and_return(true)
@@ -16,6 +16,18 @@ RSpec.shared_examples 'api merge with auto merge' do
set_auto_merge
end
+ context 'when the merge request is not mergable' do
+ before do
+ merge_request.update!(title: "Draft: #{merge_request.title}")
+ end
+
+ it 'returns the correct auto merge strategy' do
+ set_auto_merge
+
+ expect(json_response).to eq('status' => status)
+ end
+ end
+
context 'for logging' do
let(:expected_params) { { merge_action_status: status } }
let(:subject_proc) { proc { subject } }
diff --git a/spec/support/shared_examples/features/work_items/work_items_list_shared_examples.rb b/spec/support/shared_examples/features/work_items/work_items_list_shared_examples.rb
new file mode 100644
index 00000000000..af6e7b04b49
--- /dev/null
+++ b/spec/support/shared_examples/features/work_items/work_items_list_shared_examples.rb
@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'no work items in the list' do
+ it 'shows message when there are no items in the list' do
+ expect(page).to have_content("No results found")
+ end
+end
+
+RSpec.shared_examples 'shows open items in the list' do
+ it 'loads the open items' do
+ within('.issuable-list') do
+ expect(page).to have_link(open_item.title)
+ .and have_no_link(closed_item.title)
+ end
+ end
+end
+
+RSpec.shared_examples 'shows closed items in the list' do
+ it 'load the closed items' do
+ within('.issuable-list') do
+ expect(page).to have_no_link(open_item.title)
+ .and have_link(closed_item.title)
+ end
+ end
+end
+
+RSpec.shared_examples 'shows all items in the list' do
+ it 'load all the items' do
+ within('.issuable-list') do
+ expect(page).to have_link(open_item.title)
+ .and have_link(closed_item.title)
+ end
+ end
+end
+
+RSpec.shared_examples 'do not shows items in the list' do
+ it 'load all the items' do
+ within('.issuable-list') do
+ expect(page).to have_no_link(open_item.title)
+ .and have_no_link(closed_item.title)
+ end
+ end
+end
+
+RSpec.shared_examples 'dates on the work items list' do |date|
+ it 'renders the date' do
+ expect(find_by_testid('issuable-due-date-title').text).to have_text(date)
+ end
+end
+
+RSpec.shared_examples 'pagination on the work items list page' do
+ it 'displays default page size of 20 items with correct dropdown text' do
+ expect(page).to have_selector(issuable_container, count: 20)
+
+ expect(page).to have_button _('Show 20 items')
+
+ expect(page).to have_button _('Next')
+ expect(page).to have_button _('Previous'), disabled: true
+ end
+
+ it 'navigates through pages using Next and Previous buttons' do
+ expect(page).to have_button _('Previous'), disabled: true
+ expect(page).to have_button _('Next'), disabled: false
+
+ click_button _('Next')
+
+ expect(page).to have_button _('Previous'), disabled: false
+ expect(page).to have_button _('Next'), disabled: true
+
+ expect(page).to have_selector(issuable_container, count: 5)
+
+ click_button _('Previous')
+
+ expect(page).to have_button _('Previous'), disabled: true
+ expect(page).to have_button _('Next'), disabled: false
+ expect(page).to have_selector(issuable_container, count: 20)
+ end
+
+ it 'changes page size and updates display accordingly' do
+ click_button _('Show 20 items')
+
+ within_testid('list-footer') do
+ find('[role="option"]', text: _('Show 50 items')).click
+ end
+
+ expect(page).to have_selector(issuable_container, count: 25)
+
+ expect(page).not_to have_button _('Next'), disabled: true
+ expect(page).not_to have_button _('Previous'), disabled: true
+ end
+end
diff --git a/spec/workers/authorized_project_update/user_refresh_with_low_urgency_worker_spec.rb b/spec/workers/authorized_project_update/user_refresh_with_low_urgency_worker_spec.rb
index 6176f2f2445..9a1db4bad5c 100644
--- a/spec/workers/authorized_project_update/user_refresh_with_low_urgency_worker_spec.rb
+++ b/spec/workers/authorized_project_update/user_refresh_with_low_urgency_worker_spec.rb
@@ -17,5 +17,9 @@ RSpec.describe AuthorizedProjectUpdate::UserRefreshWithLowUrgencyWorker, feature
)
end
+ it 'is cpu-bound' do
+ expect(described_class.get_worker_resource_boundary).to eq(:cpu)
+ end
+
it_behaves_like "refreshes user's project authorizations"
end
diff --git a/spec/workers/authorized_projects_worker_spec.rb b/spec/workers/authorized_projects_worker_spec.rb
index 32e4cfbde0e..1dd4dc7bcc3 100644
--- a/spec/workers/authorized_projects_worker_spec.rb
+++ b/spec/workers/authorized_projects_worker_spec.rb
@@ -13,5 +13,9 @@ RSpec.describe AuthorizedProjectsWorker, feature_category: :permissions do
)
end
+ it 'is cpu-bound' do
+ expect(described_class.get_worker_resource_boundary).to eq(:cpu)
+ end
+
it_behaves_like "refreshes user's project authorizations"
end
diff --git a/spec/workers/projects/post_creation_worker_spec.rb b/spec/workers/projects/post_creation_worker_spec.rb
index 1d02f768dbe..cf1edc28746 100644
--- a/spec/workers/projects/post_creation_worker_spec.rb
+++ b/spec/workers/projects/post_creation_worker_spec.rb
@@ -75,7 +75,13 @@ RSpec.describe Projects::PostCreationWorker, feature_category: :source_code_mana
end
it 'cleans invalid record and logs warning', :aggregate_failures do
- invalid_integration_record = build(:prometheus_integration, properties: { api_url: nil, manual_configuration: true })
+ invalid_integration_record = build(
+ :prometheus_integration,
+ properties: { api_url: nil, manual_configuration: true },
+ project: build(:project),
+ group: build(:group)
+ )
+
allow(::Integrations::Prometheus).to receive(:new).and_return(invalid_integration_record)
expect(Gitlab::ErrorTracking).to receive(:track_exception).with(an_instance_of(ActiveRecord::RecordInvalid), include(extra: { project_id: a_kind_of(Integer) })).twice
diff --git a/yarn.lock b/yarn.lock
index ff0e1100830..d6be1438630 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1353,7 +1353,7 @@
"@floating-ui/core" "^1.7.1"
"@floating-ui/utils" "^0.2.9"
-"@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.7.2":
+"@floating-ui/dom@1.7.2", "@floating-ui/dom@^1.0.0", "@floating-ui/dom@^1.7.2":
version "1.7.2"
resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.7.2.tgz#3540b051cf5ce0d4f4db5fb2507a76e8ea5b4a45"
integrity sha512-7cfaOQuCS27HD7DX+6ib2OrnW+b4ZBwDNnCcT0uTyidcmyWb03FnQqJybDBoCnpdxwBSfA94UAYlRCt7mV+TbA==
@@ -1397,12 +1397,12 @@
core-js "^3.29.1"
mitt "^3.0.1"
-"@gitlab/duo-ui@^8.24.0":
- version "8.24.0"
- resolved "https://registry.yarnpkg.com/@gitlab/duo-ui/-/duo-ui-8.24.0.tgz#096b410ea2483e0f632a23b69f97a7ae9ffc97c5"
- integrity sha512-Vn0AEdy0+Bc4YBPwY8w07Em1n/E7vjQIsWP6AAztSQv4VO5JUVNRouZb/ZUSFJD0s8fGcv+tIH8uJNlFFim9Xw==
+"@gitlab/duo-ui@^10.0.0":
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/duo-ui/-/duo-ui-10.0.0.tgz#b4a60bb409bd8212031cf802fb5385aee7842a9f"
+ integrity sha512-Msr8H6j3muTK4l9laa8/9cf0mpn+7T755CcEOVPd01L7pnbJfYCUSK7TjdZfdJtX82OCRyfHGtlRG0B0pxbqoA==
dependencies:
- "@floating-ui/dom" "1.7.1"
+ "@floating-ui/dom" "1.7.2"
echarts "^5.3.2"
iframe-resizer "^4.3.2"
lodash "^4.17.20"
@@ -1440,7 +1440,7 @@
resolved "https://registry.yarnpkg.com/@gitlab/fonts/-/fonts-1.3.0.tgz#df89c1bb6714e4a8a5d3272568aa4de7fb337267"
integrity sha512-DoMUIN3DqjEn7wvcxBg/b7Ite5fTdF5EmuOZoBRo2j0UBGweDXmNBi+9HrTZs4cBU660dOxcf1hATFcG3npbPg==
-"@gitlab/noop@^1.0.1":
+"@gitlab/noop@^1.0.1", jackspeak@^3.1.2, "jackspeak@npm:@gitlab/noop@1.0.1":
version "1.0.1"
resolved "https://registry.yarnpkg.com/@gitlab/noop/-/noop-1.0.1.tgz#71a831146ee02732b4a61d2d3c11204564753454"
integrity sha512-s++4wjMYeDvBp9IO59DBrWjy8SE/gFkjTDO5ck2W0S6Vv7OlqgErwL7pHngAnrSmTJAzyUG8wHGqo0ViS4jn5Q==
@@ -9509,11 +9509,6 @@ istanbul-reports@^3.1.3:
html-escaper "^2.0.0"
istanbul-lib-report "^3.0.0"
-jackspeak@^3.1.2, "jackspeak@npm:@gitlab/noop@1.0.1":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@gitlab/noop/-/noop-1.0.1.tgz#71a831146ee02732b4a61d2d3c11204564753454"
- integrity sha512-s++4wjMYeDvBp9IO59DBrWjy8SE/gFkjTDO5ck2W0S6Vv7OlqgErwL7pHngAnrSmTJAzyUG8wHGqo0ViS4jn5Q==
-
jed@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/jed/-/jed-1.1.1.tgz#7a549bbd9ffe1585b0cd0a191e203055bee574b4"