{
lists: lists || [
[
{
+ id: 'assigned',
title: 'Assigned merge requests',
query: 'assignedMergeRequests',
variables: { state: 'opened' },
@@ -120,6 +121,7 @@ describe('Merge requests app component', () => {
[
[
{
+ id: 'assigned',
title: 'Assigned merge requests',
query: 'assignedMergeRequests',
variables: { state: 'opened' },
@@ -140,6 +142,7 @@ describe('Merge requests app component', () => {
[
[
{
+ id: 'assigned',
title: 'Assigned merge requests',
query: 'assignedMergeRequests',
variables: { state: 'opened' },
@@ -147,6 +150,7 @@ describe('Merge requests app component', () => {
],
[
{
+ id: 'reviewer',
title: 'Assigned merge requests',
query: 'assignedMergeRequests',
variables: { state: 'opened' },
diff --git a/spec/frontend/merge_request_dashboard/components/merge_request_spec.js b/spec/frontend/merge_request_dashboard/components/merge_request_spec.js
index 54be1d26950..72d22f4b8f8 100644
--- a/spec/frontend/merge_request_dashboard/components/merge_request_spec.js
+++ b/spec/frontend/merge_request_dashboard/components/merge_request_spec.js
@@ -11,6 +11,8 @@ Vue.use(VueApollo);
describe('Merge request dashboard merge request component', () => {
let wrapper;
+ const findBrokenBadge = () => wrapper.findByTestId('mr-broken-badge');
+
function createComponent(mergeRequest = {}, newListsEnabled = false) {
const mockApollo = createMockApollo();
@@ -22,6 +24,7 @@ describe('Merge request dashboard merge request component', () => {
propsData: {
listId: 'returned_to_you',
mergeRequest: {
+ state: 'opened',
reference: '!123456',
title: 'Merge request title',
author: {
@@ -117,5 +120,16 @@ describe('Merge request dashboard merge request component', () => {
expect(wrapper.findComponent(StatusBadge).exists()).toBe(true);
});
+
+ it.each`
+ state | exists | test
+ ${'opened'} | ${true} | ${'renders'}
+ ${'closed'} | ${false} | ${'does not render'}
+ ${'merged'} | ${false} | ${'does not render'}
+ `('$test broken badge when state is $state', ({ state, exists }) => {
+ createComponent({ state }, true);
+
+ expect(findBrokenBadge().exists()).toBe(exists);
+ });
});
});
diff --git a/spec/frontend/merge_request_dashboard/mock_data.js b/spec/frontend/merge_request_dashboard/mock_data.js
index 8763a3552ce..c850a16228a 100644
--- a/spec/frontend/merge_request_dashboard/mock_data.js
+++ b/spec/frontend/merge_request_dashboard/mock_data.js
@@ -5,6 +5,7 @@ export function createMockMergeRequest(mergeRequest = {}) {
title: 'Title',
webUrl: '/',
draft: false,
+ state: 'opened',
author: {
id: 1,
avatarUrl: '/',
diff --git a/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap b/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
index 609f01dfbae..b8246a6fb4f 100644
--- a/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
+++ b/spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
@@ -40,7 +40,7 @@ exports[`Snippet Description Edit component rendering matches the snapshot 1`] =
id="reference-0"
placeholder="Describe what your snippet does or how to use itβ¦"
rows="3"
- style="overflow-x: hidden; word-wrap: break-word; overflow-y: hidden;"
+ style="overflow-x: hidden; word-wrap: break-word;"
/>
{
});
it.each`
- index | expectedDate
- ${0} | ${'2024-12-18T14:24:00.000Z'}
- ${1} | ${'2024-12-18T17:24:00.000Z'}
- ${2} | ${'2024-12-19T08:00:00.000Z'}
+ index | expectedDate | expectedTrackingLabel
+ ${0} | ${'2024-12-18T14:24:00.000Z'} | ${'snooze_for_one_hour'}
+ ${1} | ${'2024-12-18T17:24:00.000Z'} | ${'snooze_until_later_today'}
+ ${2} | ${'2024-12-19T08:00:00.000Z'} | ${'snooze_until_tomorrow'}
`(
'triggers the snooze action with snoozeUntil = $expectedDate when clicking option #$index',
- ({ index, expectedDate }) => {
+ ({ index, expectedDate, expectedTrackingLabel }) => {
createComponent({ props: { isSnoozed: false, isPending: true } });
-
+ const trackingSpy = mockTracking(undefined, wrapper.element, jest.spyOn);
getPredefinedSnoozingOption(index).action();
expect(snoozeTodoMutationSuccessHandler).toHaveBeenCalledWith({
snoozeUntil: new Date(expectedDate),
todoId: mockTodo.id,
});
+ expect(trackingSpy).toHaveBeenCalledWith(undefined, 'click_todo_item_action', {
+ label: expectedTrackingLabel,
+ });
+
+ unmockTracking();
},
);
@@ -265,13 +271,18 @@ describe('ToggleSnoozedStatus', () => {
props: { isSnoozed: true, isPending: true },
unSnoozeTodoMutationHandler: jest.fn().mockRejectedValue(),
});
-
+ const trackingSpy = mockTracking(undefined, wrapper.element, jest.spyOn);
findUnSnoozeButton().vm.$emit('click');
await waitForPromises();
expect(mockToastShow).toHaveBeenCalledWith('Failed to un-snooze todo. Try again later.', {
variant: 'danger',
});
+ expect(trackingSpy).toHaveBeenCalledWith(undefined, 'click_todo_item_action', {
+ label: 'remove_snooze',
+ });
+
+ unmockTracking();
});
it('has a tooltip attached', () => {
diff --git a/spec/frontend/vue_shared/components/diff_stats_dropdown_spec.js b/spec/frontend/vue_shared/components/diff_stats_dropdown_spec.js
index e2c3fc89525..eee576f8b79 100644
--- a/spec/frontend/vue_shared/components/diff_stats_dropdown_spec.js
+++ b/spec/frontend/vue_shared/components/diff_stats_dropdown_spec.js
@@ -79,7 +79,7 @@ describe('Diff Stats Dropdown', () => {
expect(fileText).toContain(mockFiles[1].name);
expect(fileText).toContain(mockFiles[1].path);
expect(fileData.findComponent(GlIcon).props('name')).toEqual(mockFiles[1].icon);
- expect(fileData.findComponent(GlIcon).classes()).toContain('gl-text-red-500');
+ expect(fileData.findComponent(GlIcon).classes()).toContain('gl-text-danger');
expect(fileData.find('a').attributes('href')).toEqual(mockFiles[1].href);
});
diff --git a/spec/frontend/vue_shared/components/markdown/markdown_editor_spec.js b/spec/frontend/vue_shared/components/markdown/markdown_editor_spec.js
index 039c9b69ed9..c17d20d4eef 100644
--- a/spec/frontend/vue_shared/components/markdown/markdown_editor_spec.js
+++ b/spec/frontend/vue_shared/components/markdown/markdown_editor_spec.js
@@ -260,13 +260,6 @@ describe('vue_shared/component/markdown/markdown_editor', () => {
});
describe('autosize', () => {
- it('autosizes the textarea when the value changes', async () => {
- buildWrapper();
- await findTextarea().setValue('Lots of newlines\n\n\n\n\n\n\nMore content\n\n\nand newlines');
- await nextTick();
- expect(Autosize.update).toHaveBeenCalled();
- });
-
it('autosizes the textarea when the value changes from outside the component', async () => {
buildWrapper();
wrapper.setProps({ value: 'Lots of newlines\n\n\n\n\n\n\nMore content\n\n\nand newlines' });
diff --git a/spec/helpers/merge_requests_helper_spec.rb b/spec/helpers/merge_requests_helper_spec.rb
index 6d408862f9b..26dbbc25ca1 100644
--- a/spec/helpers/merge_requests_helper_spec.rb
+++ b/spec/helpers/merge_requests_helper_spec.rb
@@ -342,7 +342,6 @@ RSpec.describe MergeRequestsHelper, feature_category: :code_review_workflow do
new_merge_request_path: project_new_merge_request_path(project),
show_export_button: 'true',
issuable_type: :merge_request,
- issuable_count: 5,
email: current_user.notification_email_or_default,
export_csv_path: '/csv-url',
rss_url: '/rss-url',
@@ -455,7 +454,6 @@ RSpec.describe MergeRequestsHelper, feature_category: :code_review_workflow do
is_public_visibility_restricted: 'false',
is_signed_in: 'true',
issuable_type: :merge_request,
- issuable_count: 5,
email: current_user.notification_email_or_default,
rss_url: "/rss-url",
releases_endpoint: group_releases_path(group, format: :json),
diff --git a/spec/lib/gitlab/kas/client_spec.rb b/spec/lib/gitlab/kas/client_spec.rb
index ef88a159a99..07277f0f926 100644
--- a/spec/lib/gitlab/kas/client_spec.rb
+++ b/spec/lib/gitlab/kas/client_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe Gitlab::Kas::Client do
+RSpec.describe Gitlab::Kas::Client, feature_category: :deployment_management do
let_it_be(:project) { create(:project) }
let_it_be(:agent) { create(:cluster_agent, project: project) }
@@ -146,6 +146,9 @@ RSpec.describe Gitlab::Kas::Client do
end
context 'when autoflow_enabled FF is enabled' do
+ let_it_be(:autoflow_var1) { create(:ci_variable, project: project, key: 'test_key_1', value: 'test-value-1', environment_scope: 'autoflow/internal-use') }
+ let_it_be(:autoflow_var2) { create(:ci_variable, project: project, key: 'test_key_2', value: 'test-value-2', environment_scope: 'autoflow/internal-use') }
+ let_it_be(:other_var) { create(:ci_variable, project: project, key: 'test_key_3', value: 'test-value-3') }
let(:stub) { instance_double(Gitlab::Agent::AutoFlow::Rpc::AutoFlow::Stub) }
let(:request) { instance_double(Gitlab::Agent::AutoFlow::Rpc::CloudEventRequest) }
let(:event_param) { instance_double(Gitlab::Agent::Event::CloudEvent) }
@@ -175,7 +178,14 @@ RSpec.describe Gitlab::Kas::Client do
.and_return(event_param)
expect(Gitlab::Agent::AutoFlow::Rpc::CloudEventRequest).to receive(:new)
- .with(event: event_param, flow_project: project_param)
+ .with(
+ event: event_param,
+ flow_project: project_param,
+ variables: {
+ "test_key_1" => "test-value-1",
+ "test_key_2" => "test-value-2"
+ }
+ )
.and_return(request)
expect(stub).to receive(:cloud_event)
diff --git a/spec/lib/gitlab/middleware/go_spec.rb b/spec/lib/gitlab/middleware/go_spec.rb
index 0760a01ebae..08efbab9442 100644
--- a/spec/lib/gitlab/middleware/go_spec.rb
+++ b/spec/lib/gitlab/middleware/go_spec.rb
@@ -64,16 +64,6 @@ RSpec.describe Gitlab::Middleware::Go, feature_category: :source_code_management
it 'returns the full project path' do
expect_response_with_path(go, enabled_protocol, project.full_path, url_based: true)
end
-
- context 'when feature flag is disabled' do
- before do
- stub_feature_flags(go_get_handle_relative_url: false)
- end
-
- it 'returns the full project path' do
- expect_response_with_path(go, enabled_protocol, project.full_path, url_based: false)
- end
- end
end
context 'when the project is private' do
diff --git a/spec/lib/search/empty_search_results_spec.rb b/spec/lib/search/empty_search_results_spec.rb
index 6631ba77359..cbaf0aa2348 100644
--- a/spec/lib/search/empty_search_results_spec.rb
+++ b/spec/lib/search/empty_search_results_spec.rb
@@ -17,6 +17,18 @@ RSpec.describe ::Search::EmptySearchResults, feature_category: :global_search do
end
end
+ describe '#blobs_count' do
+ it 'returns a zero' do
+ expect(results.blobs_count).to eq(0)
+ end
+ end
+
+ describe '#file_count' do
+ it 'returns a zero' do
+ expect(results.file_count).to eq(0)
+ end
+ end
+
describe '#highlight_map' do
it 'returns an empty hash' do
expect(results.highlight_map).to eq({})
diff --git a/spec/models/integrations/pipelines_email_spec.rb b/spec/models/integrations/pipelines_email_spec.rb
index 7e80defcb87..6bdb661305a 100644
--- a/spec/models/integrations/pipelines_email_spec.rb
+++ b/spec/models/integrations/pipelines_email_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe Integrations::PipelinesEmail, :mailer do
+RSpec.describe Integrations::PipelinesEmail, :mailer, feature_category: :integrations do
let(:pipeline) do
create(:ci_pipeline, :failed,
project: project,
diff --git a/spec/models/work_item_spec.rb b/spec/models/work_item_spec.rb
index a97bbc08c69..8d4b19251e6 100644
--- a/spec/models/work_item_spec.rb
+++ b/spec/models/work_item_spec.rb
@@ -263,7 +263,7 @@ RSpec.describe WorkItem, feature_category: :portfolio_management do
it 'returns quick action commands supported for all work items' do
is_expected.to include(:title, :reopen, :close, :cc, :tableflip, :shrug, :type, :promote_to, :checkin_reminder,
- :subscribe, :unsubscribe, :confidential, :award)
+ :subscribe, :unsubscribe, :confidential, :award, :move, :clone)
end
it 'omits quick action commands from assignees widget' do
diff --git a/spec/models/work_items/parent_link_spec.rb b/spec/models/work_items/parent_link_spec.rb
index 6ce49c0bac1..47ed9d67300 100644
--- a/spec/models/work_items/parent_link_spec.rb
+++ b/spec/models/work_items/parent_link_spec.rb
@@ -250,6 +250,23 @@ RSpec.describe WorkItems::ParentLink, feature_category: :portfolio_management do
expect(link.valid?).to eq(valid)
end
end
+
+ context 'when parent is confidential' do
+ before do
+ issue.confidential = true
+ task1.confidential = false
+ end
+
+ it 'sets the correct error message' do
+ link = build(:parent_link, work_item_parent: issue, work_item: task1)
+
+ link.valid?
+
+ expect(link.errors[:work_item]).to include(
+ 'cannot assign a non-confidential task to a confidential parent. ' \
+ 'Make the task confidential and try again.')
+ end
+ end
end
end
end
diff --git a/spec/requests/api/ci/secure_files_spec.rb b/spec/requests/api/ci/secure_files_spec.rb
index b973d0b5acc..46e45eaf4ac 100644
--- a/spec/requests/api/ci/secure_files_spec.rb
+++ b/spec/requests/api/ci/secure_files_spec.rb
@@ -5,7 +5,6 @@ require 'spec_helper'
RSpec.describe API::Ci::SecureFiles, feature_category: :mobile_devops do
before do
stub_ci_secure_file_object_storage
- stub_feature_flags(ci_secure_files_read_only: false)
end
let_it_be(:maintainer) { create(:user) }
@@ -24,63 +23,6 @@ RSpec.describe API::Ci::SecureFiles, feature_category: :mobile_devops do
end
describe 'GET /projects/:id/secure_files' do
- context 'ci_secure_files_read_only feature flag' do
- context 'when the flag is enabled' do
- before do
- stub_feature_flags(ci_secure_files_read_only: true)
- end
-
- it 'returns a 503 when attempting to upload a file' do
- stub_feature_flags(ci_secure_files_read_only: true)
-
- expect do
- post api("/projects/#{project.id}/secure_files", maintainer), params: file_params
- end.not_to change { project.secure_files.count }
-
- expect(response).to have_gitlab_http_status(:service_unavailable)
- end
-
- it 'returns a 200 when downloading a file' do
- stub_feature_flags(ci_secure_files_read_only: true)
-
- get api("/projects/#{project.id}/secure_files", developer)
-
- expect(response).to have_gitlab_http_status(:ok)
- expect(json_response).to be_a(Array)
- end
- end
-
- context 'when the feature is disabled at the instance level' do
- before do
- stub_config(ci_secure_files: { enabled: false })
- end
-
- it 'returns a 403 when attempting to upload a file' do
- expect do
- post api("/projects/#{project.id}/secure_files", maintainer), params: file_params
- end.not_to change { project.secure_files.count }
-
- expect(response).to have_gitlab_http_status(:forbidden)
- end
-
- it 'returns a 403 when downloading a file' do
- get api("/projects/#{project.id}/secure_files", developer)
-
- expect(response).to have_gitlab_http_status(:forbidden)
- end
- end
-
- context 'when the flag is disabled' do
- it 'returns a 201 when uploading a file when the ci_secure_files_read_only feature flag is disabled' do
- expect do
- post api("/projects/#{project.id}/secure_files", maintainer), params: file_params
- end.to change { project.secure_files.count }.by(1)
-
- expect(response).to have_gitlab_http_status(:created)
- end
- end
- end
-
context 'authenticated user with admin permissions' do
it 'returns project secure files' do
get api("/projects/#{project.id}/secure_files", maintainer)
diff --git a/spec/requests/groups/bulk_placeholder_assignments_controller_spec.rb b/spec/requests/groups/bulk_placeholder_assignments_controller_spec.rb
new file mode 100644
index 00000000000..55a89037614
--- /dev/null
+++ b/spec/requests/groups/bulk_placeholder_assignments_controller_spec.rb
@@ -0,0 +1,158 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Groups::BulkPlaceholderAssignmentsController, feature_category: :importers do
+ include WorkhorseHelpers
+
+ let_it_be(:user) { create(:user) }
+ let_it_be(:group) { create(:group, :public, owners: user) }
+ let(:file) { fixture_file_upload('spec/fixtures/import/user_mapping/user_mapping_upload.csv') }
+
+ describe 'GET /groups/*group_id/-/group_members/bulk_reassignment_file' do
+ subject(:request) do
+ get group_bulk_reassignment_file_path(group_id: group)
+ end
+
+ context 'when not signed in' do
+ it 'forbids access to the endpoint' do
+ request
+
+ expect(response).to have_gitlab_http_status(:forbidden)
+ end
+ end
+
+ context 'when signed in' do
+ before do
+ sign_in(user)
+ end
+
+ it 'responds with CSV data' do
+ request
+
+ expect(response).to have_gitlab_http_status(:success)
+ end
+
+ context 'and the user is not a group owner' do
+ let_it_be(:group) { create(:group, :public) }
+
+ it 'forbids access to the endpoint' do
+ request
+
+ expect(response).to have_gitlab_http_status(:forbidden)
+ end
+ end
+
+ context 'and the CSV is not generated properly' do
+ before do
+ allow_next_instance_of(Import::SourceUsers::GenerateCsvService) do |service|
+ allow(service).to receive(:execute).and_return(ServiceResponse.error(message: 'my error message'))
+ end
+ end
+
+ it 'redirects with an error' do
+ request
+
+ expect(response).to be_redirect
+ expect(flash[:alert]).to eq('my error message')
+ end
+ end
+
+ context 'when :importer_user_mapping_reassignment_csv is disabled' do
+ before do
+ stub_feature_flags(importer_user_mapping_reassignment_csv: false)
+ end
+
+ it 'responds with 404' do
+ request
+
+ expect(response).to have_gitlab_http_status(:not_found)
+ end
+ end
+ end
+ end
+
+ describe 'POST /groups/*group_id/-/group_members/bulk_reassignment_file' do
+ let(:file) { fixture_file_upload('spec/fixtures/import/user_mapping/user_mapping_upload.csv') }
+
+ subject(:request) do
+ workhorse_post_with_file(
+ group_bulk_reassignment_file_path(group_id: group, format: :json),
+ file_key: :file,
+ params: { file: file }
+ )
+ end
+
+ context 'when signed in' do
+ before do
+ sign_in(user)
+ end
+
+ it 'responds with success' do
+ request
+
+ expect(response).to have_gitlab_http_status(:ok)
+ end
+
+ context 'and the user is not a group owner' do
+ let_it_be(:group) { create(:group, :public) }
+
+ it 'forbids access to the endpoint' do
+ request
+
+ expect(response).to have_gitlab_http_status(:forbidden)
+ end
+ end
+
+ context 'and the file is not a CSV' do
+ let(:file) { fixture_file_upload('spec/fixtures/dk.png') }
+
+ it 'returns unprocessable_entity' do
+ request
+
+ expect(response).to have_gitlab_http_status(:unprocessable_entity)
+ end
+ end
+
+ context 'when :importer_user_mapping_reassignment_csv is disabled' do
+ before do
+ stub_feature_flags(importer_user_mapping_reassignment_csv: false)
+ end
+
+ it 'responds with 404' do
+ request
+
+ expect(response).to have_gitlab_http_status(:not_found)
+ end
+ end
+ end
+
+ context 'when not signed in' do
+ it 'forbids access to the endpoint' do
+ request
+
+ expect(response).to have_gitlab_http_status(:forbidden)
+ end
+ end
+ end
+
+ describe 'POST /groups/*group_id/-/group_members/bulk_reassignment_file/authorize' do
+ include_context 'workhorse headers'
+
+ subject(:request) do
+ post authorize_group_bulk_reassignment_file_path(group_id: group, format: :json),
+ params: { file: file },
+ headers: workhorse_headers
+ end
+
+ before do
+ sign_in(user)
+ end
+
+ it 'responds with success' do
+ request
+
+ expect(response).to have_gitlab_http_status(:ok)
+ end
+ end
+end
diff --git a/spec/requests/groups/group_members_controller_spec.rb b/spec/requests/groups/group_members_controller_spec.rb
index 1e51a3598ca..991520c135d 100644
--- a/spec/requests/groups/group_members_controller_spec.rb
+++ b/spec/requests/groups/group_members_controller_spec.rb
@@ -30,73 +30,4 @@ RSpec.describe Groups::GroupMembersController, feature_category: :groups_and_pro
it_behaves_like 'request_accessable'
end
-
- describe 'GET /groups/*group_id/-/group_members/bulk_reassignment_file' do
- let_it_be(:membershipable) do
- create(:group, :public).tap do |group|
- group.add_owner(user)
- end
- end
-
- subject(:request) do
- get bulk_reassignment_file_group_group_members_path(group_id: membershipable)
- end
-
- context 'when not signed in' do
- it 'forbids access to the endpoint' do
- request
-
- expect(response).to have_gitlab_http_status(:forbidden)
- end
- end
-
- context 'when signed in' do
- before do
- sign_in(user)
- end
-
- it 'responds with CSV data' do
- request
-
- expect(response).to have_gitlab_http_status(:success)
- end
-
- context 'and the user is not a group owner' do
- let_it_be(:membershipable) { create(:group, :public) }
-
- it 'forbids access to the endpoint' do
- request
-
- expect(response).to have_gitlab_http_status(:forbidden)
- end
- end
-
- context 'and the CSV is not generated properly' do
- before do
- allow_next_instance_of(Import::SourceUsers::GenerateCsvService) do |service|
- allow(service).to receive(:execute).and_return(ServiceResponse.error(message: 'my error message'))
- end
- end
-
- it 'redirects with an error' do
- request
-
- expect(response).to be_redirect
- expect(flash[:alert]).to eq('my error message')
- end
- end
-
- context 'when :importer_user_mapping_reassignment_csv is disabled' do
- before do
- stub_feature_flags(importer_user_mapping_reassignment_csv: false)
- end
-
- it 'responds with 404' do
- request
-
- expect(response).to have_gitlab_http_status(:not_found)
- end
- end
- end
- end
end
diff --git a/spec/services/issues/clone_service_spec.rb b/spec/services/issues/clone_service_spec.rb
index 4666e199c29..e26cce23689 100644
--- a/spec/services/issues/clone_service_spec.rb
+++ b/spec/services/issues/clone_service_spec.rb
@@ -51,6 +51,27 @@ RSpec.describe Issues::CloneService, feature_category: :team_planning do
end
end
+ # We will use this service in order to clone WorkItem to a new project. As WorkItem inherits from Issue, there
+ # should not be any problem with passing a WorkItem instead of an Issue to this service.
+ # Adding a small test case to cover this.
+ context "when we pass a work_item" do
+ include_context 'user can clone issue'
+
+ subject(:clone) { clone_service.execute(original_work_item, new_project) }
+
+ context "work item is of issue type" do
+ let_it_be_with_reload(:original_work_item) { create(:work_item, :issue, project: old_project, author: author) }
+
+ it { expect { clone }.to change { new_project.issues.count }.by(1) }
+ end
+
+ context "work item is of task type" do
+ let_it_be_with_reload(:original_work_item) { create(:work_item, :task, project: old_project, author: author) }
+
+ it { expect { clone }.to raise_error(described_class::CloneError) }
+ end
+ end
+
context 'generic issue' do
let!(:new_issue) { clone_service.execute(old_issue, new_project, with_notes: with_notes) }
diff --git a/spec/services/issues/move_service_spec.rb b/spec/services/issues/move_service_spec.rb
index 63e907b5333..f22785e1b82 100644
--- a/spec/services/issues/move_service_spec.rb
+++ b/spec/services/issues/move_service_spec.rb
@@ -44,6 +44,27 @@ RSpec.describe Issues::MoveService, feature_category: :team_planning do
let!(:new_issue) { move_service.execute(old_issue, new_project) }
end
+ # We will use this service in order to move WorkItem to a new project. As WorkItem inherits from Issue, there
+ # should not be any problem with passing a WorkItem instead of an Issue to this service.
+ # Adding a small test case to cover this.
+ context "when we pass a work_item" do
+ include_context 'user can move issue'
+
+ subject(:move) { move_service.execute(original_work_item, new_project) }
+
+ context "work item is of issue type" do
+ let_it_be_with_reload(:original_work_item) { create(:work_item, :issue, project: old_project, author: author) }
+
+ it { expect { move }.to change { new_project.issues.count }.by(1) }
+ end
+
+ context "work item is of task type" do
+ let_it_be_with_reload(:original_work_item) { create(:work_item, :task, project: old_project, author: author) }
+
+ it { expect { move }.to raise_error(described_class::MoveError) }
+ end
+ end
+
context 'when issue creation fails' do
include_context 'user can move issue'
diff --git a/spec/services/quick_actions/interpret_service_spec.rb b/spec/services/quick_actions/interpret_service_spec.rb
index 620a0cf733b..2c61336317a 100644
--- a/spec/services/quick_actions/interpret_service_spec.rb
+++ b/spec/services/quick_actions/interpret_service_spec.rb
@@ -654,6 +654,43 @@ RSpec.describe QuickActions::InterpretService, feature_category: :text_editors d
expect(message).to eq(_("Failed to move this issue because target project doesn't exist."))
end
+
+ context "when we pass a work_item" do
+ let(:work_item) { create(:work_item, :issue) }
+ let(:move_command) { "/move #{project.full_path}" }
+
+ it '/move execution method message' do
+ _, _, message = service.execute(move_command, work_item)
+
+ expect(message).to eq("Moved this issue to #{project.full_path}.")
+ end
+ end
+ end
+
+ describe 'clone issue command' do
+ it 'returns the clone issue message' do
+ _, _, message = service.execute("/clone #{project.full_path}", issue)
+ translated_string = _("Cloned this issue to %{project_full_path}.")
+ formatted_message = format(translated_string, project_full_path: project.full_path.to_s)
+
+ expect(message).to eq(formatted_message)
+ end
+
+ it 'returns clone issue failure message when the referenced issue is not found' do
+ _, _, message = service.execute('/clone invalid', issue)
+
+ expect(message).to eq(_("Failed to clone this issue because target project doesn't exist."))
+ end
+
+ context "when we pass a work_item" do
+ let(:work_item) { create(:work_item, :issue, project: project) }
+
+ it '/clone execution method message' do
+ _, _, message = service.execute("/clone #{project.full_path}", work_item)
+
+ expect(message).to eq("Cloned this issue to #{project.full_path}.")
+ end
+ end
end
shared_examples 'confidential command' do
@@ -3533,6 +3570,37 @@ RSpec.describe QuickActions::InterpretService, feature_category: :text_editors d
expect(explanations).to eq([_("Moves this issue to test/project.")])
end
+
+ context "when work item type is an issue" do
+ let(:move_command) { "/move test/project" }
+ let(:work_item) { create(:work_item, :issue, project: project) }
+
+ it "/move is available" do
+ _, explanations = service.explain(move_command, work_item)
+
+ expect(explanations).to match_array(["Moves this issue to test/project."])
+ end
+ end
+ end
+
+ describe 'clone issue to another project command' do
+ let(:content) { '/clone test/project' }
+
+ it 'includes the project name' do
+ _, explanations = service.explain(content, issue)
+
+ expect(explanations).to match_array([_("Clones this issue, without comments, to test/project.")])
+ end
+
+ context "when work item type is an issue" do
+ let(:work_item) { create(:work_item, :issue, project: project) }
+
+ it "/clone is available" do
+ _, explanations = service.explain("/clone test/project", work_item)
+
+ expect(explanations).to match_array(["Clones this issue, without comments, to test/project."])
+ end
+ end
end
describe 'tag a commit' do
@@ -3952,5 +4020,25 @@ RSpec.describe QuickActions::InterpretService, feature_category: :text_editors d
)
end
end
+
+ context 'when target is a work item type of issue' do
+ let(:target) { create(:work_item, :issue) }
+
+ context "when work_item supports move and clone commands" do
+ it 'does recognize the actions' do
+ expect(service.available_commands(target).pluck(:name)).to include(:move, :clone)
+ end
+ end
+
+ context "when work_item does not support move and clone commands" do
+ before do
+ allow(target).to receive(:supports_move_and_clone?).and_return(false)
+ end
+
+ it 'does not recognize the action' do
+ expect(service.available_commands(target).pluck(:name)).not_to include(:move, :clone)
+ end
+ end
+ end
end
end
diff --git a/workhorse/_support/lint_last_known_acceptable.txt b/workhorse/_support/lint_last_known_acceptable.txt
index cc8bd1b2dfc..3c379d394dd 100644
--- a/workhorse/_support/lint_last_known_acceptable.txt
+++ b/workhorse/_support/lint_last_known_acceptable.txt
@@ -88,9 +88,9 @@ internal/upload/destination/objectstore/upload_strategy.go:29: internal/upload/d
internal/upload/destination/objectstore/uploader.go:5:2: G501: Blocklisted import crypto/md5: weak cryptographic primitive (gosec)
internal/upload/destination/objectstore/uploader.go:95:12: G401: Use of weak cryptographic primitive (gosec)
internal/upload/exif/exif.go:103:10: G204: Subprocess launched with variable (gosec)
-internal/upstream/routes.go:170:74: `(*upstream).wsRoute` - `matchers` always receives `nil` (unparam)
-internal/upstream/routes.go:230: Function 'configureRoutes' is too long (339 > 60) (funlen)
-internal/upstream/routes.go:485: internal/upstream/routes.go:485: Line contains TODO/BUG/FIXME/NOTE/OPTIMIZE/HACK: "TODO: We should probably not return a HT..." (godox)
+internal/upstream/routes.go:171:74: `(*upstream).wsRoute` - `matchers` always receives `nil` (unparam)
+internal/upstream/routes.go:231: Function 'configureRoutes' is too long (340 > 60) (funlen)
+internal/upstream/routes.go:487: internal/upstream/routes.go:487: Line contains TODO/BUG/FIXME/NOTE/OPTIMIZE/HACK: "TODO: We should probably not return a HT..." (godox)
internal/upstream/upstream.go:116: internal/upstream/upstream.go:116: Line contains TODO/BUG/FIXME/NOTE/OPTIMIZE/HACK: "TODO: move to LabKit https://gitlab.com/..." (godox)
internal/zipartifacts/metadata.go:118:54: G115: integer overflow conversion int -> uint32 (gosec)
internal/zipartifacts/open_archive.go:78:28: response body must be closed (bodyclose)
diff --git a/workhorse/cmd/gitlab-workhorse/upload_test.go b/workhorse/cmd/gitlab-workhorse/upload_test.go
index c1fc2f6fb95..3229b2f08de 100644
--- a/workhorse/cmd/gitlab-workhorse/upload_test.go
+++ b/workhorse/cmd/gitlab-workhorse/upload_test.go
@@ -189,6 +189,7 @@ func TestAcceleratedUpload(t *testing.T) {
{"POST", "/api/v4/projects/2412/packages/helm/api/stable/charts", true},
{"POST", "/api/v4/projects/group%2Fproject/packages/helm/api/stable/charts", true},
{"POST", "/api/v4/projects/group%2Fsubgroup%2Fproject/packages/helm/api/stable/charts", true},
+ {"POST", "/groups/my-group/-/group_members/bulk_reassignment_file", true},
}
allowedHashFunctions := map[string][]string{
diff --git a/workhorse/internal/upstream/routes.go b/workhorse/internal/upstream/routes.go
index d9b0de104b2..5d8f6d22e96 100644
--- a/workhorse/internal/upstream/routes.go
+++ b/workhorse/internal/upstream/routes.go
@@ -60,6 +60,7 @@ const (
gitProjectPattern = `^/.+\.git/`
geoGitProjectPattern = `^/[^-].+\.git/` // Prevent matching routes like /-/push_from_secondary
projectPattern = `^/([^/]+/){1,}[^/]+/`
+ groupPattern = `^/groups/([^/]+/){0,}[^/]+/`
apiProjectPattern = apiPattern + `v4/projects/[^/]+` // API: Projects can be encoded via group%2Fsubgroup%2Fproject
apiGroupPattern = apiPattern + `v4/groups/[^/]+`
apiTopicPattern = apiPattern + `v4/topics`
@@ -390,7 +391,8 @@ func configureRoutes(u *upstream) {
newRoute(apiPattern+`v4/projects/import`, "api_projects_import", railsBackend), mimeMultipartUploader),
u.route("POST",
newRoute(apiPattern+`v4/projects/import-relation`, "api_projects_import_relation", railsBackend), mimeMultipartUploader),
-
+ u.route("POST",
+ newRoute(groupPattern+`-/group_members/bulk_reassignment_file`, "group_placeholder_assignment", railsBackend), mimeMultipartUploader),
// Project Import via UI upload acceleration
u.route("POST",
newRoute(importPattern+`gitlab_project`, "import_gitlab_project", railsBackend), mimeMultipartUploader),
diff --git a/yarn.lock b/yarn.lock
index b194f19e608..187d1148fbf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1408,8 +1408,7 @@
resolved "https://registry.yarnpkg.com/@gitlab/fonts/-/fonts-1.3.0.tgz#df89c1bb6714e4a8a5d3272568aa4de7fb337267"
integrity sha512-DoMUIN3DqjEn7wvcxBg/b7Ite5fTdF5EmuOZoBRo2j0UBGweDXmNBi+9HrTZs4cBU660dOxcf1hATFcG3npbPg==
-"@gitlab/noop@^1.0.0", jackspeak@^2.3.5, "jackspeak@npm:@gitlab/noop@1.0.0":
- name jackspeak
+"@gitlab/noop@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@gitlab/noop/-/noop-1.0.0.tgz#b1ecb8ae6b2abf9b2e28927e4fbb05b7a1b2704b"
integrity sha512-nOltttik5o2BjBo8LnyeTFzHoLpMY/XcCVOC+lm9ZwU+ivEam8wafacMF0KTbRn1KVrIoHYdo70QnqS+vJiOVw==
@@ -4530,10 +4529,10 @@ autoprefixer@^10.4.8:
picocolors "^1.0.0"
postcss-value-parser "^4.2.0"
-autosize@^5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/autosize/-/autosize-5.0.1.tgz#ed269b0fa9b7eb47627048a1bb3299e99e003a0f"
- integrity sha512-UIWUlE4TOVPNNj2jjrU39wI4hEYbneUypEqcyRmRFIx5CC2gNdg3rQr+Zh7/3h6egbBvm33TDQjNQKtj9Tk1HA==
+autosize@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/autosize/-/autosize-6.0.1.tgz#64ee78dd7029be959eddd3afbbd33235b957e10f"
+ integrity sha512-f86EjiUKE6Xvczc4ioP1JBlWG7FKrE13qe/DxBCpe8GCipCq2nFw73aO8QEBKHfSbYGDN5eB9jXWKen7tspDqQ==
available-typed-arrays@^1.0.7:
version "1.0.7"
@@ -5562,10 +5561,10 @@ core-js-pure@^3.30.2:
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.35.0.tgz#4660033304a050215ae82e476bd2513a419fbb34"
integrity sha512-f+eRYmkou59uh7BPcyJ8MC76DiGhspj1KMxVIcF24tzP8NA9HVa1uC7BTW2tgx7E1QVCzDzsgp7kArrzhlz8Ew==
-core-js@^3.29.1, core-js@^3.39.0, core-js@^3.6.5:
- version "3.39.0"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.39.0.tgz#57f7647f4d2d030c32a72ea23a0555b2eaa30f83"
- integrity sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==
+core-js@^3.29.1, core-js@^3.40.0, core-js@^3.6.5:
+ version "3.40.0"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.40.0.tgz#2773f6b06877d8eda102fc42f828176437062476"
+ integrity sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==
core-util-is@~1.0.0:
version "1.0.3"
@@ -9278,6 +9277,11 @@ iterall@^1.2.1:
resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea"
integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==
+jackspeak@^2.3.5, "jackspeak@npm:@gitlab/noop@1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@gitlab/noop/-/noop-1.0.0.tgz#b1ecb8ae6b2abf9b2e28927e4fbb05b7a1b2704b"
+ integrity sha512-nOltttik5o2BjBo8LnyeTFzHoLpMY/XcCVOC+lm9ZwU+ivEam8wafacMF0KTbRn1KVrIoHYdo70QnqS+vJiOVw==
+
jed@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/jed/-/jed-1.1.1.tgz#7a549bbd9ffe1585b0cd0a191e203055bee574b4"