diff options
562 files changed, 1755 insertions, 1293 deletions
diff --git a/.gitlab/ci/review-apps/main.gitlab-ci.yml b/.gitlab/ci/review-apps/main.gitlab-ci.yml index 8224d9eee5c..be26f7c4015 100644 --- a/.gitlab/ci/review-apps/main.gitlab-ci.yml +++ b/.gitlab/ci/review-apps/main.gitlab-ci.yml @@ -96,7 +96,7 @@ review-build-cng: variables: HOST_SUFFIX: "${CI_ENVIRONMENT_SLUG}" DOMAIN: "-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN}" - GITLAB_HELM_CHART_REF: "b0d2cc33afaa29b6e28e3b2b3591239fad8377a0" # 6.10.7: https://gitlab.com/gitlab-org/charts/gitlab/-/commit/b0d2cc33afaa29b6e28e3b2b3591239fad8377a0 + GITLAB_HELM_CHART_REF: "a468cd56328c55df994ba0678ba1add8691d3f7f" # 6.11.5: https://gitlab.com/gitlab-org/charts/gitlab/-/commit/a468cd56328c55df994ba0678ba1add8691d3f7f environment: name: review/${CI_COMMIT_REF_SLUG}${SCHEDULE_TYPE} # No separator for SCHEDULE_TYPE so it's compatible as before and looks nice without it url: https://gitlab-${CI_ENVIRONMENT_SLUG}.${REVIEW_APPS_DOMAIN} diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index e76c127d420..570171a77d2 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -48,7 +48,7 @@ if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_LABELS !~ /pipeline:mr-approved/' .if-automated-merge-request: &if-automated-merge-request - if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-ee$/' + if: '$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == "release-tools/update-gitaly" || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /stable-(ee|jh)$/' .if-merge-request-targeting-stable-branch: &if-merge-request-targeting-stable-branch if: '($CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached") && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^[\d-]+-stable(-ee)?$/' diff --git a/.rubocop_todo/layout/empty_line_after_magic_comment.yml b/.rubocop_todo/layout/empty_line_after_magic_comment.yml index f8f4f1d3b8a..39788c6cfbb 100644 --- a/.rubocop_todo/layout/empty_line_after_magic_comment.yml +++ b/.rubocop_todo/layout/empty_line_after_magic_comment.yml @@ -520,7 +520,6 @@ Layout/EmptyLineAfterMagicComment: - 'spec/factories/ml/candidates.rb' - 'spec/factories/ml/experiments.rb' - 'spec/factories/packages/composer/cache_files.rb' - - 'spec/factories/packages/packages.rb' - 'spec/features/issuables/sorting_list_spec.rb' - 'spec/features/merge_request/merge_request_discussion_lock_spec.rb' - 'spec/features/merge_request/user_views_merge_request_from_deleted_fork_spec.rb' @@ -640,7 +639,6 @@ Layout/EmptyLineAfterMagicComment: - 'spec/requests/api/composer_packages_spec.rb' - 'spec/requests/api/conan_project_packages_spec.rb' - 'spec/requests/api/debian_group_packages_spec.rb' - - 'spec/requests/api/debian_project_packages_spec.rb' - 'spec/requests/api/feature_flags_spec.rb' - 'spec/requests/api/graphql/ci/ci_cd_setting_spec.rb' - 'spec/requests/api/graphql/ci/groups_spec.rb' @@ -740,7 +738,6 @@ Layout/EmptyLineAfterMagicComment: - 'spec/services/packages/create_dependency_service_spec.rb' - 'spec/services/packages/create_event_service_spec.rb' - 'spec/services/packages/create_package_file_service_spec.rb' - - 'spec/services/packages/debian/extract_changes_metadata_service_spec.rb' - 'spec/services/packages/debian/extract_deb_metadata_service_spec.rb' - 'spec/services/packages/debian/parse_debian822_service_spec.rb' - 'spec/services/packages/helm/extract_file_metadata_service_spec.rb' diff --git a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue index 1a586bd1e91..bc4df04cb30 100644 --- a/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue +++ b/app/assets/javascripts/alerts_settings/components/alert_mapping_builder.vue @@ -159,8 +159,10 @@ export default { </div> <div class="gl-display-table-cell gl-pr-3 gl-vertical-align-middle"> - <div class="right-arrow"> - <i class="right-arrow-head"></i> + <div class="right-arrow gl-relative gl-w-full gl-bg-gray-400"> + <i + class="right-arrow-head gl-absolute gl-border-solid gl-border-gray-400 gl-display-inline-block gl-p-2" + ></i> </div> </div> diff --git a/app/assets/javascripts/content_editor/components/content_editor.vue b/app/assets/javascripts/content_editor/components/content_editor.vue index beb3497e250..92f3c3fb8fa 100644 --- a/app/assets/javascripts/content_editor/components/content_editor.vue +++ b/app/assets/javascripts/content_editor/components/content_editor.vue @@ -90,6 +90,11 @@ export default { required: false, default: () => ({}), }, + disableAttachments: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { @@ -223,7 +228,11 @@ export default { class="md-area gl-border-none! gl-shadow-none!" :class="{ 'is-focused': focused }" > - <formatting-toolbar ref="toolbar" @enableMarkdownEditor="$emit('enableMarkdownEditor')" /> + <formatting-toolbar + ref="toolbar" + :hide-attachment-button="disableAttachments" + @enableMarkdownEditor="$emit('enableMarkdownEditor')" + /> <div v-if="showPlaceholder" class="gl-absolute gl-text-gray-400 gl-px-5 gl-pt-4"> {{ placeholder }} </div> diff --git a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue index fac259cf6a1..89d7a2c958c 100644 --- a/app/assets/javascripts/content_editor/components/formatting_toolbar.vue +++ b/app/assets/javascripts/content_editor/components/formatting_toolbar.vue @@ -16,6 +16,13 @@ export default { ToolbarMoreDropdown, EditorModeSwitcher, }, + props: { + hideAttachmentButton: { + type: Boolean, + default: false, + required: false, + }, + }, methods: { trackToolbarControlExecution({ contentType, value }) { trackUIControl({ property: contentType, value }); @@ -114,6 +121,7 @@ export default { /> <toolbar-table-button data-testid="table" @execute="trackToolbarControlExecution" /> <toolbar-attachment-button + v-if="!hideAttachmentButton" data-testid="attachment" @execute="trackToolbarControlExecution" /> diff --git a/app/assets/javascripts/pages/admin/topics/edit/index.js b/app/assets/javascripts/pages/admin/topics/edit/index.js index b2cbd52fb27..901fd9193a5 100644 --- a/app/assets/javascripts/pages/admin/topics/edit/index.js +++ b/app/assets/javascripts/pages/admin/topics/edit/index.js @@ -1,11 +1,10 @@ -import $ from 'jquery'; -import GLForm from '~/gl_form'; import initFilePickers from '~/file_pickers'; import ZenMode from '~/zen_mode'; import { initRemoveAvatar } from '~/admin/topics'; +import { mountMarkdownEditor } from '~/vue_shared/components/markdown/mount_markdown_editor'; -new GLForm($('.js-project-topic-form')); // eslint-disable-line no-new initFilePickers(); new ZenMode(); // eslint-disable-line no-new initRemoveAvatar(); +mountMarkdownEditor(); diff --git a/app/assets/javascripts/pages/admin/topics/new/index.js b/app/assets/javascripts/pages/admin/topics/new/index.js index c4e05bbd092..fc9ca4fd4e6 100644 --- a/app/assets/javascripts/pages/admin/topics/new/index.js +++ b/app/assets/javascripts/pages/admin/topics/new/index.js @@ -1,8 +1,7 @@ -import $ from 'jquery'; -import GLForm from '~/gl_form'; import initFilePickers from '~/file_pickers'; import ZenMode from '~/zen_mode'; +import { mountMarkdownEditor } from '~/vue_shared/components/markdown/mount_markdown_editor'; -new GLForm($('.js-project-topic-form')); // eslint-disable-line no-new initFilePickers(); new ZenMode(); // eslint-disable-line no-new +mountMarkdownEditor(); diff --git a/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue b/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue index 936938f3032..4258332ed6e 100644 --- a/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue +++ b/app/assets/javascripts/projects/commit_box/info/components/commit_refs.vue @@ -1,5 +1,6 @@ <script> import { createAlert } from '~/alert'; +import { joinPaths } from '~/lib/utils/url_utility'; import commitReferencesQuery from '../graphql/queries/commit_references.query.graphql'; import containingBranchesQuery from '../graphql/queries/commit_containing_branches.query.graphql'; import containingTagsQuery from '../graphql/queries/commit_containing_tags.query.graphql'; @@ -64,6 +65,10 @@ export default { commitSha: this.commitSha, }; }, + commitsUrlPart() { + const urlPart = joinPaths(gon.relative_url_root || '', `/${this.fullPath}`, `/-/commits/`); + return urlPart; + }, }, methods: { async fetchContainingRefs({ query, namespace }) { @@ -106,6 +111,7 @@ export default { :tipping-refs="tippingBranches" :containing-refs="containingBranches" :namespace="$options.i18n.branches" + :url-part="commitsUrlPart" @[$options.fetchContainingRefsEvent]="fetchContainingBranches" /> <refs-list @@ -115,6 +121,7 @@ export default { :tipping-refs="tippingTags" :containing-refs="containingTags" :namespace="$options.i18n.tags" + :url-part="commitsUrlPart" @[$options.fetchContainingRefsEvent]="fetchContainingTags" /> </div> diff --git a/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue b/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue index 602fa26efa7..7e21040a3b1 100644 --- a/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue +++ b/app/assets/javascripts/projects/commit_box/info/components/refs_list.vue @@ -12,6 +12,10 @@ export default { GlIcon, }, props: { + urlPart: { + type: String, + required: true, + }, containingRefs: { type: Array, required: false, @@ -66,9 +70,14 @@ export default { <template> <div class="gl-pt-4"> <span data-testid="title" class="gl-mr-2">{{ namespace }}</span> - <gl-badge v-for="ref in tippingRefs" :key="ref" class="gl-mt-2 gl-mr-2" size="sm">{{ - ref - }}</gl-badge> + <gl-badge + v-for="ref in tippingRefs" + :key="ref" + :href="`${urlPart}${ref}`" + class="gl-mt-2 gl-mr-2" + size="sm" + >{{ ref }}</gl-badge + > <gl-button v-if="hasContainingRefs" class="gl-mr-2 gl-font-sm!" @@ -82,9 +91,14 @@ export default { <gl-collapse :visible="isContainingRefsVisible"> <gl-skeleton-loader v-if="isLoadingRefs" :lines="1" /> <template v-else> - <gl-badge v-for="ref in containingRefs" :key="ref" class="gl-mt-3 gl-mr-2" size="sm">{{ - ref - }}</gl-badge> + <gl-badge + v-for="ref in containingRefs" + :key="ref" + :href="`${urlPart}${ref}`" + class="gl-mt-3 gl-mr-2" + size="sm" + >{{ ref }}</gl-badge + > </template> </gl-collapse> </div> diff --git a/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue b/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue index d9d4056e997..9fd606d775d 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue +++ b/app/assets/javascripts/vue_shared/components/markdown/markdown_editor.vue @@ -95,6 +95,11 @@ export default { required: false, default: false, }, + disableAttachments: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { @@ -111,6 +116,9 @@ export default { // Match textarea focus behavior return this.autofocus && !this.autofocused ? 'end' : false; }, + markdownFieldRestrictedToolBarItems() { + return this.disableAttachments ? ['attach-file'] : []; + }, }, watch: { value(val) { @@ -231,7 +239,7 @@ export default { v-bind="$attrs" data-testid="markdown-field" :markdown-preview-path="renderMarkdownPath" - can-attach-file + :can-attach-file="!disableAttachments" :textarea-value="markdown" :uploads-path="uploadsPath" :enable-autocomplete="enableAutocomplete" @@ -240,6 +248,7 @@ export default { :quick-actions-docs-path="quickActionsDocsPath" :show-content-editor-switcher="enableContentEditor" :drawio-enabled="drawioEnabled" + :restricted-tool-bar-items="markdownFieldRestrictedToolBarItems" :remove-border="true" @enableContentEditor="onEditingModeChange('contentEditor')" @handleSuggestDismissed="() => $emit('handleSuggestDismissed')" @@ -256,8 +265,7 @@ export default { :disabled="disabled" @input="updateMarkdownFromMarkdownField" @keydown="$emit('keydown', $event)" - > - </textarea> + ></textarea> </template> </markdown-field> <div v-else> @@ -273,6 +281,7 @@ export default { :enable-autocomplete="enableAutocomplete" :autocomplete-data-sources="autocompleteDataSources" :editable="!disabled" + :disable-attachments="disableAttachments" @initialized="setEditorAsAutofocused" @change="updateMarkdownFromContentEditor" @keydown="$emit('keydown', $event)" diff --git a/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js b/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js index ac4f06a665d..8ff14220eab 100644 --- a/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js +++ b/app/assets/javascripts/vue_shared/components/markdown/mount_markdown_editor.js @@ -1,5 +1,6 @@ import Vue from 'vue'; import { queryToObject, objectToQuery } from '~/lib/utils/url_utility'; +import { parseBoolean } from '~/lib/utils/common_utils'; import { CLEAR_AUTOSAVE_ENTRY_EVENT } from '../../constants'; import MarkdownEditor from './markdown_editor.vue'; import eventHub from './eventhub'; @@ -67,6 +68,9 @@ export function mountMarkdownEditor() { newIssuePath, } = el.dataset; + const supportsQuickActions = parseBoolean(el.dataset.supportsQuickActions ?? true); + const enableAutocomplete = parseBoolean(el.dataset.enableAutocomplete ?? true); + const disableAttachments = parseBoolean(el.dataset.disableAttachments ?? false); const hiddenInput = el.querySelector('input[type="hidden"]'); const formFieldName = hiddenInput.getAttribute('name'); const formFieldId = hiddenInput.getAttribute('id'); @@ -102,9 +106,11 @@ export function mountMarkdownEditor() { 'data-qa-selector': qaSelector, }, autosaveKey, - enableAutocomplete: true, + enableAutocomplete, autocompleteDataSources: gl.GfmAutoComplete?.dataSources, - supportsQuickActions: true, + supportsQuickActions, + disableAttachments, + autofocus: true, }, }); }, diff --git a/app/assets/stylesheets/page_bundles/alert_management_settings.scss b/app/assets/stylesheets/page_bundles/alert_management_settings.scss index ed2707ffbcd..7abde7c1a11 100644 --- a/app/assets/stylesheets/page_bundles/alert_management_settings.scss +++ b/app/assets/stylesheets/page_bundles/alert_management_settings.scss @@ -3,21 +3,13 @@ $stroke-size: 1px; .right-arrow { - @include gl-relative; - @include gl-w-full; height: $stroke-size; - background-color: var(--gray-400, $gray-400); min-width: $gl-spacing-scale-5; &-head { - @include gl-absolute; top: -$gl-spacing-scale-2; left: calc(100% - #{$gl-spacing-scale-3} - #{2 * $stroke-size}); - border-color: var(--gray-400, $gray-400); - @include gl-border-solid; border-width: 0 $stroke-size $stroke-size 0; - @include gl-display-inline-block; - @include gl-p-2; transform: rotate(-45deg); } } diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 0f9ecc60648..001f5242138 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -5,7 +5,7 @@ class Admin::GroupsController < Admin::ApplicationController before_action :group, only: [:edit, :update, :destroy, :project_update, :members_update] - feature_category :subgroups, [:create, :destroy, :edit, :index, :members_update, :new, :show, :update] + feature_category :groups_and_projects, [:create, :destroy, :edit, :index, :members_update, :new, :show, :update] def index @groups = groups.sort_by_attribute(@sort = params[:sort]) diff --git a/app/controllers/admin/projects_controller.rb b/app/controllers/admin/projects_controller.rb index 84eb90ce334..e79a899cee7 100644 --- a/app/controllers/admin/projects_controller.rb +++ b/app/controllers/admin/projects_controller.rb @@ -6,7 +6,7 @@ class Admin::ProjectsController < Admin::ApplicationController before_action :project, only: [:show, :transfer, :repository_check, :destroy, :edit, :update] before_action :group, only: [:show, :transfer] - feature_category :projects, [:index, :show, :transfer, :destroy, :edit, :update] + feature_category :groups_and_projects, [:index, :show, :transfer, :destroy, :edit, :update] feature_category :source_code_management, [:repository_check] def index diff --git a/app/controllers/admin/topics/avatars_controller.rb b/app/controllers/admin/topics/avatars_controller.rb index 7acdec424b4..ee0a7e68bb3 100644 --- a/app/controllers/admin/topics/avatars_controller.rb +++ b/app/controllers/admin/topics/avatars_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Admin::Topics::AvatarsController < Admin::ApplicationController - feature_category :projects + feature_category :groups_and_projects def destroy @topic = Projects::Topic.find(params[:topic_id]) diff --git a/app/controllers/admin/topics_controller.rb b/app/controllers/admin/topics_controller.rb index 94d084932ad..1f0664362a0 100644 --- a/app/controllers/admin/topics_controller.rb +++ b/app/controllers/admin/topics_controller.rb @@ -6,7 +6,11 @@ class Admin::TopicsController < Admin::ApplicationController before_action :topic, only: [:edit, :update, :destroy] - feature_category :projects + feature_category :groups_and_projects + + before_action do + push_frontend_feature_flag(:content_editor_on_issues, current_user) + end def index @topics = Projects::TopicsFinder.new(params: params.permit(:search)).execute.page(params[:page]).without_count diff --git a/app/controllers/autocomplete_controller.rb b/app/controllers/autocomplete_controller.rb index 01cc1ef21c6..c9cb1ca14e2 100644 --- a/app/controllers/autocomplete_controller.rb +++ b/app/controllers/autocomplete_controller.rb @@ -7,7 +7,7 @@ class AutocompleteController < ApplicationController before_action :check_search_rate_limit!, only: [:users, :projects] feature_category :user_profile, [:users, :user] - feature_category :projects, [:projects] + feature_category :groups_and_projects, [:projects] feature_category :team_planning, [:award_emojis] feature_category :code_review_workflow, [:merge_request_target_branches] feature_category :continuous_delivery, [:deploy_keys_with_owners] diff --git a/app/controllers/dashboard/groups_controller.rb b/app/controllers/dashboard/groups_controller.rb index 552d74686d6..39bee37ee05 100644 --- a/app/controllers/dashboard/groups_controller.rb +++ b/app/controllers/dashboard/groups_controller.rb @@ -5,7 +5,7 @@ class Dashboard::GroupsController < Dashboard::ApplicationController skip_cross_project_access_check :index - feature_category :subgroups + feature_category :groups_and_projects urgency :low, [:index] diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb index e26ac083622..eee172995cf 100644 --- a/app/controllers/dashboard/projects_controller.rb +++ b/app/controllers/dashboard/projects_controller.rb @@ -14,7 +14,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController before_action :projects, only: [:index] skip_cross_project_access_check :index, :starred - feature_category :projects + feature_category :groups_and_projects urgency :low, [:starred, :index] def index diff --git a/app/controllers/explore/groups_controller.rb b/app/controllers/explore/groups_controller.rb index 96a7b5b144d..6cb0736d7ef 100644 --- a/app/controllers/explore/groups_controller.rb +++ b/app/controllers/explore/groups_controller.rb @@ -3,7 +3,7 @@ class Explore::GroupsController < Explore::ApplicationController include GroupTree - feature_category :subgroups + feature_category :groups_and_projects urgency :low def index diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb index eebcbe88ebf..d065fff8a55 100644 --- a/app/controllers/explore/projects_controller.rb +++ b/app/controllers/explore/projects_controller.rb @@ -23,7 +23,7 @@ class Explore::ProjectsController < Explore::ApplicationController rescue_from PageOutOfBoundsError, with: :page_out_of_bounds - feature_category :projects + feature_category :groups_and_projects # TODO: Set higher urgency after addressing https://gitlab.com/gitlab-org/gitlab/-/issues/357913 # and https://gitlab.com/gitlab-org/gitlab/-/issues/358945 urgency :low, [:index, :topics, :trending, :starred, :topic] diff --git a/app/controllers/groups/autocomplete_sources_controller.rb b/app/controllers/groups/autocomplete_sources_controller.rb index 3cad9e1fbad..414461d9e93 100644 --- a/app/controllers/groups/autocomplete_sources_controller.rb +++ b/app/controllers/groups/autocomplete_sources_controller.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class Groups::AutocompleteSourcesController < Groups::ApplicationController - feature_category :subgroups, [:members] + feature_category :groups_and_projects, [:members] feature_category :team_planning, [:issues, :labels, :milestones, :commands] feature_category :code_review_workflow, [:merge_requests] diff --git a/app/controllers/groups/avatars_controller.rb b/app/controllers/groups/avatars_controller.rb index 1f13be449a9..3b34a1947ae 100644 --- a/app/controllers/groups/avatars_controller.rb +++ b/app/controllers/groups/avatars_controller.rb @@ -5,7 +5,7 @@ class Groups::AvatarsController < Groups::ApplicationController skip_cross_project_access_check :destroy - feature_category :subgroups + feature_category :groups_and_projects def destroy @group.remove_avatar! diff --git a/app/controllers/groups/children_controller.rb b/app/controllers/groups/children_controller.rb index ca3be1542aa..98d7487b21a 100644 --- a/app/controllers/groups/children_controller.rb +++ b/app/controllers/groups/children_controller.rb @@ -9,7 +9,7 @@ module Groups skip_cross_project_access_check :index - feature_category :subgroups + feature_category :groups_and_projects # TODO: Set to higher urgency after resolving https://gitlab.com/gitlab-org/gitlab/-/issues/331494 urgency :low, [:index] diff --git a/app/controllers/groups/group_links_controller.rb b/app/controllers/groups/group_links_controller.rb index c74c48a960d..a874c7d164d 100644 --- a/app/controllers/groups/group_links_controller.rb +++ b/app/controllers/groups/group_links_controller.rb @@ -4,7 +4,7 @@ class Groups::GroupLinksController < Groups::ApplicationController before_action :authorize_admin_group! before_action :group_link, only: [:update, :destroy] - feature_category :subgroups + feature_category :groups_and_projects def update Groups::GroupLinks::UpdateService.new(@group_link, current_user).execute(group_link_params) diff --git a/app/controllers/groups/group_members_controller.rb b/app/controllers/groups/group_members_controller.rb index d614cc1cb24..de47c5fb5e3 100644 --- a/app/controllers/groups/group_members_controller.rb +++ b/app/controllers/groups/group_members_controller.rb @@ -24,7 +24,7 @@ class Groups::GroupMembersController < Groups::ApplicationController skip_cross_project_access_check :index, :update, :destroy, :request_access, :approve_access_request, :leave, :resend_invite, :override - feature_category :subgroups + feature_category :groups_and_projects urgency :low def index diff --git a/app/controllers/groups/shared_projects_controller.rb b/app/controllers/groups/shared_projects_controller.rb index 2d2664c02e8..73f951d6ce4 100644 --- a/app/controllers/groups/shared_projects_controller.rb +++ b/app/controllers/groups/shared_projects_controller.rb @@ -6,7 +6,7 @@ module Groups before_action :group skip_cross_project_access_check :index - feature_category :subgroups + feature_category :groups_and_projects urgency :low, [:index] def index diff --git a/app/controllers/groups/uploads_controller.rb b/app/controllers/groups/uploads_controller.rb index 22e6549aa04..cd1ebc39411 100644 --- a/app/controllers/groups/uploads_controller.rb +++ b/app/controllers/groups/uploads_controller.rb @@ -9,7 +9,7 @@ class Groups::UploadsController < Groups::ApplicationController before_action :authorize_upload_file!, only: [:create, :authorize] before_action :verify_workhorse_api!, only: [:authorize] - feature_category :subgroups + feature_category :groups_and_projects urgency :low, [:show] private diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 182d7aee060..ec16be8f85e 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -52,14 +52,12 @@ class GroupsController < Groups::ApplicationController layout :determine_layout - feature_category :subgroups, [ + feature_category :groups_and_projects, [ :index, :new, :create, :show, :edit, :update, - :destroy, :details, :transfer, :activity + :destroy, :details, :transfer, :activity, :projects ] - feature_category :team_planning, [:issues, :issues_calendar, :preview_markdown] feature_category :code_review_workflow, [:merge_requests, :unfoldered_environment_names] - feature_category :projects, [:projects] feature_category :importers, [:export, :download_export] urgency :low, [:export, :download_export] diff --git a/app/controllers/projects/avatars_controller.rb b/app/controllers/projects/avatars_controller.rb index 5db7609e07a..3728406afd3 100644 --- a/app/controllers/projects/avatars_controller.rb +++ b/app/controllers/projects/avatars_controller.rb @@ -5,7 +5,7 @@ class Projects::AvatarsController < Projects::ApplicationController before_action :authorize_admin_project!, only: [:destroy] - feature_category :projects + feature_category :groups_and_projects urgency :low, [:show] diff --git a/app/controllers/projects/blame_controller.rb b/app/controllers/projects/blame_controller.rb index bb1b8760c42..f621adbebc7 100644 --- a/app/controllers/projects/blame_controller.rb +++ b/app/controllers/projects/blame_controller.rb @@ -9,6 +9,7 @@ class Projects::BlameController < Projects::ApplicationController before_action :assign_ref_vars before_action :authorize_read_code! before_action :load_blob + before_action :require_non_binary_blob feature_category :source_code_management urgency :low, [:show] @@ -40,6 +41,10 @@ class Projects::BlameController < Projects::ApplicationController redirect_to_tree_root_for_missing_path(@project, @ref, @path) end + def require_non_binary_blob + redirect_to project_blob_path(@project, File.join(@ref, @path)), notice: _('Blame for binary files is not supported.') if @blob.binary? + end + def load_environment environment_params = @repository.branch_exists?(@ref) ? { ref: @ref } : { commit: @commit } environment_params[:find_latest] = true diff --git a/app/controllers/projects/group_links_controller.rb b/app/controllers/projects/group_links_controller.rb index 451f1d1363b..60300f78bbb 100644 --- a/app/controllers/projects/group_links_controller.rb +++ b/app/controllers/projects/group_links_controller.rb @@ -6,7 +6,7 @@ class Projects::GroupLinksController < Projects::ApplicationController before_action :authorize_admin_project_group_link!, only: [:destroy] before_action :authorize_admin_project_member!, only: [:update] - feature_category :subgroups + feature_category :groups_and_projects def update Projects::GroupLinks::UpdateService.new(group_link, current_user).execute(group_link_params) diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index f4b96177b0f..5390df449e8 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -8,7 +8,7 @@ class Projects::ProjectMembersController < Projects::ApplicationController # Authorize before_action :authorize_admin_project_member!, except: [:index, :leave, :request_access] - feature_category :projects + feature_category :groups_and_projects urgency :low def index diff --git a/app/controllers/projects/redirect_controller.rb b/app/controllers/projects/redirect_controller.rb index 6bcbe87ee42..c66a99be02b 100644 --- a/app/controllers/projects/redirect_controller.rb +++ b/app/controllers/projects/redirect_controller.rb @@ -6,7 +6,7 @@ class Projects::RedirectController < ::ApplicationController skip_before_action :authenticate_user! - feature_category :projects + feature_category :groups_and_projects def redirect_from_id project = Project.find(params[:id]) diff --git a/app/controllers/projects/starrers_controller.rb b/app/controllers/projects/starrers_controller.rb index 06996e8e5fc..f9f71ce72d3 100644 --- a/app/controllers/projects/starrers_controller.rb +++ b/app/controllers/projects/starrers_controller.rb @@ -3,7 +3,7 @@ class Projects::StarrersController < Projects::ApplicationController include SortingHelper - feature_category :projects + feature_category :groups_and_projects urgency :low, [:index] diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index a612c1e89a5..4fa7faa9094 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -50,7 +50,7 @@ class ProjectsController < Projects::ApplicationController layout :determine_layout - feature_category :projects, [ + feature_category :groups_and_projects, [ :index, :show, :new, :create, :edit, :update, :transfer, :destroy, :archive, :unarchive, :toggle_star, :activity ] diff --git a/app/graphql/types/ci/job_artifact_type.rb b/app/graphql/types/ci/job_artifact_type.rb index 6346d50de3a..2280fcd1370 100644 --- a/app/graphql/types/ci/job_artifact_type.rb +++ b/app/graphql/types/ci/job_artifact_type.rb @@ -19,7 +19,7 @@ module Types description: 'File name of the artifact.', method: :filename - field :size, GraphQL::Types::Int, null: false, + field :size, GraphQL::Types::BigInt, null: false, description: 'Size of the artifact in bytes.' field :expire_at, Types::TimeType, null: true, diff --git a/app/models/packages/package.rb b/app/models/packages/package.rb index a715277a787..5d51b2562c7 100644 --- a/app/models/packages/package.rb +++ b/app/models/packages/package.rb @@ -225,6 +225,10 @@ class Packages::Package < ApplicationRecord find_by!(name: name, version: version) end + def self.debian_incoming_package! + find_by!(name: Packages::Debian::INCOMING_PACKAGE_NAME, version: nil, package_type: :debian, status: :default) + end + def self.existing_debian_packages_with(name:, version:) debian.with_name(name) .with_version(version) diff --git a/app/models/plan_limits.rb b/app/models/plan_limits.rb index 2ce02f9410d..16a2d6df6aa 100644 --- a/app/models/plan_limits.rb +++ b/app/models/plan_limits.rb @@ -10,6 +10,7 @@ class PlanLimits < ApplicationRecord belongs_to :plan validates :notification_limit, numericality: { only_integer: true } + validates :enforcement_limit, numericality: { only_integer: true } def exceeded?(limit_name, subject, alternate_limit: 0) limit = limit_for(limit_name, alternate_limit: alternate_limit) diff --git a/app/services/packages/debian/create_package_file_service.rb b/app/services/packages/debian/create_package_file_service.rb index 24e40b5c986..2e9299a847c 100644 --- a/app/services/packages/debian/create_package_file_service.rb +++ b/app/services/packages/debian/create_package_file_service.rb @@ -14,7 +14,7 @@ module Packages raise ArgumentError, "Invalid user" unless current_user.present? # Debian package file are first uploaded to incoming with empty metadata, - # and are moved later by Packages::Debian::ProcessChangesService + # and are moved later by Packages::Debian::ProcessPackageFileService package_file = package.package_files.create!( file: params[:file], size: params[:file]&.size, @@ -29,14 +29,12 @@ module Packages } ) - if params[:distribution].present? && params[:component].present? + if end_of_new_upload? ::Packages::Debian::ProcessPackageFileWorker.perform_async( package_file.id, params[:distribution], params[:component] ) - elsif params[:file_name].end_with? '.changes' - ::Packages::Debian::ProcessChangesWorker.perform_async(package_file.id, current_user.id) end package_file @@ -45,6 +43,10 @@ module Packages private attr_reader :package, :current_user, :params + + def end_of_new_upload? + params[:distribution].present? || params[:file_name].end_with?('.changes') + end end end end diff --git a/app/services/packages/debian/extract_changes_metadata_service.rb b/app/services/packages/debian/extract_changes_metadata_service.rb index 43a4db5bdfc..fdca8c88fdc 100644 --- a/app/services/packages/debian/extract_changes_metadata_service.rb +++ b/app/services/packages/debian/extract_changes_metadata_service.rb @@ -101,12 +101,17 @@ module Packages def entries_from_package_files @entries.each do |filename, entry| - entry.package_file = ::Packages::PackageFileFinder.new(@package_file.package, filename).execute! + entry.package_file = ::Packages::PackageFileFinder.new(incoming, filename).execute! entry.validate! rescue ActiveRecord::RecordNotFound raise ExtractionError, "#{filename} is listed in Files but was not uploaded" end end + + def incoming + @package_file.package.project.packages.debian_incoming_package! + end + strong_memoize_attr(:incoming) end end end diff --git a/app/services/packages/debian/process_package_file_service.rb b/app/services/packages/debian/process_package_file_service.rb index f4fcd3a563c..684192f6006 100644 --- a/app/services/packages/debian/process_package_file_service.rb +++ b/app/services/packages/debian/process_package_file_service.rb @@ -10,6 +10,8 @@ module Packages # used by ExclusiveLeaseGuard DEFAULT_LEASE_TIMEOUT = 1.hour.to_i.freeze + SIMPLE_DEB_FILE_TYPES = %i[deb udeb ddeb].freeze + def initialize(package_file, distribution_name, component_name) @package_file = package_file @distribution_name = distribution_name @@ -22,9 +24,10 @@ module Packages validate! try_obtain_lease do - package.transaction do + distribution.transaction do rename_package_and_set_version update_package + update_files_metadata if changes_file? update_file_metadata cleanup_temp_package end @@ -36,28 +39,61 @@ module Packages private def validate! - raise ArgumentError, 'missing distribution name' unless @distribution_name.present? - raise ArgumentError, 'missing component name' unless @component_name.present? raise ArgumentError, 'package file without Debian metadata' unless @package_file.debian_file_metadatum raise ArgumentError, 'already processed package file' unless @package_file.debian_file_metadatum.unknown? - if file_metadata[:file_type] == :deb || file_metadata[:file_type] == :udeb || file_metadata[:file_type] == :ddeb - return - end + changes_file? ? validate_changes_file! : validate_package_file! + end + + def changes_file? + @package_file.file_name.end_with?('.changes') + end + + def validate_changes_file! + raise ArgumentError, 'unwanted distribution name' unless @distribution_name.nil? + raise ArgumentError, 'unwanted component name' unless @component_name.nil? + raise ArgumentError, 'missing Source field' unless file_metadata.dig(:fields, 'Source').present? + raise ArgumentError, 'missing Version field' unless file_metadata.dig(:fields, 'Version').present? + raise ArgumentError, 'missing Distribution field' unless file_metadata.dig(:fields, 'Distribution').present? + end + + def validate_package_file! + raise ArgumentError, 'missing distribution name' unless @distribution_name.present? + raise ArgumentError, 'missing component name' unless @component_name.present? + + return if SIMPLE_DEB_FILE_TYPES.include?(file_metadata[:file_type]) raise ArgumentError, "invalid package file type: #{file_metadata[:file_type]}" end def file_metadata - ::Packages::Debian::ExtractMetadataService.new(@package_file).execute + metadata_service_class.new(@package_file).execute end strong_memoize_attr :file_metadata + def metadata_service_class + changes_file? ? ::Packages::Debian::ExtractChangesMetadataService : ::Packages::Debian::ExtractMetadataService + end + + def distribution + Packages::Debian::DistributionsFinder.new( + @package_file.package.project, + codename_or_suite: package_distribution + ).execute.last! + end + strong_memoize_attr :distribution + + def package_distribution + return file_metadata[:fields]['Distribution'] if changes_file? + + @distribution_name + end + def package packages = temp_package.project .packages .existing_debian_packages_with(name: package_name, version: package_version) - package = packages.with_debian_codename_or_suite(@distribution_name) + package = packages.with_debian_codename_or_suite(package_distribution) .first unless package @@ -79,10 +115,14 @@ module Packages strong_memoize_attr :temp_package def package_name + return file_metadata[:fields]['Source'] if changes_file? + package_name_and_version[0] end def package_version + return file_metadata[:fields]['Version'] if changes_file? + package_name_and_version[1] end @@ -121,13 +161,24 @@ module Packages package.id == temp_package.id end - def distribution - Packages::Debian::DistributionsFinder.new( - @package_file.package.project, - codename_or_suite: @distribution_name - ).execute.last! + def update_files_metadata + file_metadata[:files].each do |_, entry| + file_metadata = ::Packages::Debian::ExtractMetadataService.new(entry.package_file).execute + + ::Packages::UpdatePackageFileService.new(entry.package_file, package_id: package.id) + .execute + + # Force reload from database, as package has changed + entry.package_file.reload_package + + entry.package_file.debian_file_metadatum.update!( + file_type: file_metadata[:file_type], + component: entry.component, + architecture: file_metadata[:architecture], + fields: file_metadata[:fields] + ) + end end - strong_memoize_attr :distribution def update_file_metadata ::Packages::UpdatePackageFileService.new(@package_file, package_id: package.id) @@ -150,7 +201,7 @@ module Packages # used by ExclusiveLeaseGuard def lease_key - "packages:debian:process_package_file_service:package_file:#{@package_file.id}" + "packages:debian:process_package_file_service:#{temp_package.project_id}_#{package_name}_#{package_version}" end # used by ExclusiveLeaseGuard diff --git a/app/views/admin/topics/_form.html.haml b/app/views/admin/topics/_form.html.haml index 544310e312c..c3b5161d617 100644 --- a/app/views/admin/topics/_form.html.haml +++ b/app/views/admin/topics/_form.html.haml @@ -18,14 +18,15 @@ .form-group = f.label :description, _("Description") - = render layout: 'shared/md_preview', locals: { url: preview_markdown_admin_topics_path, referenced_users: false } do - = render 'shared/zen', f: f, attr: :description, - classes: 'note-textarea', - placeholder: _('Write a description…'), - supports_quick_actions: false, - supports_autocomplete: false, - qa_selector: 'topic_form_description' - = render 'shared/notes/hints', supports_file_upload: false + .js-markdown-editor{ data: { render_markdown_path: preview_markdown_admin_topics_path, + markdown_docs_path: help_page_path('user/markdown'), + qa_selector: 'topic_form_description', + form_field_placeholder: _('Write a description…'), + supports_quick_actions: 'false', + enable_autocomplete: 'false', + disable_attachments: 'true', + form_field_classes: 'note-textarea js-gfm-input markdown-area' } } + = f.hidden_field :description .form-group.gl-mt-3.gl-mb-3 = f.label :avatar, _('Topic avatar'), class: 'gl-display-block' diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml index 056c76f6326..e6ad18181cd 100644 --- a/app/workers/all_queues.yml +++ b/app/workers/all_queues.yml @@ -554,7 +554,7 @@ :tags: [] - :name: cronjob:member_invitation_reminder_emails :worker_name: MemberInvitationReminderEmailsWorker - :feature_category: :subgroups + :feature_category: :groups_and_projects :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -2642,7 +2642,7 @@ :tags: [] - :name: disallow_two_factor_for_group :worker_name: DisallowTwoFactorForGroupWorker - :feature_category: :subgroups + :feature_category: :groups_and_projects :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -2651,7 +2651,7 @@ :tags: [] - :name: disallow_two_factor_for_subgroups :worker_name: DisallowTwoFactorForSubgroupsWorker - :feature_category: :subgroups + :feature_category: :groups_and_projects :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -2786,7 +2786,7 @@ :tags: [] - :name: group_destroy :worker_name: GroupDestroyWorker - :feature_category: :subgroups + :feature_category: :groups_and_projects :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown @@ -3398,7 +3398,7 @@ :tags: [] - :name: projects_record_target_platforms :worker_name: Projects::RecordTargetPlatformsWorker - :feature_category: :projects + :feature_category: :groups_and_projects :has_external_dependencies: false :urgency: :low :resource_boundary: :unknown diff --git a/app/workers/disallow_two_factor_for_group_worker.rb b/app/workers/disallow_two_factor_for_group_worker.rb index 5b958f9f31f..1ee2585a718 100644 --- a/app/workers/disallow_two_factor_for_group_worker.rb +++ b/app/workers/disallow_two_factor_for_group_worker.rb @@ -8,7 +8,7 @@ class DisallowTwoFactorForGroupWorker sidekiq_options retry: 3 include ExceptionBacktrace - feature_category :subgroups + feature_category :groups_and_projects idempotent! def perform(group_id) diff --git a/app/workers/disallow_two_factor_for_subgroups_worker.rb b/app/workers/disallow_two_factor_for_subgroups_worker.rb index 500c13deed2..02dceee2488 100644 --- a/app/workers/disallow_two_factor_for_subgroups_worker.rb +++ b/app/workers/disallow_two_factor_for_subgroups_worker.rb @@ -10,7 +10,7 @@ class DisallowTwoFactorForSubgroupsWorker INTERVAL = 2.seconds.to_i - feature_category :subgroups + feature_category :groups_and_projects idempotent! def perform(group_id) diff --git a/app/workers/group_destroy_worker.rb b/app/workers/group_destroy_worker.rb index a116944feb9..d8dd0b6d7b3 100644 --- a/app/workers/group_destroy_worker.rb +++ b/app/workers/group_destroy_worker.rb @@ -8,7 +8,7 @@ class GroupDestroyWorker sidekiq_options retry: 3 include ExceptionBacktrace - feature_category :subgroups + feature_category :groups_and_projects idempotent! deduplicate :until_executed, ttl: 2.hours diff --git a/app/workers/member_invitation_reminder_emails_worker.rb b/app/workers/member_invitation_reminder_emails_worker.rb index a7614db30f6..d36ec2611d5 100644 --- a/app/workers/member_invitation_reminder_emails_worker.rb +++ b/app/workers/member_invitation_reminder_emails_worker.rb @@ -7,7 +7,7 @@ class MemberInvitationReminderEmailsWorker # rubocop:disable Scalability/Idempot include CronjobQueue # rubocop:disable Scalability/CronWorkerContext - feature_category :subgroups + feature_category :groups_and_projects urgency :low def perform diff --git a/app/workers/packages/debian/process_package_file_worker.rb b/app/workers/packages/debian/process_package_file_worker.rb index 8e7f0b3b987..0e21e98d182 100644 --- a/app/workers/packages/debian/process_package_file_worker.rb +++ b/app/workers/packages/debian/process_package_file_worker.rb @@ -19,7 +19,7 @@ module Packages @distribution_name = distribution_name @component_name = component_name - return unless package_file && distribution_name && component_name + return unless package_file # return if file has already been processed return unless package_file.debian_file_metadatum&.unknown? diff --git a/app/workers/projects/record_target_platforms_worker.rb b/app/workers/projects/record_target_platforms_worker.rb index 2e523ccc992..9ebc52f77d3 100644 --- a/app/workers/projects/record_target_platforms_worker.rb +++ b/app/workers/projects/record_target_platforms_worker.rb @@ -8,7 +8,7 @@ module Projects LEASE_TIMEOUT = 1.hour.to_i APPLE_PLATFORM_LANGUAGES = %w(swift objective-c).freeze - feature_category :projects + feature_category :groups_and_projects data_consistency :always deduplicate :until_executed urgency :low diff --git a/config/feature_categories.yml b/config/feature_categories.yml index 804ab08ad6a..74d0763c318 100644 --- a/config/feature_categories.yml +++ b/config/feature_categories.yml @@ -67,6 +67,7 @@ - gitlab_cli - gitlab_docs - global_search +- groups_and_projects - helm_chart_registry - importers - incident_management @@ -79,6 +80,7 @@ - interactive_application_security_testing - internationalization - logging +- measurement_and_locking - merge_trains - metrics - mlops @@ -88,12 +90,12 @@ - omnibus_package - on_call_schedule_management - onboarding +- organization - package_registry - pages - pipeline_composition - portfolio_management - product_analytics -- projects - pubsec_services - purchase - quality_management @@ -122,7 +124,6 @@ - software_composition_analysis - source_code_management - static_application_security_testing -- subgroups - subscription_management - system_access - team_planning diff --git a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml index 9602d8c8553..c9c8673285a 100644 --- a/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml +++ b/config/metrics/counts_28d/20210216183203_product_analytics_test_metrics_union.yml @@ -4,7 +4,7 @@ key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_union description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: number status: removed milestone_removed: '13.11' diff --git a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml index e5a5db2f0ec..5072ab05abe 100644 --- a/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml +++ b/config/metrics/counts_28d/20210216183205_product_analytics_test_metrics_intersection.yml @@ -4,7 +4,7 @@ key_path: counts_monthly.aggregated_metrics.product_analytics_test_metrics_inter description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: number status: removed milestone_removed: '13.11' diff --git a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml index c7667b902f2..af835f558d1 100644 --- a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml +++ b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml @@ -4,7 +4,7 @@ key_path: redis_hll_counters.testing.testing_total_unique_counts_monthly description: Total users for events under testing category product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: number status: removed time_frame: 28d diff --git a/config/metrics/counts_28d/20210916080405_promoted_issues.yml b/config/metrics/counts_28d/20210916080405_promoted_issues.yml index 444fa936b3d..30227589a0e 100644 --- a/config/metrics/counts_28d/20210916080405_promoted_issues.yml +++ b/config/metrics/counts_28d/20210916080405_promoted_issues.yml @@ -4,7 +4,7 @@ name: count_promoted_issues description: Count of issues promoted to epics product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: number status: removed milestone: "14.3" diff --git a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml index 09fb34084f7..83ee5609107 100644 --- a/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml +++ b/config/metrics/counts_7d/20210216183213_product_analytics_test_metrics_union.yml @@ -4,7 +4,7 @@ key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_union description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: number status: removed milestone_removed: '13.11' diff --git a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml index 805a168d407..ed1944b4fc0 100644 --- a/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml +++ b/config/metrics/counts_7d/20210216183215_product_analytics_test_metrics_intersection.yml @@ -4,7 +4,7 @@ key_path: counts_weekly.aggregated_metrics.product_analytics_test_metrics_inters description: This was test metric used for purpose of assuring correct implementation of aggregated metrics feature product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: number status: removed milestone_removed: '13.11' diff --git a/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml index fbc44bd2a04..1a562bc23d8 100644 --- a/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml +++ b/config/metrics/counts_all/20220314362302_service_usage_data_download_payload.yml @@ -5,7 +5,7 @@ data_category: optional name: service_usage_data_download_payload_click product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: number status: active time_frame: all diff --git a/config/metrics/license/20210201124932_recorded_at.yml b/config/metrics/license/20210201124932_recorded_at.yml index d37d8b0e3ea..d53e6ccb098 100644 --- a/config/metrics/license/20210201124932_recorded_at.yml +++ b/config/metrics/license/20210201124932_recorded_at.yml @@ -4,7 +4,7 @@ key_path: recorded_at description: When the Usage Ping computation was started product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: string status: active milestone: "8.10" diff --git a/config/metrics/license/20210201124933_uuid.yml b/config/metrics/license/20210201124933_uuid.yml index 2b08e8667c9..c6e5133f521 100644 --- a/config/metrics/license/20210201124933_uuid.yml +++ b/config/metrics/license/20210201124933_uuid.yml @@ -3,7 +3,7 @@ key_path: uuid description: GitLab instance unique identifier product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: string status: active milestone: "9.1" diff --git a/config/metrics/license/20210204124827_hostname.yml b/config/metrics/license/20210204124827_hostname.yml index 891ce0c20ff..500499e0763 100644 --- a/config/metrics/license/20210204124827_hostname.yml +++ b/config/metrics/license/20210204124827_hostname.yml @@ -3,7 +3,7 @@ key_path: hostname description: Host name of GitLab instance product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: string status: active milestone: "<13.9" diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml index c0cbdfa8df3..a4ee7d684fb 100644 --- a/config/metrics/license/20210204124829_active_user_count.yml +++ b/config/metrics/license/20210204124829_active_user_count.yml @@ -3,7 +3,7 @@ key_path: active_user_count description: The number of active users existing in the instance. This is named the instance_user_count in the Versions application. product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: number status: active milestone: "<13.9" diff --git a/config/metrics/license/20210204124938_recording_ce_finished_at.yml b/config/metrics/license/20210204124938_recording_ce_finished_at.yml index 28a9adf9071..021219d37b2 100644 --- a/config/metrics/license/20210204124938_recording_ce_finished_at.yml +++ b/config/metrics/license/20210204124938_recording_ce_finished_at.yml @@ -4,7 +4,7 @@ key_path: recording_ce_finished_at description: When the core features were computed product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: string status: active milestone: "13.0" diff --git a/config/metrics/license/20230228110448_installation_creation_date.yml b/config/metrics/license/20230228110448_installation_creation_date.yml index 53f9438ba0f..3d3fc40287c 100644 --- a/config/metrics/license/20230228110448_installation_creation_date.yml +++ b/config/metrics/license/20230228110448_installation_creation_date.yml @@ -3,7 +3,7 @@ key_path: installation_creation_date description: "The date and time the instance was installed" product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: string status: active milestone: "15.10" diff --git a/config/metrics/license/20230314161014_gitlab_dedicated.yml b/config/metrics/license/20230314161014_gitlab_dedicated.yml index 1aff67f2561..37346fd937c 100644 --- a/config/metrics/license/20230314161014_gitlab_dedicated.yml +++ b/config/metrics/license/20230314161014_gitlab_dedicated.yml @@ -3,7 +3,7 @@ key_path: gitlab_dedicated description: Is the instance a Gitlab Dedicated instance product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: boolean status: active milestone: "15.10" diff --git a/config/metrics/license/20230505112412_installation_creation_date_approximation.yml b/config/metrics/license/20230505112412_installation_creation_date_approximation.yml index 5cc7957eca1..e0f8c192b86 100644 --- a/config/metrics/license/20230505112412_installation_creation_date_approximation.yml +++ b/config/metrics/license/20230505112412_installation_creation_date_approximation.yml @@ -3,7 +3,7 @@ key_path: installation_creation_date_approximation description: "The approximate date and time the instance was installed. Based on the first created user or application setting" product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: string status: active milestone: "16.0" diff --git a/config/metrics/settings/20210702140138_collected_data_categories.yml b/config/metrics/settings/20210702140138_collected_data_categories.yml index e5732e3410b..79e5f50e231 100644 --- a/config/metrics/settings/20210702140138_collected_data_categories.yml +++ b/config/metrics/settings/20210702140138_collected_data_categories.yml @@ -4,7 +4,7 @@ name: collected_data_categories description: List of collected data categories corresponding to instance settings product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: object status: active milestone: "14.1" diff --git a/config/metrics/settings/20210915152326_service_ping_features_enabled.yml b/config/metrics/settings/20210915152326_service_ping_features_enabled.yml index ec7a2480990..46dd4968bd4 100644 --- a/config/metrics/settings/20210915152326_service_ping_features_enabled.yml +++ b/config/metrics/settings/20210915152326_service_ping_features_enabled.yml @@ -4,7 +4,7 @@ name: "service_ping_features_enabled" description: Whether Service Ping features are enabled product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: boolean status: active milestone: "14.3" diff --git a/config/metrics/settings/20211124061450_snowplow_enabled.yml b/config/metrics/settings/20211124061450_snowplow_enabled.yml index 7c4ae3a4f29..8c8debd8064 100644 --- a/config/metrics/settings/20211124061450_snowplow_enabled.yml +++ b/config/metrics/settings/20211124061450_snowplow_enabled.yml @@ -4,7 +4,7 @@ name: snowplow_enabled_gitlab_instance description: Whether snowplow is enabled for the GitLab instance product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: boolean status: active milestone: "14.6" diff --git a/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml index f1d2b64c531..d37c1dddc5f 100644 --- a/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml +++ b/config/metrics/settings/20211124085521_snowplow_configured_to_gitlab_collector_hostname.yml @@ -4,7 +4,7 @@ name: snowplow_configured_to_gitlab_collector description: Metric informs if currently configured Snowplow collector hostname points towards Gitlab Snowplow collection pipeline. product_section: analytics product_stage: analytics -product_group: product_intelligence +product_group: analytics_instrumentation value_type: boolean status: active milestone: "14.6" diff --git a/db/docs/allowed_email_domains.yml b/db/docs/allowed_email_domains.yml index 4dd6100e4c4..1ab2f3e1740 100644 --- a/db/docs/allowed_email_domains.yml +++ b/db/docs/allowed_email_domains.yml @@ -3,7 +3,7 @@ table_name: allowed_email_domains classes: - AllowedEmailDomain feature_categories: -- subgroups +- groups_and_projects description: Stores email domains for group, only members with email from those domains can be added to the group introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/14800 milestone: '12.2' diff --git a/db/docs/badges.yml b/db/docs/badges.yml index af05638152c..6248a7c9987 100644 --- a/db/docs/badges.yml +++ b/db/docs/badges.yml @@ -5,7 +5,7 @@ classes: - GroupBadge - ProjectBadge feature_categories: -- projects +- groups_and_projects description: Stores badges records introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17082 milestone: '10.6' diff --git a/db/docs/group_custom_attributes.yml b/db/docs/group_custom_attributes.yml index a6984004149..6fed09909c8 100644 --- a/db/docs/group_custom_attributes.yml +++ b/db/docs/group_custom_attributes.yml @@ -3,7 +3,7 @@ table_name: group_custom_attributes classes: - GroupCustomAttribute feature_categories: -- subgroups +- groups_and_projects description: Stores custom attributes per group introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14593 milestone: '10.2' diff --git a/db/docs/group_deletion_schedules.yml b/db/docs/group_deletion_schedules.yml index ff271e4b1f0..a2e84582ccd 100644 --- a/db/docs/group_deletion_schedules.yml +++ b/db/docs/group_deletion_schedules.yml @@ -3,7 +3,7 @@ table_name: group_deletion_schedules classes: - GroupDeletionSchedule feature_categories: -- subgroups +- groups_and_projects description: TODO introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20276 milestone: '12.6' diff --git a/db/docs/member_roles.yml b/db/docs/member_roles.yml index 559a85823cc..a11743cf3f4 100644 --- a/db/docs/member_roles.yml +++ b/db/docs/member_roles.yml @@ -3,8 +3,7 @@ table_name: member_roles classes: - MemberRole feature_categories: -- projects -- subgroups +- groups_and_projects description: Stores custom roles with composable permissions introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/92152 milestone: '15.2' diff --git a/db/docs/members.yml b/db/docs/members.yml index 94306dc5f87..1a617d27a4b 100644 --- a/db/docs/members.yml +++ b/db/docs/members.yml @@ -6,8 +6,7 @@ classes: - ProjectMember - ProjectNamespaceMember feature_categories: -- projects -- subgroups +- groups_and_projects description: Stores members per namespace introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/3503b504eabf95487fc3fb49df953a7d694da4fe milestone: '7.4' diff --git a/db/docs/namespace_admin_notes.yml b/db/docs/namespace_admin_notes.yml index 50ca72b270c..80937cb728e 100644 --- a/db/docs/namespace_admin_notes.yml +++ b/db/docs/namespace_admin_notes.yml @@ -4,7 +4,7 @@ classes: - Namespace::AdminNote feature_categories: - system_access -- subgroups +- groups_and_projects description: Contains notes about groups that are visible to server administrators. introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47825 milestone: '13.11' diff --git a/db/docs/namespace_details.yml b/db/docs/namespace_details.yml index 35e57d7c686..6b91798bc57 100644 --- a/db/docs/namespace_details.yml +++ b/db/docs/namespace_details.yml @@ -3,7 +3,7 @@ table_name: namespace_details classes: - Namespace::Detail feature_categories: -- subgroups +- groups_and_projects description: Used to store details for namespaces introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/82958 milestone: '15.3' diff --git a/db/docs/namespace_settings.yml b/db/docs/namespace_settings.yml index 85df86074dc..48187919e43 100644 --- a/db/docs/namespace_settings.yml +++ b/db/docs/namespace_settings.yml @@ -3,7 +3,7 @@ table_name: namespace_settings classes: - NamespaceSetting feature_categories: -- subgroups +- groups_and_projects description: Stores settings per namespace introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36321 milestone: '13.2' diff --git a/db/docs/namespaces.yml b/db/docs/namespaces.yml index e608e996d51..a13939d5b69 100644 --- a/db/docs/namespaces.yml +++ b/db/docs/namespaces.yml @@ -6,7 +6,7 @@ classes: - Namespaces::ProjectNamespace - Namespaces::UserNamespace feature_categories: -- subgroups +- groups_and_projects description: Storing namespaces records for groups, users and projects introduced_by_url: https://github.com/gitlabhq/gitlabhq/pull/2051 milestone: "<6.0" diff --git a/db/docs/project_authorizations.yml b/db/docs/project_authorizations.yml index b81235d4aac..59e97fc24e2 100644 --- a/db/docs/project_authorizations.yml +++ b/db/docs/project_authorizations.yml @@ -3,7 +3,7 @@ table_name: project_authorizations classes: - ProjectAuthorization feature_categories: -- projects +- groups_and_projects - system_access description: Stores maximal access to the project per user introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/6839 diff --git a/db/docs/project_custom_attributes.yml b/db/docs/project_custom_attributes.yml index 3a4b76c5b02..d3a5f0ea0a9 100644 --- a/db/docs/project_custom_attributes.yml +++ b/db/docs/project_custom_attributes.yml @@ -3,7 +3,7 @@ table_name: project_custom_attributes classes: - ProjectCustomAttribute feature_categories: -- projects +- groups_and_projects description: Stores custom attributes per project introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/14593 milestone: '10.2' diff --git a/db/docs/project_settings.yml b/db/docs/project_settings.yml index 7113aedf1f8..63e96e34dc5 100644 --- a/db/docs/project_settings.yml +++ b/db/docs/project_settings.yml @@ -3,7 +3,7 @@ table_name: project_settings classes: - ProjectSetting feature_categories: -- projects +- groups_and_projects description: Stores settings per project introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/a2a7ad291f64a5db74c1bc21fb556e6e8862d0f3 milestone: '10.8' diff --git a/db/docs/project_topics.yml b/db/docs/project_topics.yml index 3d8ec0c342a..4343b440089 100644 --- a/db/docs/project_topics.yml +++ b/db/docs/project_topics.yml @@ -3,7 +3,7 @@ table_name: project_topics classes: - Projects::ProjectTopic feature_categories: -- projects +- groups_and_projects description: Stores topics per project relationship introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67574 milestone: '14.3' diff --git a/db/docs/projects.yml b/db/docs/projects.yml index 0b7dbbe2127..44ac68d891d 100644 --- a/db/docs/projects.yml +++ b/db/docs/projects.yml @@ -3,7 +3,7 @@ table_name: projects classes: - Project feature_categories: -- projects +- groups_and_projects description: Stores project records introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/9ba1224867665844b117fa037e1465bb706b3685 milestone: "<6.0" diff --git a/db/docs/redirect_routes.yml b/db/docs/redirect_routes.yml index 7997aae2952..c3a9b0db3d9 100644 --- a/db/docs/redirect_routes.yml +++ b/db/docs/redirect_routes.yml @@ -3,8 +3,7 @@ table_name: redirect_routes classes: - RedirectRoute feature_categories: -- projects -- subgroups +- groups_and_projects description: Stores routes for redirect after changing the path to group or project introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/11136 milestone: '9.2' diff --git a/db/docs/routes.yml b/db/docs/routes.yml index 4c078bc8558..c1a75dd873c 100644 --- a/db/docs/routes.yml +++ b/db/docs/routes.yml @@ -4,8 +4,7 @@ classes: - Gitlab::Database::RenameReservedPathsMigration::V1::MigrationClasses::Route - Route feature_categories: -- projects -- subgroups +- groups_and_projects - user_profile description: Stores routes per namespaces and projects introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7121 diff --git a/db/docs/topics.yml b/db/docs/topics.yml index 4411566e7ec..dcf988c58eb 100644 --- a/db/docs/topics.yml +++ b/db/docs/topics.yml @@ -3,7 +3,7 @@ table_name: topics classes: - Projects::Topic feature_categories: -- projects +- groups_and_projects description: Stores topics that can be assigned to projects introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67574 milestone: '14.3' diff --git a/db/docs/uploads.yml b/db/docs/uploads.yml index 88f3bd68946..68b2c5648de 100644 --- a/db/docs/uploads.yml +++ b/db/docs/uploads.yml @@ -7,7 +7,7 @@ feature_categories: - design_management - importers - portfolio_management -- projects +- groups_and_projects - source_code_management - team_planning description: For tracking blob metadata. Single table inheritance is used to relate this table to many other tables. diff --git a/db/docs/user_interacted_projects.yml b/db/docs/user_interacted_projects.yml index 206cb76c496..565dcdedf2c 100644 --- a/db/docs/user_interacted_projects.yml +++ b/db/docs/user_interacted_projects.yml @@ -3,7 +3,7 @@ table_name: user_interacted_projects classes: - UserInteractedProject feature_categories: -- projects +- groups_and_projects description: Tracks which projects a given user has actively interacted with introduced_by_url: https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17327 milestone: '10.6' diff --git a/db/docs/users_star_projects.yml b/db/docs/users_star_projects.yml index df03f721d57..fb5eda2d518 100644 --- a/db/docs/users_star_projects.yml +++ b/db/docs/users_star_projects.yml @@ -3,7 +3,7 @@ table_name: users_star_projects classes: - UsersStarProject feature_categories: -- projects +- groups_and_projects description: Stores conection between users and project through staring action introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/commit/714f7201d3362793d11f33793e5ef6dc83bdd2f0 milestone: '7.1' diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md index ba4c5fd9046..eba5a03d4dd 100644 --- a/doc/administration/reference_architectures/10k_users.md +++ b/doc/administration/reference_architectures/10k_users.md @@ -38,17 +38,11 @@ full list of reference architectures, see <!-- Disable ordered list rule https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md029---ordered-list-item-prefix --> <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) and [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) and [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. + - Redis is primarily single threaded. It's strongly recommended separating out the instances as specified into Cache and Persistent data to achieve optimum performance at this scale. 3. Can be optionally run on reputable third-party load balancing services (LB PaaS). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud Load Balancing](https://cloud.google.com/load-balancing) and [Amazon Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) are known to work. -4. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. +4. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. 5. Gitaly Cluster provides the benefits of fault tolerance, but comes with additional complexity of setup and management. Review the existing [technical limitations and considerations before deploying Gitaly Cluster](../gitaly/index.md#before-deploying-gitaly-cluster). If you want sharded Gitaly, use the same specs listed above for `Gitaly`. 6. Gitaly has been designed and tested with repositories of varying sizes that follow best practices. However, large repositories or monorepos that don't follow these practices can significantly impact Gitaly requirements. Refer to @@ -504,24 +498,21 @@ cluster to be used with GitLab. ### Provide your own PostgreSQL instance -If you're hosting GitLab on a cloud provider, you can optionally use a -managed service for PostgreSQL. +You can optionally use a [third party external service for PostgreSQL](../../administration/postgresql/external.md). -A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. +A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default from [14.4.0](../../update/index.md#1440). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. -If you use a cloud-managed service, or provide your own PostgreSQL: +If you use a third party external service: +1. Note that the HA Omnibus PostgreSQL setup encompasses PostgreSQL, PgBouncer and Consul. All of these components would no longer be required when using a third party external service. 1. Set up PostgreSQL according to the [database requirements document](../../install/requirements.md#database). 1. Set up a `gitlab` username with a password of your choice. The `gitlab` user needs privileges to create the `gitlabhq_production` database. 1. Configure the GitLab application servers with the appropriate details. This step is covered in [Configuring the GitLab Rails application](#configure-gitlab-rails). -1. For improved performance, configuring [Database Load Balancing](../postgresql/database_load_balancing.md) - with multiple read replicas is recommended. - -See [Configure GitLab using an external PostgreSQL service](../postgresql/external.md) for -further configuration steps. +1. The number of nodes required to achieve HA may differ depending on the service compared to Omnibus and doesn't need to match accordingly. +1. However, if [Database Load Balancing](../postgresql/database_load_balancing.md) via Read Replicas is desired for further improved performance it's recommended to follow the node count for the Reference Architecture. ### Standalone PostgreSQL using Omnibus GitLab @@ -811,6 +802,9 @@ start the failover procedure. NOTE: Redis clusters must each be deployed in an odd number of 3 nodes or more. This is to ensure Redis Sentinel can take votes as part of a quorum. This does not apply when configuring Redis externally, such as a cloud provider service. +NOTE: +Redis is primarily single threaded. It's strongly recommended separating out the instances as specified into Cache and Persistent data to achieve optimum performance at this scale. + Redis requires authentication if used with Sentinel. See [Redis Security](https://redis.io/docs/manual/security/) documentation for more information. We recommend using a combination of a Redis password and tight @@ -840,15 +834,11 @@ to be used with GitLab. The following IPs will be used as an example: - `10.6.0.62`: Redis - Persistent Replica 1 - `10.6.0.63`: Redis - Persistent Replica 2 -### Providing your own Redis instance - -Managed Redis from cloud providers (such as AWS ElastiCache) will work. If these -services support high availability, be sure it _isn't_ of the Redis Cluster type. +### Provide your own Redis instance -Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or later is required. Older Redis versions have reached end-of-life. +You can optionally use a third party external service for Redis as long as it meets the [requirements](../../install/requirements.md#redis). -Note the Redis node's IP address or hostname, port, and password (if required). -These will be necessary later when configuring the [GitLab application servers](#configure-gitlab-rails). +A reputable provider or solution should be used for this. [Google Memorystore](https://cloud.google.com/memorystore/docs/redis/redis-overview) and [AWS Elasticache](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/WhatIs.html) are known to work. However, note that the Redis Cluster mode specifically isn't supported by GitLab. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. ### Configure the Redis Cache cluster @@ -2194,7 +2184,7 @@ To configure the Monitoring node: GitLab supports using an [object storage](../object_storage.md) service for holding numerous types of data. It's recommended over [NFS](../nfs.md) for data objects and in general it's better in larger setups as object storage is typically much more performant, reliable, -and scalable. +and scalable. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. There are two ways of specifying object storage configuration in GitLab: @@ -2309,17 +2299,11 @@ services where applicable): <!-- Disable ordered list rule https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md029---ordered-list-item-prefix --> <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) and [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) and [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. + - Redis is primarily single threaded. It's strongly recommended separating out the instances as specified into Cache and Persistent data to achieve optimum performance at this scale. 3. Can be optionally run on reputable third-party load balancing services (LB PaaS). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud Load Balancing](https://cloud.google.com/load-balancing) and [Amazon Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) are known to work. -4. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. +4. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. 5. Gitaly Cluster provides the benefits of fault tolerance, but comes with additional complexity of setup and management. Review the existing [technical limitations and considerations before deploying Gitaly Cluster](../gitaly/index.md#before-deploying-gitaly-cluster). If you want sharded Gitaly, use the same specs listed above for `Gitaly`. 6. Gitaly has been designed and tested with repositories of varying sizes that follow best practices. However, large repositories or monorepos that don't follow these practices can significantly impact Gitaly requirements. Refer to diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md index 7984b9dd6c7..8222873a082 100644 --- a/doc/administration/reference_architectures/25k_users.md +++ b/doc/administration/reference_architectures/25k_users.md @@ -38,17 +38,11 @@ full list of reference architectures, see <!-- Disable ordered list rule https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md029---ordered-list-item-prefix --> <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) for more information. + - Redis is primarily single threaded. It's strongly recommended separating out the instances as specified into Cache and Persistent data to achieve optimum performance at this scale. 3. Can be optionally run on reputable third-party load balancing services (LB PaaS). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud Load Balancing](https://cloud.google.com/load-balancing) and [Amazon Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) are known to work. -4. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. +4. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. 5. Gitaly Cluster provides the benefits of fault tolerance, but comes with additional complexity of setup and management. Review the existing [technical limitations and considerations before deploying Gitaly Cluster](../gitaly/index.md#before-deploying-gitaly-cluster). If you want sharded Gitaly, use the same specs listed above for `Gitaly`. 6. Gitaly has been designed and tested with repositories of varying sizes that follow best practices. However, large repositories or monorepos that don't follow these practices can significantly impact Gitaly requirements. Refer to @@ -521,24 +515,21 @@ cluster to be used with GitLab. ### Provide your own PostgreSQL instance -If you're hosting GitLab on a cloud provider, you can optionally use a -managed service for PostgreSQL. +You can optionally use a [third party external service for PostgreSQL](../../administration/postgresql/external.md). -A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. +A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default from [14.4.0](../../update/index.md#1440). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. -If you use a cloud-managed service, or provide your own PostgreSQL: +If you use a third party external service: +1. Note that the HA Omnibus PostgreSQL setup encompasses PostgreSQL, PgBouncer and Consul. All of these components would no longer be required when using a third party external service. 1. Set up PostgreSQL according to the [database requirements document](../../install/requirements.md#database). 1. Set up a `gitlab` username with a password of your choice. The `gitlab` user needs privileges to create the `gitlabhq_production` database. 1. Configure the GitLab application servers with the appropriate details. This step is covered in [Configuring the GitLab Rails application](#configure-gitlab-rails). -1. For improved performance, configuring [Database Load Balancing](../postgresql/database_load_balancing.md) - with multiple read replicas is recommended. - -See [Configure GitLab using an external PostgreSQL service](../postgresql/external.md) for -further configuration steps. +1. The number of nodes required to achieve HA may differ depending on the service compared to Omnibus and doesn't need to match accordingly. +1. However, if [Database Load Balancing](../postgresql/database_load_balancing.md) via Read Replicas is desired for further improved performance it's recommended to follow the node count for the Reference Architecture. ### Standalone PostgreSQL using Omnibus GitLab @@ -828,6 +819,9 @@ start the failover procedure. NOTE: Redis clusters must each be deployed in an odd number of 3 nodes or more. This is to ensure Redis Sentinel can take votes as part of a quorum. This does not apply when configuring Redis externally, such as a cloud provider service. +NOTE: +Redis is primarily single threaded. It's strongly recommended separating out the instances as specified into Cache and Persistent data to achieve optimum performance at this scale. + Redis requires authentication if used with Sentinel. See [Redis Security](https://redis.io/docs/manual/security/) documentation for more information. We recommend using a combination of a Redis password and tight @@ -857,15 +851,11 @@ to be used with GitLab. The following IPs will be used as an example: - `10.6.0.62`: Redis - Persistent Replica 1 - `10.6.0.63`: Redis - Persistent Replica 2 -### Providing your own Redis instance - -Managed Redis from cloud providers (such as AWS ElastiCache) will work. If these -services support high availability, be sure it _isn't_ of the Redis Cluster type. +### Provide your own Redis instance -Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or later is required. Older Redis versions have reached end-of-life. +You can optionally use a third party external service for Redis as long as it meets the [requirements](../../install/requirements.md#redis). -Note the Redis node's IP address or hostname, port, and password (if required). -These will be necessary later when configuring the [GitLab application servers](#configure-gitlab-rails). +A reputable provider or solution should be used for this. [Google Memorystore](https://cloud.google.com/memorystore/docs/redis/redis-overview) and [AWS Elasticache](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/WhatIs.html) are known to work. However, note that the Redis Cluster mode specifically isn't supported by GitLab. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. ### Configure the Redis Cache cluster @@ -2212,7 +2202,7 @@ To configure the Monitoring node: GitLab supports using an [object storage](../object_storage.md) service for holding numerous types of data. It's recommended over [NFS](../nfs.md) for data objects and in general it's better in larger setups as object storage is typically much more performant, reliable, -and scalable. +and scalable. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. There are two ways of specifying object storage configuration in GitLab: @@ -2327,17 +2317,11 @@ services where applicable): <!-- Disable ordered list rule https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md029---ordered-list-item-prefix --> <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) for more information. + - Redis is primarily single threaded. It's strongly recommended separating out the instances as specified into Cache and Persistent data to achieve optimum performance at this scale. 3. Can be optionally run on reputable third-party load balancing services (LB PaaS). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud Load Balancing](https://cloud.google.com/load-balancing) and [Amazon Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) are known to work. -4. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. +4. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. 5. Gitaly Cluster provides the benefits of fault tolerance, but comes with additional complexity of setup and management. Review the existing [technical limitations and considerations before deploying Gitaly Cluster](../gitaly/index.md#before-deploying-gitaly-cluster). If you want sharded Gitaly, use the same specs listed above for `Gitaly`. 6. Gitaly has been designed and tested with repositories of varying sizes that follow best practices. However, large repositories or monorepos that don't follow these practices can significantly impact Gitaly requirements. Refer to diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md index 14dc9d26293..72079060724 100644 --- a/doc/administration/reference_architectures/2k_users.md +++ b/doc/administration/reference_architectures/2k_users.md @@ -31,16 +31,10 @@ For a full list of reference architectures, see | Object storage<sup>4</sup> | - | - | - | - | - | <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440), and [Azure Database for PostgreSQL](https://azure.microsoft.com/en-gb/products/postgresql/#overview) is **not recommended** due to [performance issues](https://gitlab.com/gitlab-org/quality/reference-architectures/-/issues/61). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) and [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) and [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. 3. Can be optionally run on reputable third-party load balancing services (LB PaaS). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud Load Balancing](https://cloud.google.com/load-balancing) and [Amazon Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) are known to work. +4. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. 4. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. 5. Gitaly has been designed and tested with repositories of varying sizes that follow best practices. However, large repositories or monorepos that don't follow these practices can significantly impact Gitaly requirements. Refer to @@ -253,23 +247,20 @@ to be used with GitLab. ### Provide your own PostgreSQL instance -If you're hosting GitLab on a cloud provider, you can optionally use a -managed service for PostgreSQL. +You can optionally use a [third party external service for PostgreSQL](../../administration/postgresql/external.md). -A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440), and Azure Database for PostgreSQL is **not recommended** due to [performance issues](https://gitlab.com/gitlab-org/quality/reference-architectures/-/issues/61). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. +A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default from [14.4.0](../../update/index.md#1440). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. -If you use a cloud-managed service, or provide your own PostgreSQL: +If you use a third party external service: +1. Note that the HA Omnibus PostgreSQL setup encompasses PostgreSQL, PgBouncer and Consul. All of these components would no longer be required when using a third party external service. 1. Set up PostgreSQL according to the [database requirements document](../../install/requirements.md#database). -1. Create a `gitlab` username with a password of your choice. The `gitlab` user +1. Set up a `gitlab` username with a password of your choice. The `gitlab` user needs privileges to create the `gitlabhq_production` database. 1. Configure the GitLab application servers with the appropriate details. This step is covered in [Configuring the GitLab Rails application](#configure-gitlab-rails). -See [Configure GitLab using an external PostgreSQL service](../postgresql/external.md) for -further configuration steps. - ### Standalone PostgreSQL using Omnibus GitLab 1. SSH in to the PostgreSQL server. @@ -341,14 +332,9 @@ to be used with GitLab. ### Provide your own Redis instance -Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or later is required. Older Redis versions have reached end-of-life. - -Managed Redis from cloud providers such as AWS ElastiCache will work. If these -services support high availability, be sure it is not the Redis Cluster type. +You can optionally use a third party external service for Redis as long as it meets the [requirements](../../install/requirements.md#redis). -Note the Redis node's IP address or hostname, port, and password (if required). -These will be necessary when configuring the -[GitLab application servers](#configure-gitlab-rails) later. +A reputable provider or solution should be used for this. [Google Memorystore](https://cloud.google.com/memorystore/docs/redis/redis-overview) and [AWS Elasticache](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/WhatIs.html) are known to work. However, note that the Redis Cluster mode specifically isn't supported by GitLab. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. ### Standalone Redis using Omnibus GitLab @@ -892,7 +878,7 @@ running [Prometheus](../monitoring/prometheus/index.md) and GitLab supports using an [object storage](../object_storage.md) service for holding numerous types of data. It's recommended over [NFS](../nfs.md) for data objects and in general it's better in larger setups as object storage is typically much more performant, reliable, -and scalable. +and scalable. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. There are two ways of specifying object storage configuration in GitLab: @@ -1005,15 +991,9 @@ services where applicable): <!-- Disable ordered list rule https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md029---ordered-list-item-prefix --> <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440), and [Azure Database for PostgreSQL](https://azure.microsoft.com/en-gb/products/postgresql/#overview) is **not recommended** due to [performance issues](https://gitlab.com/gitlab-org/quality/reference-architectures/-/issues/61). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. -3. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) and [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) and [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. +3. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. <!-- markdownlint-enable MD029 --> NOTE: diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md index 191e5218c43..1116a3f2cf0 100644 --- a/doc/administration/reference_architectures/3k_users.md +++ b/doc/administration/reference_architectures/3k_users.md @@ -47,17 +47,10 @@ For a full list of reference architectures, see <!-- Disable ordered list rule https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md029---ordered-list-item-prefix --> <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) for more information. 3. Can be optionally run on reputable third-party load balancing services (LB PaaS). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud Load Balancing](https://cloud.google.com/load-balancing) and [Amazon Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) are known to work. -4. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. +4. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. 5. Gitaly Cluster provides the benefits of fault tolerance, but comes with additional complexity of setup and management. Review the existing [technical limitations and considerations before deploying Gitaly Cluster](../gitaly/index.md#before-deploying-gitaly-cluster). If you want sharded Gitaly, use the same specs listed above for `Gitaly`. 6. Gitaly has been designed and tested with repositories of varying sizes that follow best practices. However, large repositories or monorepos that don't follow these practices can significantly impact Gitaly requirements. Refer to @@ -435,6 +428,9 @@ Using [Redis](https://redis.io/) in scalable environment is possible using a **P topology with a [Redis Sentinel](https://redis.io/docs/manual/sentinel/) service to watch and automatically start the failover procedure. +NOTE: +Redis clusters must each be deployed in an odd number of 3 nodes or more. This is to ensure Redis Sentinel can take votes as part of a quorum. This does not apply when configuring Redis externally, such as a cloud provider service. + Redis requires authentication if used with Sentinel. See [Redis Security](https://redis.io/docs/manual/security/) documentation for more information. We recommend using a combination of a Redis password and tight @@ -452,14 +448,9 @@ to be used with GitLab. The following IPs will be used as an example: ### Provide your own Redis instance -Managed Redis from cloud providers such as AWS ElastiCache will work. If these -services support high availability, be sure it is **not** the Redis Cluster type. - -Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or later is required. Older Redis versions have reached end-of-life. +You can optionally use a third party external service for Redis as long as it meets the [requirements](../../install/requirements.md#redis). -Note the Redis node's IP address or hostname, port, and password (if required). -These will be necessary when configuring the -[GitLab application servers](#configure-gitlab-rails) later. +A reputable provider or solution should be used for this. [Google Memorystore](https://cloud.google.com/memorystore/docs/redis/redis-overview) and [AWS Elasticache](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/WhatIs.html) are known to work. However, note that the Redis Cluster mode specifically isn't supported by GitLab. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. ### Standalone Redis using Omnibus GitLab @@ -794,24 +785,21 @@ cluster to be used with GitLab. ### Provide your own PostgreSQL instance -If you're hosting GitLab on a cloud provider, you can optionally use a -managed service for PostgreSQL. +You can optionally use a [third party external service for PostgreSQL](../../administration/postgresql/external.md). -A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. +A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default from [14.4.0](../../update/index.md#1440). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. -If you use a cloud-managed service, or provide your own PostgreSQL: +If you use a third party external service: +1. Note that the HA Omnibus PostgreSQL setup encompasses PostgreSQL, PgBouncer and Consul. All of these components would no longer be required when using a third party external service. 1. Set up PostgreSQL according to the [database requirements document](../../install/requirements.md#database). 1. Set up a `gitlab` username with a password of your choice. The `gitlab` user needs privileges to create the `gitlabhq_production` database. 1. Configure the GitLab application servers with the appropriate details. This step is covered in [Configuring the GitLab Rails application](#configure-gitlab-rails). -1. For improved performance, configuring [Database Load Balancing](../postgresql/database_load_balancing.md) - with multiple read replicas is recommended. - -See [Configure GitLab using an external PostgreSQL service](../postgresql/external.md) for -further configuration steps. +1. The number of nodes required to achieve HA may differ depending on the service compared to Omnibus and doesn't need to match accordingly. +1. However, if [Database Load Balancing](../postgresql/database_load_balancing.md) via Read Replicas is desired for further improved performance it's recommended to follow the node count for the Reference Architecture. ### Standalone PostgreSQL using Omnibus GitLab @@ -2179,7 +2167,7 @@ running [Prometheus](../monitoring/prometheus/index.md) and GitLab supports using an [object storage](../object_storage.md) service for holding numerous types of data. It's recommended over [NFS](../nfs.md) for data objects and in general it's better in larger setups as object storage is typically much more performant, reliable, -and scalable. +and scalable. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. There are two ways of specifying object storage configuration in GitLab: @@ -2317,17 +2305,10 @@ services where applicable): <!-- Disable ordered list rule https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md029---ordered-list-item-prefix --> <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) for more information. 3. Can be optionally run on reputable third-party load balancing services (LB PaaS). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud Load Balancing](https://cloud.google.com/load-balancing) and [Amazon Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) are known to work. -4. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. +4. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. 5. Gitaly Cluster provides the benefits of fault tolerance, but comes with additional complexity of setup and management. Review the existing [technical limitations and considerations before deploying Gitaly Cluster](../gitaly/index.md#before-deploying-gitaly-cluster). If you want sharded Gitaly, use the same specs listed above for `Gitaly`. 6. Gitaly has been designed and tested with repositories of varying sizes that follow best practices. However, large repositories or monorepos that don't follow these practices can significantly impact Gitaly requirements. Refer to diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md index 7d3ddf7578c..717b4a1b4dd 100644 --- a/doc/administration/reference_architectures/50k_users.md +++ b/doc/administration/reference_architectures/50k_users.md @@ -38,17 +38,11 @@ full list of reference architectures, see <!-- Disable ordered list rule https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md029---ordered-list-item-prefix --> <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) for more information. + - Redis is primarily single threaded. It's strongly recommended separating out the instances as specified into Cache and Persistent data to achieve optimum performance at this scale. 3. Can be optionally run on reputable third-party load balancing services (LB PaaS). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud Load Balancing](https://cloud.google.com/load-balancing) and [Amazon Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) are known to work. -4. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. +4. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. 5. Gitaly Cluster provides the benefits of fault tolerance, but comes with additional complexity of setup and management. Review the existing [technical limitations and considerations before deploying Gitaly Cluster](../gitaly/index.md#before-deploying-gitaly-cluster). If you want sharded Gitaly, use the same specs listed above for `Gitaly`. 6. Gitaly has been designed and tested with repositories of varying sizes that follow best practices. However, large repositories or monorepos that don't follow these practices can significantly impact Gitaly requirements. Refer to @@ -513,24 +507,21 @@ cluster to be used with GitLab. ### Provide your own PostgreSQL instance -If you're hosting GitLab on a cloud provider, you can optionally use a -managed service for PostgreSQL. +You can optionally use a [third party external service for PostgreSQL](../../administration/postgresql/external.md). -A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. +A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default from [14.4.0](../../update/index.md#1440). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. -If you use a cloud-managed service, or provide your own PostgreSQL: +If you use a third party external service: +1. Note that the HA Omnibus PostgreSQL setup encompasses PostgreSQL, PgBouncer and Consul. All of these components would no longer be required when using a third party external service. 1. Set up PostgreSQL according to the [database requirements document](../../install/requirements.md#database). 1. Set up a `gitlab` username with a password of your choice. The `gitlab` user needs privileges to create the `gitlabhq_production` database. 1. Configure the GitLab application servers with the appropriate details. This step is covered in [Configuring the GitLab Rails application](#configure-gitlab-rails). -1. For improved performance, configuring [Database Load Balancing](../postgresql/database_load_balancing.md) - with multiple read replicas is recommended. - -See [Configure GitLab using an external PostgreSQL service](../postgresql/external.md) for -further configuration steps. +1. The number of nodes required to achieve HA may differ depending on the service compared to Omnibus and doesn't need to match accordingly. +1. However, if [Database Load Balancing](../postgresql/database_load_balancing.md) via Read Replicas is desired for further improved performance it's recommended to follow the node count for the Reference Architecture. ### Standalone PostgreSQL using Omnibus GitLab @@ -821,6 +812,9 @@ start the failover procedure. NOTE: Redis clusters must each be deployed in an odd number of 3 nodes or more. This is to ensure Redis Sentinel can take votes as part of a quorum. This does not apply when configuring Redis externally, such as a cloud provider service. +NOTE: +Redis is primarily single threaded. It's strongly recommended separating out the instances as specified into Cache and Persistent data to achieve optimum performance at this scale. + Redis requires authentication if used with Sentinel. See [Redis Security](https://redis.io/docs/manual/security/) documentation for more information. We recommend using a combination of a Redis password and tight @@ -850,15 +844,11 @@ to be used with GitLab. The following IPs will be used as an example: - `10.6.0.62`: Redis - Persistent Replica 1 - `10.6.0.63`: Redis - Persistent Replica 2 -### Providing your own Redis instance - -Managed Redis from cloud providers (such as AWS ElastiCache) will work. If these -services support high availability, be sure it _isn't_ of the Redis Cluster type. +### Provide your own Redis instance -Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or later is required. Older Redis versions have reached end-of-life. +You can optionally use a third party external service for Redis as long as it meets the [requirements](../../install/requirements.md#redis). -Note the Redis node's IP address or hostname, port, and password (if required). -These will be necessary later when configuring the [GitLab application servers](#configure-gitlab-rails). +A reputable provider or solution should be used for this. [Google Memorystore](https://cloud.google.com/memorystore/docs/redis/redis-overview) and [AWS Elasticache](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/WhatIs.html) are known to work. However, note that the Redis Cluster mode specifically isn't supported by GitLab. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. ### Configure the Redis Cache cluster @@ -2211,7 +2201,7 @@ To configure the Monitoring node: GitLab supports using an [object storage](../object_storage.md) service for holding numerous types of data. It's recommended over [NFS](../nfs.md) for data objects and in general it's better in larger setups as object storage is typically much more performant, reliable, -and scalable. +and scalable. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. There are two ways of specifying object storage configuration in GitLab: @@ -2326,17 +2316,11 @@ services where applicable): <!-- Disable ordered list rule https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md029---ordered-list-item-prefix --> <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) for more information. + - Redis is primarily single threaded. It's strongly recommended separating out the instances as specified into Cache and Persistent data to achieve optimum performance at this scale. 3. Can be optionally run on reputable third-party load balancing services (LB PaaS). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud Load Balancing](https://cloud.google.com/load-balancing) and [Amazon Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) are known to work. -4. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. +4. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. 5. Gitaly Cluster provides the benefits of fault tolerance, but comes with additional complexity of setup and management. Review the existing [technical limitations and considerations before deploying Gitaly Cluster](../gitaly/index.md#before-deploying-gitaly-cluster). If you want sharded Gitaly, use the same specs listed above for `Gitaly`. 6. Gitaly has been designed and tested with repositories of varying sizes that follow best practices. However, large repositories or monorepos that don't follow these practices can significantly impact Gitaly requirements. Refer to diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md index 82087c91910..fe95da486c4 100644 --- a/doc/administration/reference_architectures/5k_users.md +++ b/doc/administration/reference_architectures/5k_users.md @@ -44,17 +44,10 @@ costly-to-operate environment by using the <!-- Disable ordered list rule https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md029---ordered-list-item-prefix --> <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) for more information. 3. Can be optionally run on reputable third-party load balancing services (LB PaaS). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud Load Balancing](https://cloud.google.com/load-balancing) and [Amazon Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) are known to work. -4. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. +4. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. 5. Gitaly Cluster provides the benefits of fault tolerance, but comes with additional complexity of setup and management. Review the existing [technical limitations and considerations before deploying Gitaly Cluster](../gitaly/index.md#before-deploying-gitaly-cluster). If you want sharded Gitaly, use the same specs listed above for `Gitaly`. 6. Gitaly has been designed and tested with repositories of varying sizes that follow best practices. However, large repositories or monorepos that don't follow these practices can significantly impact Gitaly requirements. Refer to @@ -449,14 +442,9 @@ to be used with GitLab. The following IPs are used as an example: ### Provide your own Redis instance -Managed Redis from cloud providers such as AWS ElastiCache works. If these -services support high availability, be sure it is **not** the Redis Cluster type. +You can optionally use a third party external service for Redis as long as it meets the [requirements](../../install/requirements.md#redis). -Because Omnibus GitLab packages ship with Redis 6.0 or later, Redis 6.0 or later is required. Older Redis versions have reached end-of-life. - -Note the Redis node's IP address or hostname, port, and password (if required). -These are necessary when configuring the -[GitLab application servers](#configure-gitlab-rails) later. +A reputable provider or solution should be used for this. [Google Memorystore](https://cloud.google.com/memorystore/docs/redis/redis-overview) and [AWS Elasticache](https://docs.aws.amazon.com/AmazonElastiCache/latest/red-ug/WhatIs.html) are known to work. However, note that the Redis Cluster mode specifically isn't supported by GitLab. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. ### Standalone Redis using Omnibus GitLab @@ -790,24 +778,21 @@ cluster to be used with GitLab. ### Provide your own PostgreSQL instance -If you're hosting GitLab on a cloud provider, you can optionally use a -managed service for PostgreSQL. +You can optionally use a [third party external service for PostgreSQL](../../administration/postgresql/external.md). -A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. +A reputable provider or solution should be used for this. [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. However, Amazon Aurora is **incompatible** with load balancing enabled by default from [14.4.0](../../update/index.md#1440). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. -If you use a cloud-managed service, or provide your own PostgreSQL: +If you use a third party external service: +1. Note that the HA Omnibus PostgreSQL setup encompasses PostgreSQL, PgBouncer and Consul. All of these components would no longer be required when using a third party external service. 1. Set up PostgreSQL according to the [database requirements document](../../install/requirements.md#database). 1. Set up a `gitlab` username with a password of your choice. The `gitlab` user needs privileges to create the `gitlabhq_production` database. 1. Configure the GitLab application servers with the appropriate details. This step is covered in [Configuring the GitLab Rails application](#configure-gitlab-rails). -1. For improved performance, configuring [Database Load Balancing](../postgresql/database_load_balancing.md) - with multiple read replicas is recommended. - -See [Configure GitLab using an external PostgreSQL service](../postgresql/external.md) for -further configuration steps. +1. The number of nodes required to achieve HA may differ depending on the service compared to Omnibus and doesn't need to match accordingly. +1. However, if [Database Load Balancing](../postgresql/database_load_balancing.md) via Read Replicas is desired for further improved performance it's recommended to follow the node count for the Reference Architecture. ### Standalone PostgreSQL using Omnibus GitLab @@ -2174,7 +2159,7 @@ running [Prometheus](../monitoring/prometheus/index.md) and GitLab supports using an [object storage](../object_storage.md) service for holding numerous types of data. It's recommended over [NFS](../nfs.md) for data objects and in general it's better in larger setups as object storage is typically much more performant, reliable, -and scalable. +and scalable. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. There are two ways of specifying object storage configuration in GitLab: @@ -2288,17 +2273,10 @@ services where applicable): <!-- Disable ordered list rule https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md029---ordered-list-item-prefix --> <!-- markdownlint-disable MD029 --> -1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud SQL](https://cloud.google.com/sql/docs/postgres/high-availability#normal) and [Amazon RDS](https://aws.amazon.com/rds/) are known to work. - - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - - Note that [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. - - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is **incompatible** with load balancing enabled by default in [14.4.0](../../update/index.md#1440). - - Consul is primarily used for Omnibus PostgreSQL high availability so can be ignored when using a PostgreSQL PaaS setup. However, Consul is also used optionally by Prometheus for Omnibus auto host discovery. -2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Memorystore](https://cloud.google.com/memorystore) and [Amazon ElastiCache](https://aws.amazon.com/elasticache/) are known to work. +1. Can be optionally run on reputable third-party external PaaS PostgreSQL solutions. See [Provide your own PostgreSQL instance](#provide-your-own-postgresql-instance) for more information. +2. Can be optionally run on reputable third-party external PaaS Redis solutions. See [Provide your own Redis instance](#provide-your-own-redis-instance) for more information. 3. Can be optionally run on reputable third-party load balancing services (LB PaaS). See [Recommended cloud providers and services](index.md#recommended-cloud-providers-and-services) for more information. - - [Google Cloud Load Balancing](https://cloud.google.com/load-balancing) and [Amazon Elastic Load Balancing](https://aws.amazon.com/elasticloadbalancing/) are known to work. -4. Should be run on reputable Cloud Provider or Self Managed solutions. More information can be found in the [Configure the object storage](#configure-the-object-storage) section. +4. Should be run on reputable Cloud Provider or Self Managed solutions. See [Configure the object storage](#configure-the-object-storage) for more information. 5. Gitaly Cluster provides the benefits of fault tolerance, but comes with additional complexity of setup and management. Review the existing [technical limitations and considerations before deploying Gitaly Cluster](../gitaly/index.md#before-deploying-gitaly-cluster). If you want sharded Gitaly, use the same specs listed above for `Gitaly`. 6. Gitaly has been designed and tested with repositories of varying sizes that follow best practices. However, large repositories or monorepos that don't follow these practices can significantly impact Gitaly requirements. Refer to diff --git a/doc/administration/reference_architectures/index.md b/doc/administration/reference_architectures/index.md index 4b9c26e8626..2afa0fb233a 100644 --- a/doc/administration/reference_architectures/index.md +++ b/doc/administration/reference_architectures/index.md @@ -321,18 +321,21 @@ Additionally, the following cloud provider services are validated and supported ### Recommendation notes for the database services -When selecting a database service, it should run a standard, performant, and [supported version](../../install/requirements.md#postgresql-requirements) of PostgreSQL with the following features: +[When selecting to use an external database service](../postgresql/external.md), it should run a standard, performant, and [supported version](../../install/requirements.md#postgresql-requirements). -- Read Replicas for [Database Load Balancing](../postgresql/database_load_balancing.md). -- Cross Region replication for [GitLab Geo](../geo/index.md). +If you choose to use a third party external service: + +1. Note that the HA Omnibus PostgreSQL setup encompasses PostgreSQL, PgBouncer and Consul. All of these components would no longer be required when using a third party external service. +1. The number of nodes required to achieve HA may differ depending on the service compared to Omnibus and doesn't need to match accordingly. +1. However, if [Database Load Balancing](../postgresql/database_load_balancing.md) via Read Replicas is desired for further improved performance it's recommended to follow the node count for the Reference Architecture. +1. If [GitLab Geo](../geo/index.md) is to be used the service will need to support Cross Region replication #### Unsupported database services Several database cloud provider services are known not to support the above or have been found to have other issues and aren't recommended: - [Amazon Aurora](https://aws.amazon.com/rds/aurora/) is incompatible and not supported. See [14.4.0](../../update/index.md#1440) for more details. -- [Azure Database for PostgreSQL Single Server](https://azure.microsoft.com/en-gb/products/postgresql/#overview) (Single / Flexible) is not supported for use due to notable performance / stability issues or missing functionality. See [Recommendation Notes for Azure](#recommendation-notes-for-azure) for more details. -- Azure Database for PostgreSQL Flexible Server uses Microsoft Azure Active Directory (Azure AD) as authentication mechanism, which is incompatible with GitLab database integration. +- [Azure Database for PostgreSQL Single Server](https://azure.microsoft.com/en-gb/products/postgresql/#overview) is not supported for use due to notable performance / stability issues or missing functionality. See [Recommendation Notes for Azure](#recommendation-notes-for-azure) for more details. - [Google AlloyDB](https://cloud.google.com/alloydb) and [Amazon RDS Multi-AZ DB cluster](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/multi-az-db-clusters-concepts.html) have not been tested and are not recommended. Both solutions are specifically not expected to work with GitLab Geo. - [Amazon RDS Multi-AZ DB instance](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.MultiAZSingleStandby.html) is a separate product and is supported. @@ -342,8 +345,9 @@ Due to performance issues that we found with several key Azure services, we only In addition to the above, you should be aware of the additional specific guidance for Azure: -- [Azure Database for PostgreSQL Single Server](https://azure.microsoft.com/en-gb/products/postgresql/#overview) (Single / Flexible) is not supported for use due to notable performance / stability issues or missing functionality. +- [Azure Database for PostgreSQL Single Server](https://azure.microsoft.com/en-gb/products/postgresql/#overview) is not supported for use due to notable performance / stability issues or missing functionality. - A new service, [Azure Database for PostgreSQL Flexible Server](https://learn.microsoft.com/en-us/azure/postgresql/flexible-server/) has been released. [Internal testing](https://gitlab.com/gitlab-org/quality/reference-architectures/-/issues/91) has shown that it does look to perform as expected, but this hasn't been validated in production, so generally isn't recommended at this time. Additionally, as it's a new service, you may find that it's missing some functionality depending on your requirements. + - Only standard Postgres authentication is supported at this time with this service. Microsoft Azure Active Directory (Azure AD) is not compatible. - [Azure Blob Storage](https://azure.microsoft.com/en-gb/products/storage/blobs/) has been found to have [performance limits that can impact production use at certain times](https://gitlab.com/gitlab-org/gitlab/-/issues/344861). However, this has only been seen in our largest architectures (25k+) so far. ## Deviating from the suggested reference architectures diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md index c27075a9a53..4bed7bcd634 100644 --- a/doc/api/graphql/reference/index.md +++ b/doc/api/graphql/reference/index.md @@ -36,6 +36,27 @@ in [Removed Items](../removed_items.md). The `Query` type contains the API's top-level entry points for all executable queries. +### `Query.aiMessages` + +Find AI messages. + +WARNING: +**Introduced** in 16.1. +This feature is an Experiment. It can be changed or removed at any time. + +Returns [`AiCachedMessageTypeConnection!`](#aicachedmessagetypeconnection). + +This field returns a [connection](#connections). It accepts the +four standard [pagination arguments](#connection-pagination-arguments): +`before: String`, `after: String`, `first: Int`, `last: Int`. + +#### Arguments + +| Name | Type | Description | +| ---- | ---- | ----------- | +| <a id="queryaimessagesrequestids"></a>`requestIds` | [`[ID!]`](#id) | Array of request IDs to fetch. | +| <a id="queryaimessagesroles"></a>`roles` | [`[AiCachedMessageRole!]`](#aicachedmessagerole) | Array of request IDs to fetch. | + ### `Query.boardList` Find an issue board list. @@ -7244,6 +7265,29 @@ The edge type for [`AgentConfiguration`](#agentconfiguration). | <a id="agentconfigurationedgecursor"></a>`cursor` | [`String!`](#string) | A cursor for use in pagination. | | <a id="agentconfigurationedgenode"></a>`node` | [`AgentConfiguration`](#agentconfiguration) | The item at the end of the edge. | +#### `AiCachedMessageTypeConnection` + +The connection type for [`AiCachedMessageType`](#aicachedmessagetype). + +##### Fields + +| Name | Type | Description | +| ---- | ---- | ----------- | +| <a id="aicachedmessagetypeconnectionedges"></a>`edges` | [`[AiCachedMessageTypeEdge]`](#aicachedmessagetypeedge) | A list of edges. | +| <a id="aicachedmessagetypeconnectionnodes"></a>`nodes` | [`[AiCachedMessageType]`](#aicachedmessagetype) | A list of nodes. | +| <a id="aicachedmessagetypeconnectionpageinfo"></a>`pageInfo` | [`PageInfo!`](#pageinfo) | Information to aid in pagination. | + +#### `AiCachedMessageTypeEdge` + +The edge type for [`AiCachedMessageType`](#aicachedmessagetype). + +##### Fields + +| Name | Type | Description | +| ---- | ---- | ----------- | +| <a id="aicachedmessagetypeedgecursor"></a>`cursor` | [`String!`](#string) | A cursor for use in pagination. | +| <a id="aicachedmessagetypeedgenode"></a>`node` | [`AiCachedMessageType`](#aicachedmessagetype) | The item at the end of the edge. | + #### `AiMessageTypeConnection` The connection type for [`AiMessageType`](#aimessagetype). @@ -11686,6 +11730,19 @@ Information about a connected Agent. | <a id="agentmetadatapodnamespace"></a>`podNamespace` | [`String`](#string) | Namespace of the pod running the Agent. | | <a id="agentmetadataversion"></a>`version` | [`String`](#string) | Agent version tag. | +### `AiCachedMessageType` + +#### Fields + +| Name | Type | Description | +| ---- | ---- | ----------- | +| <a id="aicachedmessagetypecontent"></a>`content` | [`String`](#string) | Content of the message. Can be null for user requests or failed responses. | +| <a id="aicachedmessagetypeerrors"></a>`errors` | [`[String!]!`](#string) | Errors that occurred while asynchronously fetching an AI(assistant) response. | +| <a id="aicachedmessagetypeid"></a>`id` | [`ID`](#id) | UUID of the message. | +| <a id="aicachedmessagetyperequestid"></a>`requestId` | [`ID`](#id) | UUID of the original request message. | +| <a id="aicachedmessagetyperole"></a>`role` | [`AiCachedMessageRole!`](#aicachedmessagerole) | Message role. | +| <a id="aicachedmessagetypetimestamp"></a>`timestamp` | [`Time!`](#time) | Message timestamp. | + ### `AiMessageType` #### Fields @@ -12591,7 +12648,7 @@ CI/CD variables for a GitLab instance. | <a id="cijobartifactfiletype"></a>`fileType` | [`JobArtifactFileType`](#jobartifactfiletype) | File type of the artifact. | | <a id="cijobartifactid"></a>`id` | [`CiJobArtifactID!`](#cijobartifactid) | ID of the artifact. | | <a id="cijobartifactname"></a>`name` | [`String`](#string) | File name of the artifact. | -| <a id="cijobartifactsize"></a>`size` | [`Int!`](#int) | Size of the artifact in bytes. | +| <a id="cijobartifactsize"></a>`size` | [`BigInt!`](#bigint) | Size of the artifact in bytes. | ### `CiJobTokenScopeType` @@ -23859,6 +23916,15 @@ Agent token statuses. | <a id="agenttokenstatusactive"></a>`ACTIVE` | Active agent token. | | <a id="agenttokenstatusrevoked"></a>`REVOKED` | Revoked agent token. | +### `AiCachedMessageRole` + +Roles to filter in chat message. + +| Value | Description | +| ----- | ----------- | +| <a id="aicachedmessageroleassistant"></a>`ASSISTANT` | Filter only AI responses. | +| <a id="aicachedmessageroleuser"></a>`USER` | Filter only user messages. | + ### `AlertManagementAlertSort` Values for sorting alerts. diff --git a/doc/api/plan_limits.md b/doc/api/plan_limits.md index 09d96bb0534..53dedca3312 100644 --- a/doc/api/plan_limits.md +++ b/doc/api/plan_limits.md @@ -43,15 +43,16 @@ Example response: "ci_registered_group_runners": 1000, "ci_registered_project_runners": 1000, "conan_max_file_size": 3221225472, + "enforcement_limit": 10000, "generic_packages_max_file_size": 5368709120, "helm_max_file_size": 5242880, + "notification_limit": 10000, "maven_max_file_size": 3221225472, "npm_max_file_size": 524288000, "nuget_max_file_size": 524288000, "pypi_max_file_size": 3221225472, "terraform_module_max_file_size": 1073741824, - "storage_size_limit": 15000, - "notification_limit": 10000 + "storage_size_limit": 15000 } ``` @@ -74,15 +75,16 @@ PUT /application/plan_limits | `ci_registered_group_runners` | integer | no | Maximum number of runners registered per group. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85895) in GitLab 15.0. | | `ci_registered_project_runners` | integer | no | Maximum number of runners registered per project. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85895) in GitLab 15.0. | | `conan_max_file_size` | integer | no | Maximum Conan package file size in bytes. | +| `enforcement_limit` | integer | no | Maximum storage size for root namespace limit enforcement in MiB. | | `generic_packages_max_file_size` | integer | no | Maximum generic package file size in bytes. | | `helm_max_file_size` | integer | no | Maximum Helm chart file size in bytes. | | `maven_max_file_size` | integer | no | Maximum Maven package file size in bytes. | +| `notification_limit` | integer | no | Maximum storage size for root namespace limit notifications in MiB. | | `npm_max_file_size` | integer | no | Maximum NPM package file size in bytes. | | `nuget_max_file_size` | integer | no | Maximum NuGet package file size in bytes. | | `pypi_max_file_size` | integer | no | Maximum PyPI package file size in bytes. | | `terraform_module_max_file_size` | integer | no | Maximum Terraform Module package file size in bytes. | -| `storage_size_limit` | integer | no | Maximum storage size for the root namespace in megabytes. | -| `notification_limit` | integer | no | Maximum storage size for root namespace limit notifications in megabytes. | +| `storage_size_limit` | integer | no | Maximum storage size for the root namespace in MiB. | ```shell curl --request PUT --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/application/plan_limits?plan_name=default&conan_max_file_size=3221225472" diff --git a/doc/development/feature_flags/index.md b/doc/development/feature_flags/index.md index 4b0ad30e3ad..30837ac8f3f 100644 --- a/doc/development/feature_flags/index.md +++ b/doc/development/feature_flags/index.md @@ -149,7 +149,7 @@ created using the [Experiment Tracking template](https://gitlab.com/gitlab-org/g `worker` feature flags are used for controlling Sidekiq workers behavior, such as deferring Sidekiq jobs. `worker` feature flags likely do not have any YAML definition as the name could be dynamically generated using -the worker name itself, e.g. `defer_sidekiq_jobs:AuthorizedProjectsWorker`. Some examples for using `worker` type feature +the worker name itself, e.g. `defer_sidekiq_jobs_AuthorizedProjectsWorker`. Some examples for using `worker` type feature flags can be found in [deferring Sidekiq jobs](#deferring-sidekiq-jobs). ## Feature flag definition and validation @@ -713,7 +713,7 @@ Feature flags with [`worker` type](#worker-type) can be used to control the beha ### Deferring Sidekiq jobs -Feature flags with the format of `defer_sidekiq_jobs:{WorkerName}` delay the execution of the worker +Feature flags with the format of `defer_sidekiq_jobs_{WorkerName}` delay the execution of the worker by scheduling the job at a later time. Deferring jobs can be useful during an incident where contentious behavior from worker instances are saturating infrastructure resources (such as database and database connection pool). @@ -728,16 +728,16 @@ use a **percentage of time** rollout. For example: ```shell # defer 100% of the jobs -/chatops run feature set defer_sidekiq_jobs:SlowRunningWorker true +/chatops run feature set defer_sidekiq_jobs_SlowRunningWorker true # defer 99% of the jobs, only letting 1% processed -/chatops run feature set defer_sidekiq_jobs:SlowRunningWorker 99 +/chatops run feature set defer_sidekiq_jobs_SlowRunningWorker 99 # defer 50% of the jobs -/chatops run feature set defer_sidekiq_jobs:SlowRunningWorker 50 +/chatops run feature set defer_sidekiq_jobs_SlowRunningWorker 50 # stop deferring the jobs, jobs are being processed normally -/chatops run feature set defer_sidekiq_jobs:SlowRunningWorker false +/chatops run feature set defer_sidekiq_jobs_SlowRunningWorker false ``` NOTE: diff --git a/doc/development/packages/debian_repository.md b/doc/development/packages/debian_repository.md index 1523d777e7b..b3e9bedfdd4 100644 --- a/doc/development/packages/debian_repository.md +++ b/doc/development/packages/debian_repository.md @@ -102,18 +102,33 @@ Next, if the file is a `.changes` format: 1. A [Release file](https://wiki.debian.org/DebianRepository/Format#A.22Release.22_files) is written, signed by the GPG key, and then stored. 1. Old component files are destroyed. -This diagram shows the path taken after a file is uploaded to the Debian API: +The three following diagrams show the path taken after a file is uploaded to the Debian API: ```mermaid sequenceDiagram + autonumber + actor Client Client->>+DebianProjectPackages: PUT projects/:id/packages/debian/:file_name + Note over DebianProjectPackages: If `.changes` file or distribution param present + DebianProjectPackages->>+CreateTemporaryPackageService: Create temporary package + Note over DebianProjectPackages: Else DebianProjectPackages->>+FindOrCreateIncomingService: Create "incoming" package + Note over DebianProjectPackages: Finally DebianProjectPackages->>+CreatePackageFileService: Create "unknown" file - Note over DebianProjectPackages: If `.changes` file - DebianProjectPackages->>+ProcessChangesWorker: Schedule worker to process the file + Note over CreatePackageFileService: If `.changes` file or distribution param present + CreatePackageFileService->>+ProcessPackageFileWorker: Schedule worker to process the file DebianProjectPackages->>+Client: 202 Created - ProcessChangesWorker->>+ProcessChangesService: Start service - ProcessChangesService->>+ExtractChangesMetadataService: Extract changesmetadata + + ProcessPackageFileWorker->>+ProcessPackageFileService: Start service +``` + +`ProcessPackageFileWorker` background job: + +```mermaid +sequenceDiagram + autonumber + ProcessPackageFileWorker->>+ProcessPackageFileService: Start service + ProcessPackageFileService->>+ExtractChangesMetadataService: Extract changes metadata ExtractChangesMetadataService->>+ExtractMetadataService: Extract file metadata ExtractMetadataService->>+ParseDebian822Service: run `dpkg --field` to get control file ExtractMetadataService->>+ExtractDebMetadataService: If .deb, .udeb or ddeb @@ -123,9 +138,9 @@ sequenceDiagram ExtractMetadataService->>+ParseDebian822Service: if .dsc, .changes, or buildinfo ParseDebian822Service-->>-ExtractMetadataService: Parse String as Debian RFC822 control data format ExtractMetadataService-->>-ExtractChangesMetadataService: Parse Metadata file - ExtractChangesMetadataService-->>-ProcessChangesService: Return list of files and hashes from the .changes file + ExtractChangesMetadataService-->>-ProcessPackageFileService: Return list of files and hashes from the .changes file loop process files listed in .changes - ProcessChangesService->>+ExtractMetadataService: Process file + ProcessPackageFileService->>+ExtractMetadataService: Process file ExtractMetadataService->>+ParseDebian822Service: run `dpkg --field` to get control file ExtractMetadataService->>+ExtractDebMetadataService: If .deb, .udeb or ddeb ExtractDebMetadataService->>+ParseDebian822Service: run `dpkg --field` to get control file @@ -133,9 +148,18 @@ sequenceDiagram ExtractDebMetadataService-->>-ExtractMetadataService: Return the parsed control file ExtractMetadataService->>+ParseDebian822Service: if .dsc, .changes, or buildinfo ParseDebian822Service-->>-ExtractMetadataService: Parse String as Debian RFC822 control data format - ExtractMetadataService-->>-ProcessChangesService: Use parsed metadata to update "unknown" (or known) file + ExtractMetadataService-->>-ProcessPackageFileService: Use parsed metadata to update "unknown" (or known) file end - ProcessChangesService->>+GenerateDistributionWorker: Find distribution and start service + ProcessPackageFileService->>+GenerateDistributionWorker: Find distribution and start service + + GenerateDistributionWorker->>+GenerateDistributionService: Generate distribution +``` + +`GenerateDistributionWorker` background job: + +```mermaid +sequenceDiagram + autonumber GenerateDistributionWorker->>+GenerateDistributionService: Generate distribution GenerateDistributionService->>+GenerateDistributionService: generate component files based on new archs and updates from .changes GenerateDistributionService->>+GenerateDistributionKeyService: generate GPG key for distribution @@ -143,7 +167,7 @@ sequenceDiagram GenerateDistributionService-->>-GenerateDistributionService: Generate distribution file GenerateDistributionService->>+SignDistributionService: Sign release file with GPG key SignDistributionService-->>-GenerateDistributionService: Save the signed release file - GenerateDistributionWorker->>+GenerateDistributionService: destroy no longer used component files + GenerateDistributionService->>+GenerateDistributionService: destroy no longer used component files ``` ### Distributions diff --git a/doc/development/service_ping/troubleshooting.md b/doc/development/service_ping/troubleshooting.md index e69557c7f1b..74e826a2208 100644 --- a/doc/development/service_ping/troubleshooting.md +++ b/doc/development/service_ping/troubleshooting.md @@ -10,7 +10,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w ### Symptoms -You will be alerted by a [Sisense alert](https://app.periscopedata.com/app/gitlab/alert/Service-ping-payload-drop-Alert/5a5b8766b8af43b4a75d6e9c684a365f/edit) that is sent to `#g_analyze_analytics_instrumentation` Slack channel +You will be alerted by the [Data team](https://about.gitlab.com/handbook/business-technology/data-team/) and their [Monte Carlo alerting](https://about.gitlab.com/handbook/business-technology/data-team/platform/monte-carlo/). ### Locating the problem @@ -18,8 +18,6 @@ First you need to identify at which stage in Service Ping data pipeline the drop Start at [Service Ping Health Dashboard](https://app.periscopedata.com/app/gitlab/968489) on Sisense. -The alert compares the current daily value with the daily value from previous week, excluding the last 48 hours as this is the interval where we export the data in GCP and get it into DWH. - You can use [this query](https://gitlab.com/gitlab-org/gitlab/-/issues/347298#note_836685350) as an example, to start detecting when the drop started. ### Troubleshoot the GitLab application layer diff --git a/doc/development/testing_guide/end_to_end/execution_context_selection.md b/doc/development/testing_guide/end_to_end/execution_context_selection.md index 4d83884f4d0..0082bb6ee23 100644 --- a/doc/development/testing_guide/end_to_end/execution_context_selection.md +++ b/doc/development/testing_guide/end_to_end/execution_context_selection.md @@ -44,8 +44,8 @@ Matches use: | `gitlab.com and staging.gitlab.com` | `only: { subdomain: /(staging.)?/, domain: 'gitlab' }` | `(staging.)?gitlab.com` | | `dev.gitlab.org` | `only: { tld: '.org', domain: 'gitlab', subdomain: 'dev' }` | `(dev).gitlab.org` | | `staging.gitlab.com and domain.gitlab.com` | `only: { subdomain: %i[staging domain] }` | `(staging\|domain).+.com` | -| The `nightly` pipeline | `only: { pipeline: :nightly }` | "nightly" | -| The `nightly` and `canary` pipelines | `only: { pipeline: [:nightly, :canary] }` | ["nightly"](https://gitlab.com/gitlab-org/quality/nightly) and ["canary"](https://gitlab.com/gitlab-org/quality/canary) | +| The `nightly` pipeline | `only: { pipeline: :nightly }` | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules) | +| The `nightly` and `canary` pipelines | `only: { pipeline: [:nightly, :canary] }` | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules) and ["canary"](https://gitlab.com/gitlab-org/quality/canary) | | The `ee:instance` job | `only: { job: 'ee:instance' }` | The `ee:instance` job in any pipeline | | Any `quarantine` job | `only: { job: '.*quarantine' }` | Any job ending in `quarantine` in any pipeline | | Any run where condition evaluates to a truthy value | `only: { condition: -> { ENV['TEST_ENV'] == 'true' } }` | Any run where `TEST_ENV` is set to true @@ -87,8 +87,8 @@ Matches use: | `gitlab.com and staging.gitlab.com` | `except: { subdomain: /(staging.)?/, domain: 'gitlab' }` | `(staging.)?gitlab.com` | | `dev.gitlab.org` | `except: { tld: '.org', domain: 'gitlab', subdomain: 'dev' }` | `(dev).gitlab.org` | | `staging.gitlab.com and domain.gitlab.com` | `except: { subdomain: %i[staging domain] }` | `(staging\|domain).+.com` | -| The `nightly` pipeline | `except: { pipeline: :nightly }` | ["nightly"](https://gitlab.com/gitlab-org/quality/nightly) | -| The `nightly` and `canary` pipelines | `except: { pipeline: [:nightly, :canary] }` | ["nightly"](https://gitlab.com/gitlab-org/quality/nightly) and ["canary"](https://gitlab.com/gitlab-org/quality/canary) | +| The `nightly` pipeline | `only: { pipeline: :nightly }` | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules) | +| The `nightly` and `canary` pipelines | `only: { pipeline: [:nightly, :canary] }` | ["nightly scheduled pipeline"](https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules) and ["canary"](https://gitlab.com/gitlab-org/quality/canary) | | The `ee:instance` job | `except: { job: 'ee:instance' }` | The `ee:instance` job in any pipeline | | Any `quarantine` job | `except: { job: '.*quarantine' }` | Any job ending in `quarantine` in any pipeline | | Any run except where condition evaluates to a truthy value | `except: { condition: -> { ENV['TEST_ENV'] == 'true' } }` | Any run where `TEST_ENV` is not set to true diff --git a/doc/development/testing_guide/end_to_end/index.md b/doc/development/testing_guide/end_to_end/index.md index 7932d4131f3..adf679c44a2 100644 --- a/doc/development/testing_guide/end_to_end/index.md +++ b/doc/development/testing_guide/end_to_end/index.md @@ -21,8 +21,8 @@ using the [GitLab QA orchestrator](https://gitlab.com/gitlab-org/gitlab-qa) tool ### Testing nightly builds We run scheduled pipelines each night to test nightly builds created by Omnibus. -You can find these pipelines at <https://gitlab.com/gitlab-org/quality/nightly/pipelines> -(requires the Developer role). Results are reported in the `#qa-nightly` Slack channel. +You can find these pipelines at <https://gitlab.com/gitlab-org/gitlab/-/pipeline_schedules> +(requires the Developer role). Results are reported in the `#qa-master` Slack channel. ### Testing staging diff --git a/doc/development/testing_guide/end_to_end/running_tests_that_require_special_setup.md b/doc/development/testing_guide/end_to_end/running_tests_that_require_special_setup.md index adf7bccb7fb..146ad95b255 100644 --- a/doc/development/testing_guide/end_to_end/running_tests_that_require_special_setup.md +++ b/doc/development/testing_guide/end_to_end/running_tests_that_require_special_setup.md @@ -428,8 +428,6 @@ For instructions on how to run these tests using the `gitlab-qa` gem, please ref Tests that are tagged with `:mobile` can be run against specified mobile devices using cloud emulator/simulator services. -These tests run in the [nightly pipeline](https://gitlab.com/gitlab-org/quality/nightly/-/pipelines) in the `ce:remote_mobile_safari` job. - ### How to run mobile tests with Sauce Labs Running directly against an environment like staging is not recommended because Sauce Labs test logs expose credentials. Therefore, it is best practice and the default to use a tunnel. diff --git a/doc/install/installation.md b/doc/install/installation.md index e4b4c6361a5..532f85acf43 100644 --- a/doc/install/installation.md +++ b/doc/install/installation.md @@ -423,7 +423,7 @@ In GitLab 12.1 and later, only PostgreSQL is supported. In GitLab 16.0 and later ## 8. Redis -See the [requirements page](requirements.md#redis-versions) for the minimum +See the [requirements page](requirements.md#redis) for the minimum Redis requirements. Install Redis with: diff --git a/doc/install/requirements.md b/doc/install/requirements.md index 7fdbdfc2b24..4a7c96d1330 100644 --- a/doc/install/requirements.md +++ b/doc/install/requirements.md @@ -8,12 +8,6 @@ info: To determine the technical writer assigned to the Stage/Group associated w This page includes information about the minimum requirements you need to install and use GitLab. -## Software requirements - -### Redis versions - -GitLab 16.0 and later requires Redis 6.0 or later. - ## Hardware requirements ### Storage @@ -248,11 +242,19 @@ By default, each Puma worker is limited to 1.2 GB of memory. You can [adjust this memory setting](../administration/operations/puma.md#reducing-memory-use) and should do so if you must increase the number of Puma workers. -## Redis and Sidekiq +## Redis Redis stores all user sessions and the background task queue. -The storage requirements for Redis are minimal, about 25 kB per user. -Sidekiq processes the background jobs with a multi-threaded process. + +The requirements for Redis are as follows: + +- Redis 6.0 is required from GitLab 16.0 and later. +- Redis Cluster mode is not supported. Redis Standalone must be used. +- Storage requirements for Redis are minimal, about 25 kB per user on average. + +## Sidekiq + +Sidekiq processes the background jobs with a multithreaded process. This process starts with the entire Rails stack (200 MB+) but it can grow over time due to memory leaks. On a very active server (10,000 billable users) the Sidekiq process can use 1 GB+ of memory. diff --git a/doc/user/project/repository/git_blame.md b/doc/user/project/repository/git_blame.md index fbf29bddd46..baac2a788be 100644 --- a/doc/user/project/repository/git_blame.md +++ b/doc/user/project/repository/git_blame.md @@ -10,7 +10,16 @@ description: "Documentation on Git file blame." [Git blame](https://git-scm.com/docs/git-blame) provides more information about every line in a file, including the last modified time, author, and -commit hash. To view it for a file: +commit hash. + +## View blame for a file + +Prerequisites: + +- The file type must be text-based. The GitLab UI does not display + `git blame` results for binary files. + +To view the blame for a file: 1. Go to your project's **Repository > Files**. 1. Select the file you want to review. diff --git a/doc/user/project/service_desk.md b/doc/user/project/service_desk.md index f19ddef8496..53da3ab86d2 100644 --- a/doc/user/project/service_desk.md +++ b/doc/user/project/service_desk.md @@ -54,6 +54,8 @@ Prerequisites: [email sub-addressing](../../administration/incoming_email.md#email-sub-addressing), but you can also use [catch-all mailboxes](../../administration/incoming_email.md#catch-all-mailbox). To do this, you must have administrator access. +- You must have enabled [issue](settings/index.md#configure-project-visibility-features-and-permissions) + tracker for the project. To enable Service Desk in your project: diff --git a/lib/api/admin/plan_limits.rb b/lib/api/admin/plan_limits.rb index 264c3c03e96..017c27cec95 100644 --- a/lib/api/admin/plan_limits.rb +++ b/lib/api/admin/plan_limits.rb @@ -60,17 +60,19 @@ module API optional :ci_registered_group_runners, type: Integer, desc: 'Maximum number of runners registered per group' optional :ci_registered_project_runners, type: Integer, desc: 'Maximum number of runners registered per project' optional :conan_max_file_size, type: Integer, desc: 'Maximum Conan package file size in bytes' + optional :enforcement_limit, type: Integer, + desc: 'Maximum storage size for the root namespace enforcement in MiB' optional :generic_packages_max_file_size, type: Integer, desc: 'Maximum generic package file size in bytes' optional :helm_max_file_size, type: Integer, desc: 'Maximum Helm chart file size in bytes' optional :maven_max_file_size, type: Integer, desc: 'Maximum Maven package file size in bytes' + optional :notification_limit, type: Integer, + desc: 'Maximum storage size for the root namespace notifications in MiB' optional :npm_max_file_size, type: Integer, desc: 'Maximum NPM package file size in bytes' optional :nuget_max_file_size, type: Integer, desc: 'Maximum NuGet package file size in bytes' optional :pypi_max_file_size, type: Integer, desc: 'Maximum PyPI package file size in bytes' optional :terraform_module_max_file_size, type: Integer, desc: 'Maximum Terraform Module package file size in bytes' - optional :storage_size_limit, type: Integer, desc: 'Maximum storage size for the root namespace in megabytes' - optional :notification_limit, type: Integer, - desc: 'Maximum storage size for the root namespace notifications in megabytes' + optional :storage_size_limit, type: Integer, desc: 'Maximum storage size for the root namespace in MiB' optional :pipeline_hierarchy_size, type: Integer, desc: "Maximum number of downstream pipelines in a pipeline's hierarchy tree" end diff --git a/lib/api/badges.rb b/lib/api/badges.rb index 020ba53b9ee..84c9f780a53 100644 --- a/lib/api/badges.rb +++ b/lib/api/badges.rb @@ -8,7 +8,7 @@ module API helpers ::API::Helpers::BadgesHelpers - feature_category :projects + feature_category :groups_and_projects helpers do def find_source_if_admin(source_type) diff --git a/lib/api/debian_project_packages.rb b/lib/api/debian_project_packages.rb index 4f78ac926d8..e1531847b87 100644 --- a/lib/api/debian_project_packages.rb +++ b/lib/api/debian_project_packages.rb @@ -19,6 +19,10 @@ module API def project_or_group authorized_user_project(action: :read_package) end + + def end_of_new_upload? + params[:distribution].present? || params[:file_name].end_with?('.changes') + end end after_validation do @@ -97,7 +101,7 @@ module API component: params['component'] } - package = if params[:distribution].present? + package = if end_of_new_upload? ::Packages::CreateTemporaryPackageService.new( project_or_group, current_user, declared_params.merge(build: current_authenticated_job) ).execute(:debian, name: ::Packages::Debian::TEMPORARY_PACKAGE_NAME) diff --git a/lib/api/entities/plan_limit.rb b/lib/api/entities/plan_limit.rb index 6943c5a9028..753c595d65f 100644 --- a/lib/api/entities/plan_limit.rb +++ b/lib/api/entities/plan_limit.rb @@ -11,16 +11,17 @@ module API expose :ci_registered_group_runners, documentation: { type: 'integer', example: 1000 } expose :ci_registered_project_runners, documentation: { type: 'integer', example: 1000 } expose :conan_max_file_size, documentation: { type: 'integer', example: 3221225472 } + expose :enforcement_limit, documentation: { type: 'integer', example: 15000 } expose :generic_packages_max_file_size, documentation: { type: 'integer', example: 5368709120 } expose :helm_max_file_size, documentation: { type: 'integer', example: 5242880 } expose :maven_max_file_size, documentation: { type: 'integer', example: 3221225472 } + expose :notification_limit, documentation: { type: 'integer', example: 15000 } expose :npm_max_file_size, documentation: { type: 'integer', example: 524288000 } expose :nuget_max_file_size, documentation: { type: 'integer', example: 524288000 } expose :pipeline_hierarchy_size, documentation: { type: 'integer', example: 1000 } expose :pypi_max_file_size, documentation: { type: 'integer', example: 3221225472 } expose :terraform_module_max_file_size, documentation: { type: 'integer', example: 1073741824 } expose :storage_size_limit, documentation: { type: 'integer', example: 15000 } - expose :notification_limit, documentation: { type: 'integer', example: 15000 } end end end diff --git a/lib/api/group_avatar.rb b/lib/api/group_avatar.rb index 0820011fd89..eeec23f27ab 100644 --- a/lib/api/group_avatar.rb +++ b/lib/api/group_avatar.rb @@ -4,7 +4,7 @@ module API class GroupAvatar < ::API::Base helpers Helpers::GroupsHelpers - feature_category :subgroups + feature_category :groups_and_projects params do requires :id, type: String, desc: 'The ID of the group' diff --git a/lib/api/groups.rb b/lib/api/groups.rb index e13b661b357..1a2314d41f0 100644 --- a/lib/api/groups.rb +++ b/lib/api/groups.rb @@ -9,7 +9,7 @@ module API helpers Helpers::GroupsHelpers - feature_category :subgroups, ['/groups/:id/custom_attributes', '/groups/:id/custom_attributes/:key'] + feature_category :groups_and_projects, ['/groups/:id/custom_attributes', '/groups/:id/custom_attributes/:key'] helpers do params :statistics_params do @@ -198,7 +198,7 @@ module API use :group_list_params use :with_custom_attributes end - get feature_category: :subgroups do + get feature_category: :groups_and_projects do groups = find_groups(declared_params(include_missing: false), params[:id]) present_groups_with_pagination_strategies params, groups end @@ -214,7 +214,7 @@ module API use :optional_params end - post feature_category: :subgroups, urgency: :low do + post feature_category: :groups_and_projects, urgency: :low do parent_group = find_group!(params[:parent_id]) if params[:parent_id].present? if parent_group authorize! :create_subgroup, parent_group @@ -248,7 +248,7 @@ module API use :optional_update_params use :optional_update_params_ee end - put ':id', feature_category: :subgroups, urgency: :low do + put ':id', feature_category: :groups_and_projects, urgency: :low do group = find_group!(params[:id]) group.preload_shared_group_links @@ -272,7 +272,7 @@ module API optional :with_projects, type: Boolean, default: true, desc: 'Omit project details' end # TODO: Set higher urgency after resolving https://gitlab.com/gitlab-org/gitlab/-/issues/357841 - get ":id", feature_category: :subgroups, urgency: :low do + get ":id", feature_category: :groups_and_projects, urgency: :low do group = find_group!(params[:id]) group.preload_shared_group_links @@ -282,7 +282,7 @@ module API desc 'Remove a group.' do tags %w[groups] end - delete ":id", feature_category: :subgroups, urgency: :low do + delete ":id", feature_category: :groups_and_projects, urgency: :low do group = find_group!(params[:id]) authorize! :admin_group, group check_subscription! group @@ -320,7 +320,7 @@ module API use :optional_projects_params end # TODO: Set higher urgency after resolving https://gitlab.com/gitlab-org/gitlab/-/issues/211498 - get ":id/projects", feature_category: :subgroups, urgency: :low do + get ":id/projects", feature_category: :groups_and_projects, urgency: :low do finder_options = { only_owned: !params[:with_shared], include_subgroups: params[:include_subgroups], @@ -356,7 +356,7 @@ module API use :pagination use :with_custom_attributes end - get ":id/projects/shared", feature_category: :subgroups do + get ":id/projects/shared", feature_category: :groups_and_projects do projects = find_group_projects(params, { only_shared: true }) present_projects(params, projects) @@ -371,7 +371,7 @@ module API use :group_list_params use :with_custom_attributes end - get ":id/subgroups", feature_category: :subgroups, urgency: :low do + get ":id/subgroups", feature_category: :groups_and_projects, urgency: :low do groups = find_groups(declared_params(include_missing: false), params[:id]) present_groups params, groups end @@ -385,7 +385,7 @@ module API use :group_list_params use :with_custom_attributes end - get ":id/descendant_groups", feature_category: :subgroups, urgency: :low do + get ":id/descendant_groups", feature_category: :groups_and_projects, urgency: :low do finder_params = declared_params(include_missing: false).merge(include_parent_descendants: true) groups = find_groups(finder_params, params[:id]) present_groups params, groups @@ -398,7 +398,7 @@ module API params do requires :project_id, type: String, desc: 'The ID or path of the project' end - post ":id/projects/:project_id", requirements: { project_id: /.+/ }, feature_category: :projects do + post ":id/projects/:project_id", requirements: { project_id: /.+/ }, feature_category: :groups_and_projects do authenticated_as_admin! group = find_group!(params[:id]) group.preload_shared_group_links @@ -421,7 +421,7 @@ module API optional :search, type: String, desc: 'Return list of namespaces matching the search criteria' use :pagination end - get ':id/transfer_locations', feature_category: :subgroups do + get ':id/transfer_locations', feature_category: :groups_and_projects do authorize! :admin_group, user_group args = declared_params(include_missing: false) @@ -440,7 +440,7 @@ module API desc: 'The ID of the target group to which the group needs to be transferred to.'\ 'If not provided, the source group will be promoted to a root group.' end - post ':id/transfer', feature_category: :subgroups do + post ':id/transfer', feature_category: :groups_and_projects do group = find_group!(params[:id]) authorize! :admin_group, group @@ -465,7 +465,7 @@ module API requires :group_access, type: Integer, values: Gitlab::Access.all_values, desc: 'The group access level' optional :expires_at, type: Date, desc: 'Share expiration date' end - post ":id/share", feature_category: :subgroups, urgency: :low do + post ":id/share", feature_category: :groups_and_projects, urgency: :low do shared_with_group = find_group!(params[:group_id]) group_link_create_params = { @@ -487,7 +487,7 @@ module API requires :group_id, type: Integer, desc: 'The ID of the shared group' end # rubocop: disable CodeReuse/ActiveRecord - delete ":id/share/:group_id", feature_category: :subgroups do + delete ":id/share/:group_id", feature_category: :groups_and_projects do shared_group = find_group!(params[:id]) link = shared_group.shared_with_group_links.find_by(shared_with_group_id: params[:group_id]) diff --git a/lib/api/members.rb b/lib/api/members.rb index 9321b7ad8d5..337706f36e1 100644 --- a/lib/api/members.rb +++ b/lib/api/members.rb @@ -11,8 +11,8 @@ module API helpers ::API::Helpers::MembersHelpers { - "group" => :subgroups, - "project" => :projects + "group" => :groups_and_projects, + "project" => :groups_and_projects }.each do |source_type, feature_category| params do requires :id, type: String, desc: "The #{source_type} ID" diff --git a/lib/api/namespaces.rb b/lib/api/namespaces.rb index c971f73ccbb..750dc7fc2a1 100644 --- a/lib/api/namespaces.rb +++ b/lib/api/namespaces.rb @@ -38,7 +38,7 @@ module API use :pagination use :optional_list_params_ee end - get feature_category: :subgroups, urgency: :low do + get feature_category: :groups_and_projects, urgency: :low do owned_only = params[:owned_only] == true namespaces = current_user.admin ? Namespace.all : current_user.namespaces(owned_only: owned_only) @@ -66,7 +66,7 @@ module API params do requires :id, types: [String, Integer], desc: 'ID or URL-encoded path of the namespace' end - get ':id', requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS, feature_category: :subgroups, urgency: :low do + get ':id', requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS, feature_category: :groups_and_projects, urgency: :low do user_namespace = find_namespace!(params[:id]) present user_namespace, with: Entities::Namespace, current_user: current_user @@ -84,7 +84,7 @@ module API requires :id, type: String, desc: "Namespace’s path" optional :parent_id, type: Integer, desc: 'The ID of the parent namespace. If no ID is specified, only top-level namespaces are considered.' end - get ':id/exists', requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS, feature_category: :subgroups, urgency: :low do + get ':id/exists', requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS, feature_category: :groups_and_projects, urgency: :low do check_rate_limit!(:namespace_exists, scope: current_user) namespace_path = params[:id] diff --git a/lib/api/projects.rb b/lib/api/projects.rb index 9c6d2d3d232..8cde6e6a16b 100644 --- a/lib/api/projects.rb +++ b/lib/api/projects.rb @@ -9,7 +9,7 @@ module API before { authenticate_non_get! } - feature_category :projects, %w[ + feature_category :groups_and_projects, %w[ /projects/:id/custom_attributes /projects/:id/custom_attributes/:key /projects/:id/share_locations @@ -244,7 +244,7 @@ module API use :statistics_params use :with_custom_attributes end - get ":user_id/projects", feature_category: :projects, urgency: :low do + get ":user_id/projects", feature_category: :groups_and_projects, urgency: :low do user = find_user(params[:user_id]) not_found!('User') unless user @@ -264,7 +264,7 @@ module API use :collection_params use :statistics_params end - get ":user_id/starred_projects", feature_category: :projects, urgency: :low do + get ":user_id/starred_projects", feature_category: :groups_and_projects, urgency: :low do user = find_user(params[:user_id]) not_found!('User') unless user @@ -290,7 +290,7 @@ module API use :with_custom_attributes end # TODO: Set higher urgency https://gitlab.com/gitlab-org/gitlab/-/issues/211495 - get feature_category: :projects, urgency: :low do + get feature_category: :groups_and_projects, urgency: :low do validate_projects_api_rate_limit_for_unauthenticated_users! validate_updated_at_order_and_filter! @@ -359,7 +359,7 @@ module API use :create_params end # rubocop: disable CodeReuse/ActiveRecord - post "user/:user_id", feature_category: :projects do + post "user/:user_id", feature_category: :groups_and_projects do Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/issues/21139') authenticated_as_admin! user = User.find_by(id: params.delete(:user_id)) @@ -416,7 +416,7 @@ module API desc: 'Include project license data' end # TODO: Set higher urgency https://gitlab.com/gitlab-org/gitlab/-/issues/357622 - get ":id", feature_category: :projects, urgency: :low do + get ":id", feature_category: :groups_and_projects, urgency: :low do options = { with: current_user ? Entities::ProjectWithAccess : Entities::BasicProjectDetails, current_user: current_user, @@ -527,7 +527,7 @@ module API at_least_one_of(*Helpers::ProjectsHelpers.update_params_at_least_one_of) end - put ':id', feature_category: :projects do + put ':id', feature_category: :groups_and_projects do authorize_admin_project attrs = declared_params(include_missing: false) authorize! :rename_project, user_project if attrs[:name].present? @@ -559,7 +559,7 @@ module API ] tags %w[projects] end - post ':id/archive', feature_category: :projects do + post ':id/archive', feature_category: :groups_and_projects do authorize!(:archive_project, user_project) ::Projects::UpdateService.new(user_project, current_user, archived: true).execute @@ -574,7 +574,7 @@ module API ] tags %w[projects] end - post ':id/unarchive', feature_category: :projects, urgency: :default do + post ':id/unarchive', feature_category: :groups_and_projects, urgency: :default do authorize!(:archive_project, user_project) ::Projects::UpdateService.new(user_project, current_user, archived: false).execute @@ -590,7 +590,7 @@ module API ] tags %w[projects] end - post ':id/star', feature_category: :projects do + post ':id/star', feature_category: :groups_and_projects do if current_user.starred?(user_project) not_modified! else @@ -609,7 +609,7 @@ module API ] tags %w[projects] end - post ':id/unstar', feature_category: :projects do + post ':id/unstar', feature_category: :groups_and_projects do if current_user.starred?(user_project) current_user.toggle_star(user_project) user_project.reset @@ -633,7 +633,7 @@ module API optional :search, type: String, desc: 'Return list of users matching the search criteria', documentation: { example: 'user' } use :pagination end - get ':id/starrers', feature_category: :projects do + get ':id/starrers', feature_category: :groups_and_projects do starrers = UsersStarProjectsFinder.new(user_project, params, current_user: current_user).execute present paginate(starrers), with: Entities::UserStarsProject @@ -661,7 +661,7 @@ module API ] tags %w[projects] end - delete ":id", feature_category: :projects do + delete ":id", feature_category: :groups_and_projects do authorize! :remove_project, user_project delete_project(user_project) @@ -729,7 +729,7 @@ module API requires :group_access, type: Integer, values: Gitlab::Access.values, as: :link_group_access, desc: 'The group access level' optional :expires_at, type: Date, desc: 'Share expiration date' end - post ":id/share", feature_category: :projects do + post ":id/share", feature_category: :groups_and_projects do authorize! :admin_project, user_project shared_with_group = Group.find_by_id(params[:group_id]) @@ -759,7 +759,7 @@ module API requires :group_id, type: Integer, desc: 'The ID of the group' end # rubocop: disable CodeReuse/ActiveRecord - delete ":id/share/:group_id", feature_category: :projects do + delete ":id/share/:group_id", feature_category: :groups_and_projects do authorize! :admin_project, user_project link = user_project.project_group_links.find_by(group_id: params[:group_id]) @@ -783,7 +783,7 @@ module API params do requires :project_id, type: Integer, desc: 'The ID of the source project to import the members from.' end - post ":id/import_project_members/:project_id", feature_category: :projects do + post ":id/import_project_members/:project_id", feature_category: :groups_and_projects do ::Gitlab::QueryLimiting.disable!('https://gitlab.com/gitlab-org/gitlab/-/issues/355916') authorize! :admin_project, user_project @@ -947,7 +947,7 @@ module API params do requires :namespace, type: String, desc: 'The ID or path of the new namespace', documentation: { example: 'gitlab' } end - put ":id/transfer", feature_category: :projects do + put ":id/transfer", feature_category: :groups_and_projects do authorize! :change_namespace, user_project namespace = find_namespace!(params[:namespace]) @@ -972,7 +972,7 @@ module API optional :search, type: String, desc: 'Return list of namespaces matching the search criteria', documentation: { example: 'search' } use :pagination end - get ":id/transfer_locations", feature_category: :projects do + get ":id/transfer_locations", feature_category: :groups_and_projects do authorize! :change_namespace, user_project args = declared_params(include_missing: false) args[:permission_scope] = :transfer_projects diff --git a/lib/api/topics.rb b/lib/api/topics.rb index b16b40244d4..c3a753a5cac 100644 --- a/lib/api/topics.rb +++ b/lib/api/topics.rb @@ -4,7 +4,7 @@ module API class Topics < ::API::Base include PaginationParams - feature_category :projects + feature_category :groups_and_projects desc 'Get topics' do detail 'This feature was introduced in GitLab 14.5.' diff --git a/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects.rb b/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects.rb index 592ef3220ff..74f5bc3f725 100644 --- a/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects.rb +++ b/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects.rb @@ -12,7 +12,7 @@ module Gitlab end operation_name :update_all - feature_category :projects + feature_category :groups_and_projects def perform each_sub_batch do |sub_batch| diff --git a/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups.rb b/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups.rb index 879e52c96bf..713131edd30 100644 --- a/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups.rb +++ b/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups.rb @@ -7,7 +7,7 @@ module Gitlab class RemoveProjectGroupLinkWithMissingGroups < Gitlab::BackgroundMigration::BatchedMigrationJob scope_to ->(relation) { relation } operation_name :delete_all - feature_category :subgroups + feature_category :groups_and_projects def perform each_sub_batch do |sub_batch| diff --git a/lib/gitlab/sidekiq_middleware/defer_jobs.rb b/lib/gitlab/sidekiq_middleware/defer_jobs.rb index 0674854bc00..62a16d60df7 100644 --- a/lib/gitlab/sidekiq_middleware/defer_jobs.rb +++ b/lib/gitlab/sidekiq_middleware/defer_jobs.rb @@ -7,7 +7,7 @@ module Gitlab DELAY = ENV.fetch("SIDEKIQ_DEFER_JOBS_DELAY", 5.minutes) FEATURE_FLAG_PREFIX = "defer_sidekiq_jobs" - # This middleware will defer jobs indefinitely until the `defer_sidekiq_jobs:#{worker_name}` feature flag + # This middleware will defer jobs indefinitely until the `defer_sidekiq_jobs_#{worker_name}` feature flag # is turned off (or when Feature.enabled? returns false by chance while using `percentage of time` value) def call(worker, job, _queue) if defer_job?(worker) @@ -24,7 +24,7 @@ module Gitlab end def defer_job?(worker) - Feature.enabled?(:"#{FEATURE_FLAG_PREFIX}:#{worker.class.name}", type: :worker, + Feature.enabled?(:"#{FEATURE_FLAG_PREFIX}_#{worker.class.name}", type: :worker, default_enabled_if_undefined: false) end end diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 58b392c8ee8..d4d691c237c 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -7495,6 +7495,9 @@ msgstr "" msgid "Blame could not be loaded as a single page." msgstr "" +msgid "Blame for binary files is not supported." +msgstr "" + msgid "BlobViewer|View on %{environmentName}" msgstr "" diff --git a/qa/.confiner/master.yml b/qa/.confiner/master.yml index e6fc3e68747..f58ea5de017 100644 --- a/qa/.confiner/master.yml +++ b/qa/.confiner/master.yml @@ -13,22 +13,3 @@ ref: master actions: - quarantine - -- name: Dequarantine E2E tests in Master that pass consistently - plugin: - name: gitlab # https://gitlab.com/gitlab-org/quality/confiner/-/blob/main/doc/plugins/gitlab.md - args: - threshold: 10 # at least 10 passes consecutively with no failures to be a candidate for dequarantine - private_token: $QA_GITLAB_CI_TOKEN - - # we do not run quarantined jobs automatically on master, but we still commit to master - project_id: gitlab-org/quality/nightly # https://gitlab.com/gitlab-org/quality/nightly/ - target_project: gitlab-org/gitlab # https://gitlab.com/gitlab-org/gitlab - failure_issue_labels: QA,Quality - failure_issue_prefix: "Failure in " - pwd: qa # E2E specs reside in the qa subdirectory - timeout: 30 - ref: master - job_pattern: '.+-quarantine' - actions: - - dequarantine diff --git a/qa/.confiner/nightly.yml b/qa/.confiner/nightly.yml deleted file mode 100644 index 78089525b0e..00000000000 --- a/qa/.confiner/nightly.yml +++ /dev/null @@ -1,19 +0,0 @@ -- name: Quarantine E2E tests in Nightly that fail consistently - plugin: - name: gitlab - args: - threshold: 3 - private_token: $QA_GITLAB_CI_TOKEN - project_id: gitlab-org/quality/nightly # https://gitlab.com/gitlab-org/quality/nightly/ - target_project: gitlab-org/gitlab - failure_issue_labels: QA,Quality,found:nightly - failure_issue_prefix: "Failure in " - pwd: qa - timeout: 30 - ref: master - environment: - name: nightly - pattern: 'pipeline: :nightly' - job_pattern: '^((?!quarantine).)*$' - actions: - - quarantine diff --git a/qa/qa/runtime/env.rb b/qa/qa/runtime/env.rb index cc16d2dfc76..9df33c4d8d3 100644 --- a/qa/qa/runtime/env.rb +++ b/qa/qa/runtime/env.rb @@ -86,6 +86,10 @@ module QA ENV['CI_PROJECT_NAME'] end + def schedule_type + ENV['SCHEDULE_TYPE'] + end + def generate_allure_report? enabled?(ENV['QA_GENERATE_ALLURE_REPORT'], default: false) end diff --git a/qa/qa/specs/helpers/context_selector.rb b/qa/qa/specs/helpers/context_selector.rb index ab8e9bc3639..88b3efb84cb 100644 --- a/qa/qa/specs/helpers/context_selector.rb +++ b/qa/qa/specs/helpers/context_selector.rb @@ -101,7 +101,13 @@ module QA end def pipeline_from_project_name(project_name) - project_name.to_s.start_with?('gitlab-qa') ? Runtime::Env.default_branch : project_name + if project_name.to_s.start_with?('gitlab-qa') + Runtime::Env.default_branch + elsif project_name.to_s == 'gitlab' && Runtime::Env.schedule_type == 'nightly' + 'nightly' + else + project_name + end end # Get production domain value based on GitLab edition and URI's top level domain diff --git a/qa/spec/specs/helpers/context_selector_spec.rb b/qa/spec/specs/helpers/context_selector_spec.rb index f6134cc6177..3550e78d9e3 100644 --- a/qa/spec/specs/helpers/context_selector_spec.rb +++ b/qa/spec/specs/helpers/context_selector_spec.rb @@ -535,6 +535,47 @@ RSpec.describe QA::Specs::Helpers::ContextSelector do end end end + + context 'with CI_PROJECT_NAME set to gitlab and SCHEDULE_TYPE set to nightly' do + before do + stub_env('CI_PROJECT_NAME', 'gitlab') + stub_env('SCHEDULE_TYPE', 'nightly') + end + + it 'runs on designated pipeline' do + group = describe_successfully do + it('runs on nightly', only: { pipeline: :nightly }) {} + it('does not run in not_nightly', only: { pipeline: :not_nightly }) {} + it('runs on nightly given an array', only: { pipeline: [:canary, :nightly] }) {} + it('does not run in not_nightly given an array', only: { pipeline: [:not_nightly, :canary] }) {} + end + + aggregate_failures do + expect(group.examples[0].execution_result.status).to eq(:passed) + expect(group.examples[1].execution_result.status).to eq(:pending) + expect(group.examples[2].execution_result.status).to eq(:passed) + expect(group.examples[3].execution_result.status).to eq(:pending) + end + end + + context 'when excluding contexts' do + it 'skips designated pipeline' do + group = describe_successfully do + it('skips nightly', except: { pipeline: :nightly }) {} + it('runs in not_nightly', except: { pipeline: :not_nightly }) {} + it('skips on nightly given an array', except: { pipeline: [:canary, :nightly] }) {} + it('runs in not_nightly given an array', except: { pipeline: [:not_nightly, :canary] }) {} + end + + aggregate_failures do + expect(group.examples[0].execution_result.status).to eq(:pending) + expect(group.examples[1].execution_result.status).to eq(:passed) + expect(group.examples[2].execution_result.status).to eq(:pending) + expect(group.examples[3].execution_result.status).to eq(:passed) + end + end + end + end end context 'with job constraints' do diff --git a/scripts/verify-tff-mapping b/scripts/verify-tff-mapping index 496e0b75f84..4ce0ec306d7 100755 --- a/scripts/verify-tff-mapping +++ b/scripts/verify-tff-mapping @@ -43,8 +43,13 @@ tests = [ { explanation: 'https://gitlab.com/gitlab-org/gitlab/-/issues/368628', - source: 'lib/gitlab/usage_data_counters/foo.rb', - expected: ['spec/lib/gitlab/usage_data_spec.rb'] + source: 'lib/gitlab/usage_data_counters/wiki_page_counter.rb', + expected: ['spec/lib/gitlab/usage_data_spec.rb', 'spec/lib/gitlab/usage_data_counters/wiki_page_counter_spec.rb'] + }, + { + explanation: 'EE usage counters map to usage data spec', + source: 'ee/lib/gitlab/usage_data_counters/licenses_list.rb', + expected: ['ee/spec/lib/gitlab/usage_data_counters/licenses_list_spec.rb', 'spec/lib/gitlab/usage_data_spec.rb'] }, { @@ -252,7 +257,12 @@ class MappingTest end def failure_message - "#{explanation}: #{source}: Expected #{expected_set.to_a}, got #{actual_set.to_a}." + <<~MESSAGE + #{explanation}: + Source #{source} + Expected #{expected_set.to_a} + Actual #{actual_set.to_a} + MESSAGE end private @@ -273,6 +283,7 @@ failed_tests = results.select(&:failed?) if failed_tests.any? puts <<~MESSAGE tff mapping verification failed: + #{failed_tests.map(&:failure_message).join("\n")} MESSAGE diff --git a/spec/controllers/autocomplete_controller_spec.rb b/spec/controllers/autocomplete_controller_spec.rb index 97729d181b1..4f3045eaa48 100644 --- a/spec/controllers/autocomplete_controller_spec.rb +++ b/spec/controllers/autocomplete_controller_spec.rb @@ -248,7 +248,7 @@ RSpec.describe AutocompleteController do end end - context 'GET projects', feature_category: :projects do + context 'GET projects', feature_category: :groups_and_projects do let(:authorized_project) { create(:project) } let(:authorized_search_project) { create(:project, name: 'rugged') } diff --git a/spec/controllers/dashboard/projects_controller_spec.rb b/spec/controllers/dashboard/projects_controller_spec.rb index 893546def5a..7c5fe0cccf5 100644 --- a/spec/controllers/dashboard/projects_controller_spec.rb +++ b/spec/controllers/dashboard/projects_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Dashboard::ProjectsController, :aggregate_failures, feature_category: :projects do +RSpec.describe Dashboard::ProjectsController, :aggregate_failures, feature_category: :groups_and_projects do include ExternalAuthorizationServiceHelpers let_it_be(:user) { create(:user) } diff --git a/spec/controllers/explore/projects_controller_spec.rb b/spec/controllers/explore/projects_controller_spec.rb index c2bdb0171e7..e73e115b77d 100644 --- a/spec/controllers/explore/projects_controller_spec.rb +++ b/spec/controllers/explore/projects_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Explore::ProjectsController, feature_category: :projects do +RSpec.describe Explore::ProjectsController, feature_category: :groups_and_projects do shared_examples 'explore projects' do let(:expected_default_sort) { 'latest_activity_desc' } diff --git a/spec/controllers/groups/children_controller_spec.rb b/spec/controllers/groups/children_controller_spec.rb index 2e37ed95c1c..ee8b2dce298 100644 --- a/spec/controllers/groups/children_controller_spec.rb +++ b/spec/controllers/groups/children_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::ChildrenController, feature_category: :subgroups do +RSpec.describe Groups::ChildrenController, feature_category: :groups_and_projects do include ExternalAuthorizationServiceHelpers let(:group) { create(:group, :public) } diff --git a/spec/controllers/projects/blame_controller_spec.rb b/spec/controllers/projects/blame_controller_spec.rb index 50556bdb652..38872b50e7d 100644 --- a/spec/controllers/projects/blame_controller_spec.rb +++ b/spec/controllers/projects/blame_controller_spec.rb @@ -28,6 +28,14 @@ RSpec.describe Projects::BlameController, feature_category: :source_code_managem end end + context 'valid branch, binary file' do + let(:id) { 'master/files/images/logo-black.png' } + + it 'redirects' do + expect(subject).to redirect_to("/#{project.full_path}/-/blob/master/files/images/logo-black.png") + end + end + context 'invalid branch, valid file' do let(:id) { 'invalid-branch/files/ruby/missing_file.rb' } diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index d1c4cbbe591..8544ea8524d 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -2,7 +2,7 @@ require('spec_helper') -RSpec.describe ProjectsController, feature_category: :projects do +RSpec.describe ProjectsController, feature_category: :groups_and_projects do include ExternalAuthorizationServiceHelpers include ProjectForksHelper using RSpec::Parameterized::TableSyntax diff --git a/spec/factories/packages/packages.rb b/spec/factories/packages/packages.rb index 283df3428db..09f710d545d 100644 --- a/spec/factories/packages/packages.rb +++ b/spec/factories/packages/packages.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + FactoryBot.define do factory :package, class: 'Packages::Package' do project @@ -72,6 +73,7 @@ FactoryBot.define do transient do without_package_files { false } + with_changes_file { false } file_metadatum_trait { processing? ? :unknown : :keep } published_in { :create } end @@ -97,6 +99,9 @@ FactoryBot.define do create :debian_package_file, :udeb, evaluator.file_metadatum_trait, package: package create :debian_package_file, :ddeb, evaluator.file_metadatum_trait, package: package create :debian_package_file, :buildinfo, evaluator.file_metadatum_trait, package: package + end + + if evaluator.with_changes_file create :debian_package_file, :changes, evaluator.file_metadatum_trait, package: package end end @@ -111,6 +116,28 @@ FactoryBot.define do published_in { nil } end end + + factory :debian_temporary_with_files do + status { :processing } + + transient do + without_package_files { false } + with_changes_file { false } + file_metadatum_trait { :unknown } + published_in { nil } + end + end + + factory :debian_temporary_with_changes do + status { :processing } + + transient do + without_package_files { true } + with_changes_file { true } + file_metadatum_trait { :unknown } + published_in { nil } + end + end end factory :helm_package do diff --git a/spec/features/admin/admin_groups_spec.rb b/spec/features/admin/admin_groups_spec.rb index 34fe98d22bd..1e3dbd7fea4 100644 --- a/spec/features/admin/admin_groups_spec.rb +++ b/spec/features/admin/admin_groups_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Admin Groups', feature_category: :subgroups do +RSpec.describe 'Admin Groups', feature_category: :groups_and_projects do include Features::MembersHelpers include Features::InviteMembersModalHelpers include Spec::Support::Helpers::ModalHelpers diff --git a/spec/features/admin/admin_projects_spec.rb b/spec/features/admin/admin_projects_spec.rb index ac2e9de7aee..3454b7af962 100644 --- a/spec/features/admin/admin_projects_spec.rb +++ b/spec/features/admin/admin_projects_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "Admin::Projects", feature_category: :projects do +RSpec.describe "Admin::Projects", feature_category: :groups_and_projects do include Features::MembersHelpers include Features::InviteMembersModalHelpers include Spec::Support::Helpers::ModalHelpers diff --git a/spec/features/admin/admin_sees_project_statistics_spec.rb b/spec/features/admin/admin_sees_project_statistics_spec.rb index d3d0625ac43..61e4ef42e12 100644 --- a/spec/features/admin/admin_sees_project_statistics_spec.rb +++ b/spec/features/admin/admin_sees_project_statistics_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "Admin > Admin sees project statistics", feature_category: :projects do +RSpec.describe "Admin > Admin sees project statistics", feature_category: :groups_and_projects do let(:current_user) { create(:admin) } before do diff --git a/spec/features/admin/admin_sees_projects_statistics_spec.rb b/spec/features/admin/admin_sees_projects_statistics_spec.rb index 82361a985ae..791351c78d0 100644 --- a/spec/features/admin/admin_sees_projects_statistics_spec.rb +++ b/spec/features/admin/admin_sees_projects_statistics_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "Admin > Admin sees projects statistics", feature_category: :projects do +RSpec.describe "Admin > Admin sees projects statistics", feature_category: :groups_and_projects do let(:current_user) { create(:admin) } before do diff --git a/spec/features/dashboard/archived_projects_spec.rb b/spec/features/dashboard/archived_projects_spec.rb index d3992d34506..b56f942d906 100644 --- a/spec/features/dashboard/archived_projects_spec.rb +++ b/spec/features/dashboard/archived_projects_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Dashboard Archived Project', feature_category: :projects do +RSpec.describe 'Dashboard Archived Project', feature_category: :groups_and_projects do let(:user) { create :user } let(:project) { create :project } let(:archived_project) { create(:project, :archived) } diff --git a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb b/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb index 3040c97a16f..c1849cbee83 100644 --- a/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb +++ b/spec/features/dashboard/group_dashboard_with_external_authorization_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'The group dashboard', :js, feature_category: :subgroups do +RSpec.describe 'The group dashboard', :js, feature_category: :groups_and_projects do include ExternalAuthorizationServiceHelpers include Features::TopNavSpecHelpers diff --git a/spec/features/dashboard/group_spec.rb b/spec/features/dashboard/group_spec.rb index f363007f0d7..ea600758607 100644 --- a/spec/features/dashboard/group_spec.rb +++ b/spec/features/dashboard/group_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Dashboard Group', feature_category: :subgroups do +RSpec.describe 'Dashboard Group', feature_category: :groups_and_projects do before do sign_in(create(:user)) end diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb index 7112b30957a..b077b554773 100644 --- a/spec/features/dashboard/groups_list_spec.rb +++ b/spec/features/dashboard/groups_list_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Dashboard Groups page', :js, feature_category: :subgroups do +RSpec.describe 'Dashboard Groups page', :js, feature_category: :groups_and_projects do let(:user) { create :user } let(:group) { create(:group) } let(:nested_group) { create(:group, :nested) } diff --git a/spec/features/dashboard/projects_spec.rb b/spec/features/dashboard/projects_spec.rb index 32bce32ec6c..04b7f1ca821 100644 --- a/spec/features/dashboard/projects_spec.rb +++ b/spec/features/dashboard/projects_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Dashboard Projects', feature_category: :projects do +RSpec.describe 'Dashboard Projects', feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:project, reload: true) { create(:project, :repository, creator: build(:user)) } # ensure creator != owner to avoid N+1 false-positive let_it_be(:project2) { create(:project, :public) } diff --git a/spec/features/dashboard/user_filters_projects_spec.rb b/spec/features/dashboard/user_filters_projects_spec.rb index 8ec9b98c3b3..bf9fe18ee75 100644 --- a/spec/features/dashboard/user_filters_projects_spec.rb +++ b/spec/features/dashboard/user_filters_projects_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Dashboard > User filters projects', feature_category: :projects do +RSpec.describe 'Dashboard > User filters projects', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project, name: 'Victorialand', namespace: user.namespace, created_at: 2.seconds.ago, updated_at: 2.seconds.ago) } let(:user2) { create(:user) } diff --git a/spec/features/explore/groups_list_spec.rb b/spec/features/explore/groups_list_spec.rb index 3ffa0dc5b64..39cd3c80307 100644 --- a/spec/features/explore/groups_list_spec.rb +++ b/spec/features/explore/groups_list_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Explore Groups page', :js, feature_category: :subgroups do +RSpec.describe 'Explore Groups page', :js, feature_category: :groups_and_projects do let!(:user) { create :user } let!(:group) { create(:group) } let!(:public_group) { create(:group, :public) } diff --git a/spec/features/explore/groups_spec.rb b/spec/features/explore/groups_spec.rb index 57a7e8ea523..9a3ae918bb9 100644 --- a/spec/features/explore/groups_spec.rb +++ b/spec/features/explore/groups_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Explore Groups', :js, feature_category: :subgroups do +RSpec.describe 'Explore Groups', :js, feature_category: :groups_and_projects do let(:user) { create :user } let(:group) { create :group } let!(:private_project) do diff --git a/spec/features/file_uploads/attachment_spec.rb b/spec/features/file_uploads/attachment_spec.rb index cff0c0b52b4..6c433b49b8b 100644 --- a/spec/features/file_uploads/attachment_spec.rb +++ b/spec/features/file_uploads/attachment_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Upload an attachment', :api, :js, feature_category: :projects do +RSpec.describe 'Upload an attachment', :api, :js, feature_category: :groups_and_projects do include_context 'file upload requests helpers' let_it_be(:project) { create(:project) } diff --git a/spec/features/file_uploads/group_import_spec.rb b/spec/features/file_uploads/group_import_spec.rb index f5082e31c06..02e6488f324 100644 --- a/spec/features/file_uploads/group_import_spec.rb +++ b/spec/features/file_uploads/group_import_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Upload a group export archive', :api, :js, feature_category: :subgroups do +RSpec.describe 'Upload a group export archive', :api, :js, feature_category: :groups_and_projects do include_context 'file upload requests helpers' let_it_be(:user) { create(:user, :admin) } diff --git a/spec/features/file_uploads/project_import_spec.rb b/spec/features/file_uploads/project_import_spec.rb index 3934e0319ad..acb4d43a373 100644 --- a/spec/features/file_uploads/project_import_spec.rb +++ b/spec/features/file_uploads/project_import_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Upload a project export archive', :api, :js, feature_category: :projects do +RSpec.describe 'Upload a project export archive', :api, :js, feature_category: :groups_and_projects do include_context 'file upload requests helpers' let_it_be(:user) { create(:user, :admin) } diff --git a/spec/features/groups/activity_spec.rb b/spec/features/groups/activity_spec.rb index 7e592b3f48b..12224566f35 100644 --- a/spec/features/groups/activity_spec.rb +++ b/spec/features/groups/activity_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group activity page', feature_category: :subgroups do +RSpec.describe 'Group activity page', feature_category: :groups_and_projects do let(:user) { create(:group_member, :developer, user: create(:user), group: group).user } let(:group) { create(:group) } let(:path) { activity_group_path(group) } diff --git a/spec/features/groups/board_sidebar_spec.rb b/spec/features/groups/board_sidebar_spec.rb index 8216bc3249d..6a1b7d20a25 100644 --- a/spec/features/groups/board_sidebar_spec.rb +++ b/spec/features/groups/board_sidebar_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group Issue Boards', :js, feature_category: :subgroups do +RSpec.describe 'Group Issue Boards', :js, feature_category: :groups_and_projects do include BoardHelpers let(:group) { create(:group) } diff --git a/spec/features/groups/empty_states_spec.rb b/spec/features/groups/empty_states_spec.rb index e123e223ae5..30074f421e5 100644 --- a/spec/features/groups/empty_states_spec.rb +++ b/spec/features/groups/empty_states_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group empty states', feature_category: :subgroups do +RSpec.describe 'Group empty states', feature_category: :groups_and_projects do let(:group) { create(:group) } let(:user) { create(:group_member, :developer, user: create(:user), group: group).user } diff --git a/spec/features/groups/group_page_with_external_authorization_service_spec.rb b/spec/features/groups/group_page_with_external_authorization_service_spec.rb index dce5b67d694..5b373aecce8 100644 --- a/spec/features/groups/group_page_with_external_authorization_service_spec.rb +++ b/spec/features/groups/group_page_with_external_authorization_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'The group page', feature_category: :subgroups do +RSpec.describe 'The group page', feature_category: :groups_and_projects do include ExternalAuthorizationServiceHelpers let(:user) { create(:user) } diff --git a/spec/features/groups/group_settings_spec.rb b/spec/features/groups/group_settings_spec.rb index 6443f4a6c38..a248a2b471a 100644 --- a/spec/features/groups/group_settings_spec.rb +++ b/spec/features/groups/group_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Edit group settings', feature_category: :subgroups do +RSpec.describe 'Edit group settings', feature_category: :groups_and_projects do include Spec::Support::Helpers::ModalHelpers let(:user) { create(:user) } diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb index 6d0d768d356..0d7e9df031c 100644 --- a/spec/features/groups/issues_spec.rb +++ b/spec/features/groups/issues_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group issues page', feature_category: :subgroups do +RSpec.describe 'Group issues page', feature_category: :groups_and_projects do include FilteredSearchHelpers include DragTo diff --git a/spec/features/groups/members/filter_members_spec.rb b/spec/features/groups/members/filter_members_spec.rb index c2ec709576b..bf9efd06a03 100644 --- a/spec/features/groups/members/filter_members_spec.rb +++ b/spec/features/groups/members/filter_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > Members > Filter members', :js, feature_category: :subgroups do +RSpec.describe 'Groups > Members > Filter members', :js, feature_category: :groups_and_projects do include Features::MembersHelpers let(:user) { create(:user) } diff --git a/spec/features/groups/members/leave_group_spec.rb b/spec/features/groups/members/leave_group_spec.rb index e1c2d8c0547..d864852e0d4 100644 --- a/spec/features/groups/members/leave_group_spec.rb +++ b/spec/features/groups/members/leave_group_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > Members > Leave group', feature_category: :subgroups do +RSpec.describe 'Groups > Members > Leave group', feature_category: :groups_and_projects do include Features::MembersHelpers include Spec::Support::Helpers::ModalHelpers diff --git a/spec/features/groups/members/list_members_spec.rb b/spec/features/groups/members/list_members_spec.rb index 6e20f92c16b..b16d61a5fe4 100644 --- a/spec/features/groups/members/list_members_spec.rb +++ b/spec/features/groups/members/list_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > Members > List members', :js, feature_category: :subgroups do +RSpec.describe 'Groups > Members > List members', :js, feature_category: :groups_and_projects do include Features::MembersHelpers let(:user1) { create(:user, name: 'John Doe') } diff --git a/spec/features/groups/members/manage_groups_spec.rb b/spec/features/groups/members/manage_groups_spec.rb index f9c11dd0183..599b31827da 100644 --- a/spec/features/groups/members/manage_groups_spec.rb +++ b/spec/features/groups/members/manage_groups_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > Members > Manage groups', :js, feature_category: :subgroups do +RSpec.describe 'Groups > Members > Manage groups', :js, feature_category: :groups_and_projects do include Features::MembersHelpers include Features::InviteMembersModalHelpers include Spec::Support::Helpers::ModalHelpers diff --git a/spec/features/groups/members/manage_members_spec.rb b/spec/features/groups/members/manage_members_spec.rb index 2d5a3dbb8f8..3c1425fc9ca 100644 --- a/spec/features/groups/members/manage_members_spec.rb +++ b/spec/features/groups/members/manage_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > Members > Manage members', feature_category: :subgroups do +RSpec.describe 'Groups > Members > Manage members', feature_category: :groups_and_projects do include Features::MembersHelpers include Features::InviteMembersModalHelpers include Spec::Support::Helpers::ModalHelpers diff --git a/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb index 4f56c807ec8..c2eedfb4063 100644 --- a/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb +++ b/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > Members > Owner adds member with expiration date', :js, feature_category: :subgroups do +RSpec.describe 'Groups > Members > Owner adds member with expiration date', :js, feature_category: :groups_and_projects do include Features::MembersHelpers include Features::InviteMembersModalHelpers diff --git a/spec/features/groups/members/master_manages_access_requests_spec.rb b/spec/features/groups/members/master_manages_access_requests_spec.rb index 951dc59feca..1b33a28d823 100644 --- a/spec/features/groups/members/master_manages_access_requests_spec.rb +++ b/spec/features/groups/members/master_manages_access_requests_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > Members > Maintainer manages access requests', feature_category: :subgroups do +RSpec.describe 'Groups > Members > Maintainer manages access requests', feature_category: :groups_and_projects do it_behaves_like 'Maintainer manages access requests' do let(:entity) { create(:group, :public) } let(:members_page_path) { group_group_members_path(entity) } diff --git a/spec/features/groups/members/request_access_spec.rb b/spec/features/groups/members/request_access_spec.rb index 35eb085a195..cd0c9bfe3eb 100644 --- a/spec/features/groups/members/request_access_spec.rb +++ b/spec/features/groups/members/request_access_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > Members > Request access', feature_category: :subgroups do +RSpec.describe 'Groups > Members > Request access', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:owner) { create(:user) } let(:group) { create(:group, :public) } diff --git a/spec/features/groups/members/search_members_spec.rb b/spec/features/groups/members/search_members_spec.rb index 80de1cabd1e..ed2e0cd7b09 100644 --- a/spec/features/groups/members/search_members_spec.rb +++ b/spec/features/groups/members/search_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Search group member', :js, feature_category: :subgroups do +RSpec.describe 'Search group member', :js, feature_category: :groups_and_projects do include Features::MembersHelpers let(:user) { create :user } diff --git a/spec/features/groups/members/sort_members_spec.rb b/spec/features/groups/members/sort_members_spec.rb index d2e5445deae..fd367b8e763 100644 --- a/spec/features/groups/members/sort_members_spec.rb +++ b/spec/features/groups/members/sort_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > Members > Sort members', :js, feature_category: :subgroups do +RSpec.describe 'Groups > Members > Sort members', :js, feature_category: :groups_and_projects do include Features::MembersHelpers let(:owner) { create(:user, name: 'John Doe', created_at: 5.days.ago, last_activity_on: Date.today) } diff --git a/spec/features/groups/members/tabs_spec.rb b/spec/features/groups/members/tabs_spec.rb index 2dc116842b3..cc97b367313 100644 --- a/spec/features/groups/members/tabs_spec.rb +++ b/spec/features/groups/members/tabs_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > Members > Tabs', :js, feature_category: :subgroups do +RSpec.describe 'Groups > Members > Tabs', :js, feature_category: :groups_and_projects do using RSpec::Parameterized::TableSyntax shared_examples 'active "Members" tab' do diff --git a/spec/features/groups/milestone_spec.rb b/spec/features/groups/milestone_spec.rb index 376e1e6063f..0a697eaa798 100644 --- a/spec/features/groups/milestone_spec.rb +++ b/spec/features/groups/milestone_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group milestones', feature_category: :subgroups do +RSpec.describe 'Group milestones', feature_category: :groups_and_projects do let_it_be(:group) { create(:group) } let_it_be(:project) { create(:project_empty_repo, group: group) } let_it_be(:user) { create(:group_member, :maintainer, user: create(:user), group: group).user } diff --git a/spec/features/groups/new_group_page_spec.rb b/spec/features/groups/new_group_page_spec.rb index 1efdc3fff07..a73dbf998c3 100644 --- a/spec/features/groups/new_group_page_spec.rb +++ b/spec/features/groups/new_group_page_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'New group page', :js, feature_category: :subgroups do +RSpec.describe 'New group page', :js, feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:parent_group) { create(:group) } diff --git a/spec/features/groups/settings/group_badges_spec.rb b/spec/features/groups/settings/group_badges_spec.rb index 07c8451f8fb..4a4cb297fcf 100644 --- a/spec/features/groups/settings/group_badges_spec.rb +++ b/spec/features/groups/settings/group_badges_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group Badges', feature_category: :subgroups do +RSpec.describe 'Group Badges', feature_category: :groups_and_projects do include WaitForRequests let(:user) { create(:user) } diff --git a/spec/features/groups/settings/manage_applications_spec.rb b/spec/features/groups/settings/manage_applications_spec.rb index e7b87cda506..94adeaa14d2 100644 --- a/spec/features/groups/settings/manage_applications_spec.rb +++ b/spec/features/groups/settings/manage_applications_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User manages applications', feature_category: :subgroups do +RSpec.describe 'User manages applications', feature_category: :groups_and_projects do let_it_be(:group) { create(:group) } let_it_be(:user) { create(:user) } let_it_be(:new_application_path) { group_settings_applications_path(group) } diff --git a/spec/features/groups/settings/user_searches_in_settings_spec.rb b/spec/features/groups/settings/user_searches_in_settings_spec.rb index 374ac236e20..6e94042185d 100644 --- a/spec/features/groups/settings/user_searches_in_settings_spec.rb +++ b/spec/features/groups/settings/user_searches_in_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User searches group settings', :js, feature_category: :subgroups do +RSpec.describe 'User searches group settings', :js, feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:group) { create(:group) } diff --git a/spec/features/groups/share_lock_spec.rb b/spec/features/groups/share_lock_spec.rb index 2f5a5e6ba16..34af5ee8b09 100644 --- a/spec/features/groups/share_lock_spec.rb +++ b/spec/features/groups/share_lock_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group share with group lock', feature_category: :subgroups do +RSpec.describe 'Group share with group lock', feature_category: :groups_and_projects do let(:root_owner) { create(:user) } let(:root_group) { create(:group) } diff --git a/spec/features/groups/show_spec.rb b/spec/features/groups/show_spec.rb index 0f936173e5d..8450322945c 100644 --- a/spec/features/groups/show_spec.rb +++ b/spec/features/groups/show_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group show page', feature_category: :subgroups do +RSpec.describe 'Group show page', feature_category: :groups_and_projects do include Features::InviteMembersModalHelpers let_it_be(:user) { create(:user) } diff --git a/spec/features/groups/user_browse_projects_group_page_spec.rb b/spec/features/groups/user_browse_projects_group_page_spec.rb index 38b879bb5b2..c3b8b81da68 100644 --- a/spec/features/groups/user_browse_projects_group_page_spec.rb +++ b/spec/features/groups/user_browse_projects_group_page_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User browse group projects page', feature_category: :subgroups do +RSpec.describe 'User browse group projects page', feature_category: :groups_and_projects do let(:user) { create :user } let(:group) { create :group } diff --git a/spec/features/groups/user_sees_package_sidebar_spec.rb b/spec/features/groups/user_sees_package_sidebar_spec.rb index 64422f5cca5..6a91dfb92bf 100644 --- a/spec/features/groups/user_sees_package_sidebar_spec.rb +++ b/spec/features/groups/user_sees_package_sidebar_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > sidebar', feature_category: :subgroups do +RSpec.describe 'Groups > sidebar', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:group) { create(:group) } diff --git a/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb b/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb index e5e30ed1a55..9a3232990ec 100644 --- a/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb +++ b/spec/features/groups/user_sees_users_dropdowns_in_issuables_list_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Groups > User sees users dropdowns in issuables list', :js, feature_category: :subgroups do +RSpec.describe 'Groups > User sees users dropdowns in issuables list', :js, feature_category: :groups_and_projects do include FilteredSearchHelpers let(:group) { create(:group) } diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb index 088b5b11a9a..de4b9964b98 100644 --- a/spec/features/groups_spec.rb +++ b/spec/features/groups_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group', feature_category: :subgroups do +RSpec.describe 'Group', feature_category: :groups_and_projects do let(:user) { create(:user) } before do diff --git a/spec/features/ics/group_issues_spec.rb b/spec/features/ics/group_issues_spec.rb index 70ec156a7b0..164f5df7cc5 100644 --- a/spec/features/ics/group_issues_spec.rb +++ b/spec/features/ics/group_issues_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Group Issues Calendar Feed', feature_category: :subgroups do +RSpec.describe 'Group Issues Calendar Feed', feature_category: :groups_and_projects do describe 'GET /issues' do let!(:user) do user = create(:user, email: 'private1@example.com') diff --git a/spec/features/ics/project_issues_spec.rb b/spec/features/ics/project_issues_spec.rb index 4bbd966d72a..daad6f1df2f 100644 --- a/spec/features/ics/project_issues_spec.rb +++ b/spec/features/ics/project_issues_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project Issues Calendar Feed', feature_category: :projects do +RSpec.describe 'Project Issues Calendar Feed', feature_category: :groups_and_projects do describe 'GET /issues' do let!(:user) do user = create(:user, email: 'private1@example.com') diff --git a/spec/features/projects/active_tabs_spec.rb b/spec/features/projects/active_tabs_spec.rb index c27c9530f61..594c2b442aa 100644 --- a/spec/features/projects/active_tabs_spec.rb +++ b/spec/features/projects/active_tabs_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project active tab', feature_category: :projects do +RSpec.describe 'Project active tab', feature_category: :groups_and_projects do let_it_be(:project) { create(:project, :repository, :with_namespace_settings) } let(:user) { project.first_owner } diff --git a/spec/features/projects/activity/rss_spec.rb b/spec/features/projects/activity/rss_spec.rb index 5297f30220d..fdb70092917 100644 --- a/spec/features/projects/activity/rss_spec.rb +++ b/spec/features/projects/activity/rss_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project Activity RSS', feature_category: :projects do +RSpec.describe 'Project Activity RSS', feature_category: :groups_and_projects do let(:project) { create(:project, :public) } let(:user) { project.first_owner } let(:path) { activity_project_path(project) } diff --git a/spec/features/projects/activity/user_sees_activity_spec.rb b/spec/features/projects/activity/user_sees_activity_spec.rb index cfa62415c49..5335b9d0e95 100644 --- a/spec/features/projects/activity/user_sees_activity_spec.rb +++ b/spec/features/projects/activity/user_sees_activity_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Activity > User sees activity', feature_category: :projects do +RSpec.describe 'Projects > Activity > User sees activity', feature_category: :groups_and_projects do let(:project) { create(:project, :repository, :public) } let(:user) { project.creator } let(:issue) { create(:issue, project: project) } diff --git a/spec/features/projects/activity/user_sees_private_activity_spec.rb b/spec/features/projects/activity/user_sees_private_activity_spec.rb index e0aaf1dbbc3..f475cb6d941 100644 --- a/spec/features/projects/activity/user_sees_private_activity_spec.rb +++ b/spec/features/projects/activity/user_sees_private_activity_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project > Activity > User sees private activity', :js, feature_category: :projects do +RSpec.describe 'Project > Activity > User sees private activity', :js, feature_category: :groups_and_projects do let(:project) { create(:project, :public) } let(:author) { create(:user) } let(:user) { create(:user) } diff --git a/spec/features/projects/blobs/blame_spec.rb b/spec/features/projects/blobs/blame_spec.rb index 9f061a2ff14..798cd401dac 100644 --- a/spec/features/projects/blobs/blame_spec.rb +++ b/spec/features/projects/blobs/blame_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'File blame', :js, feature_category: :projects do +RSpec.describe 'File blame', :js, feature_category: :groups_and_projects do include TreeHelper let_it_be(:project) { create(:project, :public, :repository) } diff --git a/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb b/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb index 48ee39dad19..f0058e75e52 100644 --- a/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb +++ b/spec/features/projects/blobs/blob_line_permalink_updater_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js, feature_category: :projects do +RSpec.describe 'Blob button line permalinks (BlobLinePermalinkUpdater)', :js, feature_category: :groups_and_projects do include TreeHelper let(:project) { create(:project, :public, :repository) } diff --git a/spec/features/projects/blobs/blob_show_spec.rb b/spec/features/projects/blobs/blob_show_spec.rb index cd1dde55e30..2e63500d36e 100644 --- a/spec/features/projects/blobs/blob_show_spec.rb +++ b/spec/features/projects/blobs/blob_show_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'File blob', :js, feature_category: :projects do +RSpec.describe 'File blob', :js, feature_category: :groups_and_projects do include MobileHelpers let(:project) { create(:project, :public, :repository) } diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb index 7474f416146..3c68f310744 100644 --- a/spec/features/projects/blobs/edit_spec.rb +++ b/spec/features/projects/blobs/edit_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Editing file blob', :js, feature_category: :projects do +RSpec.describe 'Editing file blob', :js, feature_category: :groups_and_projects do include Features::SourceEditorSpecHelpers include TreeHelper include Features::BlobSpecHelpers diff --git a/spec/features/projects/blobs/shortcuts_blob_spec.rb b/spec/features/projects/blobs/shortcuts_blob_spec.rb index 03276a737da..162066540d9 100644 --- a/spec/features/projects/blobs/shortcuts_blob_spec.rb +++ b/spec/features/projects/blobs/shortcuts_blob_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Blob shortcuts', :js, feature_category: :projects do +RSpec.describe 'Blob shortcuts', :js, feature_category: :groups_and_projects do include TreeHelper let(:project) { create(:project, :public, :repository) } let(:path) { project.repository.ls_files(project.repository.root_ref)[0] } diff --git a/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb b/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb index b723bd5690a..1990526b5fc 100644 --- a/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb +++ b/spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User follows pipeline suggest nudge spec when feature is enabled', :js, feature_category: :projects do +RSpec.describe 'User follows pipeline suggest nudge spec when feature is enabled', :js, feature_category: :groups_and_projects do include CookieHelper let(:project) { create(:project, :empty_repo) } diff --git a/spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb b/spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb index 3b383793de2..3e4ee13269f 100644 --- a/spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb +++ b/spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User views pipeline editor button on root ci config file', :js, feature_category: :projects do +RSpec.describe 'User views pipeline editor button on root ci config file', :js, feature_category: :groups_and_projects do include Features::BlobSpecHelpers let_it_be(:user) { create(:user) } diff --git a/spec/features/projects/branches/download_buttons_spec.rb b/spec/features/projects/branches/download_buttons_spec.rb index 80ccd9c1417..2092af537e8 100644 --- a/spec/features/projects/branches/download_buttons_spec.rb +++ b/spec/features/projects/branches/download_buttons_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Download buttons in branches page', feature_category: :projects do +RSpec.describe 'Download buttons in branches page', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:role) { :developer } let(:status) { 'success' } diff --git a/spec/features/projects/branches/new_branch_ref_dropdown_spec.rb b/spec/features/projects/branches/new_branch_ref_dropdown_spec.rb index 9afd8b3263a..0badde99bdb 100644 --- a/spec/features/projects/branches/new_branch_ref_dropdown_spec.rb +++ b/spec/features/projects/branches/new_branch_ref_dropdown_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'New Branch Ref Dropdown', :js, feature_category: :projects do +RSpec.describe 'New Branch Ref Dropdown', :js, feature_category: :groups_and_projects do include ListboxHelpers let(:user) { create(:user) } diff --git a/spec/features/projects/branches/user_creates_branch_spec.rb b/spec/features/projects/branches/user_creates_branch_spec.rb index 5aa10a8d4b0..8d636dacb75 100644 --- a/spec/features/projects/branches/user_creates_branch_spec.rb +++ b/spec/features/projects/branches/user_creates_branch_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User creates branch', :js, feature_category: :projects do +RSpec.describe 'User creates branch', :js, feature_category: :groups_and_projects do include Features::BranchesHelpers let_it_be(:group) { create(:group, :public) } diff --git a/spec/features/projects/branches/user_deletes_branch_spec.rb b/spec/features/projects/branches/user_deletes_branch_spec.rb index 92b5f176d2d..d120ea36a55 100644 --- a/spec/features/projects/branches/user_deletes_branch_spec.rb +++ b/spec/features/projects/branches/user_deletes_branch_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "User deletes branch", :js, feature_category: :projects do +RSpec.describe "User deletes branch", :js, feature_category: :groups_and_projects do include Spec::Support::Helpers::ModalHelpers let_it_be(:user) { create(:user) } diff --git a/spec/features/projects/branches/user_views_branches_spec.rb b/spec/features/projects/branches/user_views_branches_spec.rb index f0a1ba84ec6..322e1fa0ac1 100644 --- a/spec/features/projects/branches/user_views_branches_spec.rb +++ b/spec/features/projects/branches/user_views_branches_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "User views branches", :js, feature_category: :projects do +RSpec.describe "User views branches", :js, feature_category: :groups_and_projects do let_it_be(:project) { create(:project, :repository) } let_it_be(:user) { project.first_owner } diff --git a/spec/features/projects/branches_spec.rb b/spec/features/projects/branches_spec.rb index e1f1a63565c..7cfb7240db6 100644 --- a/spec/features/projects/branches_spec.rb +++ b/spec/features/projects/branches_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Branches', feature_category: :projects do +RSpec.describe 'Branches', feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :public, :repository) } let(:repository) { project.repository } diff --git a/spec/features/projects/classification_label_on_project_pages_spec.rb b/spec/features/projects/classification_label_on_project_pages_spec.rb index 662b2296234..fc3e2993cc8 100644 --- a/spec/features/projects/classification_label_on_project_pages_spec.rb +++ b/spec/features/projects/classification_label_on_project_pages_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Classification label on project pages', feature_category: :projects do +RSpec.describe 'Classification label on project pages', feature_category: :groups_and_projects do let(:project) do create(:project, external_authorization_classification_label: 'authorized label') end diff --git a/spec/features/projects/cluster_agents_spec.rb b/spec/features/projects/cluster_agents_spec.rb index 43046db2b6c..baef26e3e63 100644 --- a/spec/features/projects/cluster_agents_spec.rb +++ b/spec/features/projects/cluster_agents_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'ClusterAgents', :js, feature_category: :projects do +RSpec.describe 'ClusterAgents', :js, feature_category: :groups_and_projects do let_it_be(:token) { create(:cluster_agent_token, description: 'feature test token') } let(:agent) { token.agent } diff --git a/spec/features/projects/clusters_spec.rb b/spec/features/projects/clusters_spec.rb index 3fb586bd143..e2737d62749 100644 --- a/spec/features/projects/clusters_spec.rb +++ b/spec/features/projects/clusters_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Clusters', :js, feature_category: :projects do +RSpec.describe 'Clusters', :js, feature_category: :groups_and_projects do include GoogleApi::CloudPlatformHelpers let(:project) { create(:project) } diff --git a/spec/features/projects/compare_spec.rb b/spec/features/projects/compare_spec.rb index 4c13d23559b..3313f6ef3b7 100644 --- a/spec/features/projects/compare_spec.rb +++ b/spec/features/projects/compare_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "Compare", :js, feature_category: :projects do +RSpec.describe "Compare", :js, feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project, :repository) } diff --git a/spec/features/projects/container_registry_spec.rb b/spec/features/projects/container_registry_spec.rb index 5306a9f15c6..493435d3439 100644 --- a/spec/features/projects/container_registry_spec.rb +++ b/spec/features/projects/container_registry_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Container Registry', :js, feature_category: :projects do +RSpec.describe 'Container Registry', :js, feature_category: :groups_and_projects do include_context 'container registry tags' let(:user) { create(:user) } diff --git a/spec/features/projects/deploy_keys_spec.rb b/spec/features/projects/deploy_keys_spec.rb index bd48fb68304..219e47e3f0e 100644 --- a/spec/features/projects/deploy_keys_spec.rb +++ b/spec/features/projects/deploy_keys_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project deploy keys', :js, feature_category: :projects do +RSpec.describe 'Project deploy keys', :js, feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project_empty_repo) } let_it_be(:deploy_keys_project) { create(:deploy_keys_project, project: project) } diff --git a/spec/features/projects/environments/environment_spec.rb b/spec/features/projects/environments/environment_spec.rb index 527a146ff73..346268af972 100644 --- a/spec/features/projects/environments/environment_spec.rb +++ b/spec/features/projects/environments/environment_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Environment', feature_category: :projects do +RSpec.describe 'Environment', feature_category: :groups_and_projects do let_it_be(:project) { create(:project, :repository) } let(:user) { create(:user) } let(:role) { :developer } diff --git a/spec/features/projects/environments/environments_spec.rb b/spec/features/projects/environments/environments_spec.rb index b50fc59ac32..2490b1fde8e 100644 --- a/spec/features/projects/environments/environments_spec.rb +++ b/spec/features/projects/environments/environments_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Environments page', :js, feature_category: :projects do +RSpec.describe 'Environments page', :js, feature_category: :groups_and_projects do include Spec::Support::Helpers::ModalHelpers let(:project) { create(:project) } diff --git a/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb b/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb index 6383c3196c4..687af894168 100644 --- a/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb +++ b/spec/features/projects/feature_flag_user_lists/user_deletes_feature_flag_user_list_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User deletes feature flag user list', :js, feature_category: :projects do +RSpec.describe 'User deletes feature flag user list', :js, feature_category: :groups_and_projects do let_it_be(:project) { create(:project) } let_it_be(:developer) { create(:user) } diff --git a/spec/features/projects/feature_flag_user_lists/user_edits_feature_flag_user_list_spec.rb b/spec/features/projects/feature_flag_user_lists/user_edits_feature_flag_user_list_spec.rb index 8ab9e9baab9..8d0052c4ee1 100644 --- a/spec/features/projects/feature_flag_user_lists/user_edits_feature_flag_user_list_spec.rb +++ b/spec/features/projects/feature_flag_user_lists/user_edits_feature_flag_user_list_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User edits feature flag user list', :js, feature_category: :projects do +RSpec.describe 'User edits feature flag user list', :js, feature_category: :groups_and_projects do let_it_be(:project) { create(:project) } let_it_be(:developer) { create(:user) } diff --git a/spec/features/projects/feature_flag_user_lists/user_sees_feature_flag_user_list_details_spec.rb b/spec/features/projects/feature_flag_user_lists/user_sees_feature_flag_user_list_details_spec.rb index 7614349c5a4..672c4eb714c 100644 --- a/spec/features/projects/feature_flag_user_lists/user_sees_feature_flag_user_list_details_spec.rb +++ b/spec/features/projects/feature_flag_user_lists/user_sees_feature_flag_user_list_details_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User sees feature flag user list details', :js, feature_category: :projects do +RSpec.describe 'User sees feature flag user list details', :js, feature_category: :groups_and_projects do let_it_be(:project) { create(:project) } let_it_be(:developer) { create(:user) } diff --git a/spec/features/projects/features_visibility_spec.rb b/spec/features/projects/features_visibility_spec.rb index 5e0998412ed..b798524b9c4 100644 --- a/spec/features/projects/features_visibility_spec.rb +++ b/spec/features/projects/features_visibility_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Edit Project Settings', feature_category: :projects do +RSpec.describe 'Edit Project Settings', feature_category: :groups_and_projects do let(:member) { create(:user) } let!(:project) { create(:project, :public, :repository) } let!(:issue) { create(:issue, project: project) } diff --git a/spec/features/projects/files/dockerfile_dropdown_spec.rb b/spec/features/projects/files/dockerfile_dropdown_spec.rb index ec1f03570d9..a74cde35be6 100644 --- a/spec/features/projects/files/dockerfile_dropdown_spec.rb +++ b/spec/features/projects/files/dockerfile_dropdown_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User wants to add a Dockerfile file', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > User wants to add a Dockerfile file', :js, feature_category: :groups_and_projects do include Features::SourceEditorSpecHelpers before do diff --git a/spec/features/projects/files/download_buttons_spec.rb b/spec/features/projects/files/download_buttons_spec.rb index 2710e2efa94..9b3d19cfea3 100644 --- a/spec/features/projects/files/download_buttons_spec.rb +++ b/spec/features/projects/files/download_buttons_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > Download buttons in files tree', feature_category: :projects do +RSpec.describe 'Projects > Files > Download buttons in files tree', feature_category: :groups_and_projects do let(:project) { create(:project, :repository) } let(:user) { project.creator } diff --git a/spec/features/projects/files/edit_file_soft_wrap_spec.rb b/spec/features/projects/files/edit_file_soft_wrap_spec.rb index f6342257847..8f7c09aac69 100644 --- a/spec/features/projects/files/edit_file_soft_wrap_spec.rb +++ b/spec/features/projects/files/edit_file_soft_wrap_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User uses soft wrap while editing file', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > User uses soft wrap while editing file', :js, feature_category: :groups_and_projects do before do project = create(:project, :repository) user = project.first_owner diff --git a/spec/features/projects/files/editing_a_file_spec.rb b/spec/features/projects/files/editing_a_file_spec.rb index 1f928da0427..b4edd5c2729 100644 --- a/spec/features/projects/files/editing_a_file_spec.rb +++ b/spec/features/projects/files/editing_a_file_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User wants to edit a file', feature_category: :projects do +RSpec.describe 'Projects > Files > User wants to edit a file', feature_category: :groups_and_projects do include ProjectForksHelper let(:project) { create(:project, :repository, :public) } let(:user) { project.first_owner } diff --git a/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb b/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb index d791e22e4f8..ce63afe58d1 100644 --- a/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb +++ b/spec/features/projects/files/files_sort_submodules_with_folders_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User views files page', feature_category: :projects do +RSpec.describe 'Projects > Files > User views files page', feature_category: :groups_and_projects do let(:project) { create(:forked_project_with_submodules) } let(:user) { project.first_owner } diff --git a/spec/features/projects/files/find_file_keyboard_spec.rb b/spec/features/projects/files/find_file_keyboard_spec.rb index 19813396435..85ecd1c2d96 100644 --- a/spec/features/projects/files/find_file_keyboard_spec.rb +++ b/spec/features/projects/files/find_file_keyboard_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > Find file keyboard shortcuts', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > Find file keyboard shortcuts', :js, feature_category: :groups_and_projects do let(:project) { create(:project, :repository) } let(:user) { project.first_owner } diff --git a/spec/features/projects/files/gitignore_dropdown_spec.rb b/spec/features/projects/files/gitignore_dropdown_spec.rb index eedb79167bd..36b02b9b948 100644 --- a/spec/features/projects/files/gitignore_dropdown_spec.rb +++ b/spec/features/projects/files/gitignore_dropdown_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User wants to add a .gitignore file', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > User wants to add a .gitignore file', :js, feature_category: :groups_and_projects do include Features::SourceEditorSpecHelpers before do diff --git a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb index f2d657b3513..929554ff0d6 100644 --- a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb +++ b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User wants to add a .gitlab-ci.yml file', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > User wants to add a .gitlab-ci.yml file', :js, feature_category: :groups_and_projects do include Features::SourceEditorSpecHelpers let(:params) { {} } diff --git a/spec/features/projects/files/project_owner_creates_license_file_spec.rb b/spec/features/projects/files/project_owner_creates_license_file_spec.rb index 7ac9cb33060..8ec9adaeb9a 100644 --- a/spec/features/projects/files/project_owner_creates_license_file_spec.rb +++ b/spec/features/projects/files/project_owner_creates_license_file_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > Project owner creates a license file', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > Project owner creates a license file', :js, feature_category: :groups_and_projects do let(:project) { create(:project, :repository) } let(:project_maintainer) { project.first_owner } diff --git a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb index cfa55eba188..bfe1fd073c5 100644 --- a/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb +++ b/spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe 'Projects > Files > Project owner sees a link to create a license file in empty project', :js, -feature_category: :projects do +feature_category: :groups_and_projects do include Features::WebIdeSpecHelpers let(:project) { create(:project_empty_repo) } diff --git a/spec/features/projects/files/template_selector_menu_spec.rb b/spec/features/projects/files/template_selector_menu_spec.rb index 8dbfa3afb0b..46c4b69bc89 100644 --- a/spec/features/projects/files/template_selector_menu_spec.rb +++ b/spec/features/projects/files/template_selector_menu_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Template selector menu', :js, feature_category: :projects do +RSpec.describe 'Template selector menu', :js, feature_category: :groups_and_projects do let(:project) { create(:project, :repository) } let(:user) { create(:user) } diff --git a/spec/features/projects/files/undo_template_spec.rb b/spec/features/projects/files/undo_template_spec.rb index 0dfed209ce9..4b6e6b7282c 100644 --- a/spec/features/projects/files/undo_template_spec.rb +++ b/spec/features/projects/files/undo_template_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > Template Undo Button', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > Template Undo Button', :js, feature_category: :groups_and_projects do let(:project) { create(:project, :repository) } let(:user) { project.first_owner } diff --git a/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb b/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb index 8b60d21a77e..645bfeb14e3 100644 --- a/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb +++ b/spec/features/projects/files/user_browses_a_tree_with_a_folder_containing_only_a_folder_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' # This is a regression test for https://gitlab.com/gitlab-org/gitlab-foss/issues/37569 RSpec.describe 'Projects > Files > User browses a tree with a folder containing only a folder', :js, -feature_category: :projects do +feature_category: :groups_and_projects do let(:project) { create(:project, :empty_repo) } let(:user) { project.first_owner } diff --git a/spec/features/projects/files/user_browses_files_spec.rb b/spec/features/projects/files/user_browses_files_spec.rb index 9b9c2158432..bb14b9c4e31 100644 --- a/spec/features/projects/files/user_browses_files_spec.rb +++ b/spec/features/projects/files/user_browses_files_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "User browses files", :js, feature_category: :projects do +RSpec.describe "User browses files", :js, feature_category: :groups_and_projects do include RepoHelpers include ListboxHelpers diff --git a/spec/features/projects/files/user_browses_lfs_files_spec.rb b/spec/features/projects/files/user_browses_lfs_files_spec.rb index 6b401d6d789..04094ae2d6f 100644 --- a/spec/features/projects/files/user_browses_lfs_files_spec.rb +++ b/spec/features/projects/files/user_browses_lfs_files_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User browses LFS files', feature_category: :projects do +RSpec.describe 'Projects > Files > User browses LFS files', feature_category: :groups_and_projects do let(:project) { create(:project, :repository) } let(:user) { project.first_owner } diff --git a/spec/features/projects/files/user_creates_directory_spec.rb b/spec/features/projects/files/user_creates_directory_spec.rb index 4dd579ba8e9..070b6dbec7d 100644 --- a/spec/features/projects/files/user_creates_directory_spec.rb +++ b/spec/features/projects/files/user_creates_directory_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User creates a directory', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > User creates a directory', :js, feature_category: :groups_and_projects do let(:fork_message) do "You're not allowed to make changes to this project directly. "\ "A fork of this project has been created that you can make changes in, so you can submit a merge request." diff --git a/spec/features/projects/files/user_creates_files_spec.rb b/spec/features/projects/files/user_creates_files_spec.rb index 42aceef256a..7d888aabf53 100644 --- a/spec/features/projects/files/user_creates_files_spec.rb +++ b/spec/features/projects/files/user_creates_files_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User creates files', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > User creates files', :js, feature_category: :groups_and_projects do include Features::SourceEditorSpecHelpers include Features::BlobSpecHelpers diff --git a/spec/features/projects/files/user_deletes_files_spec.rb b/spec/features/projects/files/user_deletes_files_spec.rb index 61152a8badc..c526084b35d 100644 --- a/spec/features/projects/files/user_deletes_files_spec.rb +++ b/spec/features/projects/files/user_deletes_files_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User deletes files', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > User deletes files', :js, feature_category: :groups_and_projects do let(:fork_message) do "You're not allowed to make changes to this project directly. "\ "A fork of this project has been created that you can make changes in, so you can submit a merge request." diff --git a/spec/features/projects/files/user_edits_files_spec.rb b/spec/features/projects/files/user_edits_files_spec.rb index 779257b2e2b..acaeffe5ef4 100644 --- a/spec/features/projects/files/user_edits_files_spec.rb +++ b/spec/features/projects/files/user_edits_files_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User edits files', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > User edits files', :js, feature_category: :groups_and_projects do include Features::SourceEditorSpecHelpers include ProjectForksHelper include Features::BlobSpecHelpers diff --git a/spec/features/projects/files/user_find_file_spec.rb b/spec/features/projects/files/user_find_file_spec.rb index 9cc2ce6a7b4..5406726eb6e 100644 --- a/spec/features/projects/files/user_find_file_spec.rb +++ b/spec/features/projects/files/user_find_file_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User find project file', feature_category: :projects do +RSpec.describe 'User find project file', feature_category: :groups_and_projects do include ListboxHelpers let(:user) { create :user } diff --git a/spec/features/projects/files/user_reads_pipeline_status_spec.rb b/spec/features/projects/files/user_reads_pipeline_status_spec.rb index 18a5fb71b10..ce3f0541139 100644 --- a/spec/features/projects/files/user_reads_pipeline_status_spec.rb +++ b/spec/features/projects/files/user_reads_pipeline_status_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'user reads pipeline status', :js, feature_category: :projects do +RSpec.describe 'user reads pipeline status', :js, feature_category: :groups_and_projects do let(:project) { create(:project, :repository) } let(:user) { create(:user) } let(:v110_pipeline) { create_pipeline('v1.1.0', 'success') } diff --git a/spec/features/projects/files/user_replaces_files_spec.rb b/spec/features/projects/files/user_replaces_files_spec.rb index 9fa3ddf92c6..bd951b974d1 100644 --- a/spec/features/projects/files/user_replaces_files_spec.rb +++ b/spec/features/projects/files/user_replaces_files_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User replaces files', :js, feature_category: :projects do +RSpec.describe 'Projects > Files > User replaces files', :js, feature_category: :groups_and_projects do include DropzoneHelper let(:fork_message) do diff --git a/spec/features/projects/files/user_searches_for_files_spec.rb b/spec/features/projects/files/user_searches_for_files_spec.rb index b438b203141..25456593fc4 100644 --- a/spec/features/projects/files/user_searches_for_files_spec.rb +++ b/spec/features/projects/files/user_searches_for_files_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User searches for files', feature_category: :projects do +RSpec.describe 'Projects > Files > User searches for files', feature_category: :groups_and_projects do let(:user) { project.first_owner } before do diff --git a/spec/features/projects/files/user_uploads_files_spec.rb b/spec/features/projects/files/user_uploads_files_spec.rb index 575a6290a32..22c3f73add5 100644 --- a/spec/features/projects/files/user_uploads_files_spec.rb +++ b/spec/features/projects/files/user_uploads_files_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Files > User uploads files', feature_category: :projects do +RSpec.describe 'Projects > Files > User uploads files', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project, :repository, name: 'Shop', creator: user) } let(:project2) { create(:project, :repository, name: 'Another Project', path: 'another-project') } diff --git a/spec/features/projects/fork_spec.rb b/spec/features/projects/fork_spec.rb index 39cdc8faa85..7d734d5d2df 100644 --- a/spec/features/projects/fork_spec.rb +++ b/spec/features/projects/fork_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project fork', feature_category: :projects do +RSpec.describe 'Project fork', feature_category: :groups_and_projects do include ListboxHelpers include ProjectForksHelper diff --git a/spec/features/projects/forks/fork_list_spec.rb b/spec/features/projects/forks/fork_list_spec.rb index 18424c18cbc..966147637f5 100644 --- a/spec/features/projects/forks/fork_list_spec.rb +++ b/spec/features/projects/forks/fork_list_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'listing forks of a project', feature_category: :projects do +RSpec.describe 'listing forks of a project', feature_category: :groups_and_projects do include ProjectForksHelper include ExternalAuthorizationServiceHelpers diff --git a/spec/features/projects/gfm_autocomplete_load_spec.rb b/spec/features/projects/gfm_autocomplete_load_spec.rb index bb9f4e121d8..35ab0094d51 100644 --- a/spec/features/projects/gfm_autocomplete_load_spec.rb +++ b/spec/features/projects/gfm_autocomplete_load_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'GFM autocomplete loading', :js, feature_category: :projects do +RSpec.describe 'GFM autocomplete loading', :js, feature_category: :groups_and_projects do let(:project) { create(:project) } before do diff --git a/spec/features/projects/graph_spec.rb b/spec/features/projects/graph_spec.rb index a1f047d9b43..16a3686215f 100644 --- a/spec/features/projects/graph_spec.rb +++ b/spec/features/projects/graph_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project Graph', :js, feature_category: :projects do +RSpec.describe 'Project Graph', :js, feature_category: :groups_and_projects do let(:user) { create :user } let(:project) { create(:project, :repository, namespace: user.namespace) } let(:branch_name) { 'master' } diff --git a/spec/features/projects/hook_logs/user_reads_log_spec.rb b/spec/features/projects/hook_logs/user_reads_log_spec.rb index 92ddc559cf4..cffa76924f5 100644 --- a/spec/features/projects/hook_logs/user_reads_log_spec.rb +++ b/spec/features/projects/hook_logs/user_reads_log_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Hook logs', feature_category: :projects do +RSpec.describe 'Hook logs', feature_category: :groups_and_projects do let(:project) { create(:project) } let(:project_hook) { create(:project_hook, project: project) } let(:web_hook_log) { create(:web_hook_log, web_hook: project_hook, response_body: 'Hello World') } diff --git a/spec/features/projects/infrastructure_registry_spec.rb b/spec/features/projects/infrastructure_registry_spec.rb index e1619726c8d..a648a4fc1ce 100644 --- a/spec/features/projects/infrastructure_registry_spec.rb +++ b/spec/features/projects/infrastructure_registry_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Infrastructure Registry', feature_category: :projects do +RSpec.describe 'Infrastructure Registry', feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project) } diff --git a/spec/features/projects/issuable_templates_spec.rb b/spec/features/projects/issuable_templates_spec.rb index 77f88994bfb..72695680809 100644 --- a/spec/features/projects/issuable_templates_spec.rb +++ b/spec/features/projects/issuable_templates_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'issuable templates', :js, feature_category: :projects do +RSpec.describe 'issuable templates', :js, feature_category: :groups_and_projects do include ProjectForksHelper include CookieHelper diff --git a/spec/features/projects/jobs/permissions_spec.rb b/spec/features/projects/jobs/permissions_spec.rb index dce86c9f0a4..e1bcc160092 100644 --- a/spec/features/projects/jobs/permissions_spec.rb +++ b/spec/features/projects/jobs/permissions_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project Jobs Permissions', feature_category: :projects do +RSpec.describe 'Project Jobs Permissions', feature_category: :groups_and_projects do using RSpec::Parameterized::TableSyntax let_it_be_with_reload(:group) { create(:group, name: 'some group') } diff --git a/spec/features/projects/jobs/user_browses_job_spec.rb b/spec/features/projects/jobs/user_browses_job_spec.rb index dd57b4117f9..795084f8008 100644 --- a/spec/features/projects/jobs/user_browses_job_spec.rb +++ b/spec/features/projects/jobs/user_browses_job_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User browses a job', :js, feature_category: :projects do +RSpec.describe 'User browses a job', :js, feature_category: :groups_and_projects do include Spec::Support::Helpers::ModalHelpers let(:user) { create(:user) } diff --git a/spec/features/projects/jobs/user_browses_jobs_spec.rb b/spec/features/projects/jobs/user_browses_jobs_spec.rb index 1634f6dee74..d74a3d28068 100644 --- a/spec/features/projects/jobs/user_browses_jobs_spec.rb +++ b/spec/features/projects/jobs/user_browses_jobs_spec.rb @@ -8,7 +8,7 @@ def visit_jobs_page wait_for_requests end -RSpec.describe 'User browses jobs', feature_category: :projects do +RSpec.describe 'User browses jobs', feature_category: :groups_and_projects do describe 'Jobs', :js do let(:project) { create(:project, :repository) } let(:user) { create(:user) } diff --git a/spec/features/projects/jobs/user_triggers_manual_job_with_variables_spec.rb b/spec/features/projects/jobs/user_triggers_manual_job_with_variables_spec.rb index e4394010e8c..41a21b1155b 100644 --- a/spec/features/projects/jobs/user_triggers_manual_job_with_variables_spec.rb +++ b/spec/features/projects/jobs/user_triggers_manual_job_with_variables_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User triggers manual job with variables', :js, feature_category: :projects do +RSpec.describe 'User triggers manual job with variables', :js, feature_category: :groups_and_projects do let(:user) { create(:user) } let(:user_access_level) { :developer } let(:project) { create(:project, :repository, namespace: user.namespace) } diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index 796bac2e8e7..01f8f2166ac 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'tempfile' -RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state, feature_category: :projects do +RSpec.describe 'Jobs', :clean_gitlab_redis_shared_state, feature_category: :groups_and_projects do include Gitlab::Routing include ProjectForksHelper diff --git a/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb b/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb index 63dc99efc8f..97b29ee6c91 100644 --- a/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb +++ b/spec/features/projects/members/group_member_cannot_leave_group_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > Group member cannot leave group project', feature_category: :subgroups do +RSpec.describe 'Projects > Members > Group member cannot leave group project', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:group) { create(:group) } let(:project) { create(:project, namespace: group) } diff --git a/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb b/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb index 07886950b95..6656ca3ef18 100644 --- a/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb +++ b/spec/features/projects/members/group_member_cannot_request_access_to_his_group_project_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe 'Projects > Members > Group member cannot request access to their group project', -feature_category: :subgroups do +feature_category: :groups_and_projects do let(:user) { create(:user) } let(:group) { create(:group) } let(:project) { create(:project, namespace: group) } diff --git a/spec/features/projects/members/group_members_spec.rb b/spec/features/projects/members/group_members_spec.rb index c0257446a37..3ab84b40e53 100644 --- a/spec/features/projects/members/group_members_spec.rb +++ b/spec/features/projects/members/group_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects members', :js, feature_category: :subgroups do +RSpec.describe 'Projects members', :js, feature_category: :groups_and_projects do include Features::MembersHelpers let(:user) { create(:user) } diff --git a/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb b/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb index 7a11ee61c5f..9db34cee5d6 100644 --- a/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb +++ b/spec/features/projects/members/group_requester_cannot_request_access_to_project_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe 'Projects > Members > Group requester cannot request access to project', :js, -feature_category: :subgroups do +feature_category: :groups_and_projects do let(:user) { create(:user) } let(:owner) { create(:user) } let(:group) { create(:group, :public) } diff --git a/spec/features/projects/members/groups_with_access_list_spec.rb b/spec/features/projects/members/groups_with_access_list_spec.rb index 8238f95fd47..0f80c6cb3b8 100644 --- a/spec/features/projects/members/groups_with_access_list_spec.rb +++ b/spec/features/projects/members/groups_with_access_list_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > Groups with access list', :js, feature_category: :subgroups do +RSpec.describe 'Projects > Members > Groups with access list', :js, feature_category: :groups_and_projects do include Features::MembersHelpers include Spec::Support::Helpers::ModalHelpers include Features::InviteMembersModalHelpers diff --git a/spec/features/projects/members/manage_groups_spec.rb b/spec/features/projects/members/manage_groups_spec.rb index 5efb5abefc6..63ff1ba8455 100644 --- a/spec/features/projects/members/manage_groups_spec.rb +++ b/spec/features/projects/members/manage_groups_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project > Members > Manage groups', :js, feature_category: :subgroups do +RSpec.describe 'Project > Members > Manage groups', :js, feature_category: :groups_and_projects do include ActionView::Helpers::DateHelper include Features::MembersHelpers include Features::InviteMembersModalHelpers diff --git a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb index be778def833..b51259bea23 100644 --- a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb +++ b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > Maintainer adds member with expiration date', :js, feature_category: :subgroups do +RSpec.describe 'Projects > Members > Maintainer adds member with expiration date', :js, feature_category: :groups_and_projects do include ActiveSupport::Testing::TimeHelpers include Features::MembersHelpers include Features::InviteMembersModalHelpers diff --git a/spec/features/projects/members/master_manages_access_requests_spec.rb b/spec/features/projects/members/master_manages_access_requests_spec.rb index cea59679226..04d28022b73 100644 --- a/spec/features/projects/members/master_manages_access_requests_spec.rb +++ b/spec/features/projects/members/master_manages_access_requests_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > Maintainer manages access requests', feature_category: :subgroups do +RSpec.describe 'Projects > Members > Maintainer manages access requests', feature_category: :groups_and_projects do it_behaves_like 'Maintainer manages access requests' do let(:entity) { create(:project, :public, :with_namespace_settings) } let(:members_page_path) { project_project_members_path(entity) } diff --git a/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb b/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb index dc18ca88c36..91237c334cc 100644 --- a/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb +++ b/spec/features/projects/members/member_cannot_request_access_to_his_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > Member cannot request access to their project', feature_category: :subgroups do +RSpec.describe 'Projects > Members > Member cannot request access to their project', feature_category: :groups_and_projects do let(:member) { create(:user) } let(:project) { create(:project) } diff --git a/spec/features/projects/members/member_leaves_project_spec.rb b/spec/features/projects/members/member_leaves_project_spec.rb index 91e30b3396e..e0c64547e9f 100644 --- a/spec/features/projects/members/member_leaves_project_spec.rb +++ b/spec/features/projects/members/member_leaves_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > Member leaves project', feature_category: :subgroups do +RSpec.describe 'Projects > Members > Member leaves project', feature_category: :groups_and_projects do include Features::MembersHelpers include Spec::Support::Helpers::ModalHelpers diff --git a/spec/features/projects/members/owner_cannot_leave_project_spec.rb b/spec/features/projects/members/owner_cannot_leave_project_spec.rb index 7908fd3a98f..c79d227647a 100644 --- a/spec/features/projects/members/owner_cannot_leave_project_spec.rb +++ b/spec/features/projects/members/owner_cannot_leave_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > Owner cannot leave project', feature_category: :subgroups do +RSpec.describe 'Projects > Members > Owner cannot leave project', feature_category: :groups_and_projects do let(:project) { create(:project) } before do diff --git a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb index b5a862578d3..84cf31b526a 100644 --- a/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb +++ b/spec/features/projects/members/owner_cannot_request_access_to_his_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > Owner cannot request access to their own project', feature_category: :subgroups do +RSpec.describe 'Projects > Members > Owner cannot request access to their own project', feature_category: :groups_and_projects do let(:project) { create(:project) } before do diff --git a/spec/features/projects/members/sorting_spec.rb b/spec/features/projects/members/sorting_spec.rb index 85bf381404c..9747d499ae9 100644 --- a/spec/features/projects/members/sorting_spec.rb +++ b/spec/features/projects/members/sorting_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > Sorting', :js, feature_category: :subgroups do +RSpec.describe 'Projects > Members > Sorting', :js, feature_category: :groups_and_projects do include Features::MembersHelpers let(:maintainer) { create(:user, name: 'John Doe', created_at: 5.days.ago, last_activity_on: Date.today) } diff --git a/spec/features/projects/members/tabs_spec.rb b/spec/features/projects/members/tabs_spec.rb index 9ee06edc0c1..edd4a51089c 100644 --- a/spec/features/projects/members/tabs_spec.rb +++ b/spec/features/projects/members/tabs_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > Tabs', :js, feature_category: :subgroups do +RSpec.describe 'Projects > Members > Tabs', :js, feature_category: :groups_and_projects do include Features::MembersHelpers using RSpec::Parameterized::TableSyntax diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb index 11d162fabd4..6f76424e377 100644 --- a/spec/features/projects/members/user_requests_access_spec.rb +++ b/spec/features/projects/members/user_requests_access_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Members > User requests access', :js, feature_category: :subgroups do +RSpec.describe 'Projects > Members > User requests access', :js, feature_category: :groups_and_projects do include Spec::Support::Helpers::ModalHelpers let_it_be(:user) { create(:user) } diff --git a/spec/features/projects/merge_request_button_spec.rb b/spec/features/projects/merge_request_button_spec.rb index 56aee469252..e5c927af96c 100644 --- a/spec/features/projects/merge_request_button_spec.rb +++ b/spec/features/projects/merge_request_button_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Merge Request button', feature_category: :projects do +RSpec.describe 'Merge Request button', feature_category: :groups_and_projects do include ProjectForksHelper let_it_be(:user) { create(:user) } diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb index 31f4e9dcf95..97dfeb6fd06 100644 --- a/spec/features/projects/navbar_spec.rb +++ b/spec/features/projects/navbar_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project navbar', :with_license, feature_category: :projects do +RSpec.describe 'Project navbar', :with_license, feature_category: :groups_and_projects do include NavbarStructureHelper include WaitForRequests diff --git a/spec/features/projects/network_graph_spec.rb b/spec/features/projects/network_graph_spec.rb index af976b8ffb0..eff0335c891 100644 --- a/spec/features/projects/network_graph_spec.rb +++ b/spec/features/projects/network_graph_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project Network Graph', :js, feature_category: :projects do +RSpec.describe 'Project Network Graph', :js, feature_category: :groups_and_projects do let(:user) { create :user } let(:project) { create :project, :repository, namespace: user.namespace } let(:ref_selector) { '.ref-selector' } diff --git a/spec/features/projects/new_project_from_template_spec.rb b/spec/features/projects/new_project_from_template_spec.rb index 97304840010..8e2016ce17e 100644 --- a/spec/features/projects/new_project_from_template_spec.rb +++ b/spec/features/projects/new_project_from_template_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'New project from template', :js, feature_category: :projects do +RSpec.describe 'New project from template', :js, feature_category: :groups_and_projects do let(:user) { create(:user) } before do diff --git a/spec/features/projects/new_project_spec.rb b/spec/features/projects/new_project_spec.rb index 351662af217..9f56c2c1cb0 100644 --- a/spec/features/projects/new_project_spec.rb +++ b/spec/features/projects/new_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'New project', :js, feature_category: :projects do +RSpec.describe 'New project', :js, feature_category: :groups_and_projects do include Features::TopNavSpecHelpers before do diff --git a/spec/features/projects/package_files_spec.rb b/spec/features/projects/package_files_spec.rb index 824b57db7ad..540ad745610 100644 --- a/spec/features/projects/package_files_spec.rb +++ b/spec/features/projects/package_files_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'PackageFiles', feature_category: :projects do +RSpec.describe 'PackageFiles', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project) } let!(:package) { create(:maven_package, project: project) } diff --git a/spec/features/projects/packages_spec.rb b/spec/features/projects/packages_spec.rb index 5d3ebd8bec6..5073c147b6c 100644 --- a/spec/features/projects/packages_spec.rb +++ b/spec/features/projects/packages_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Packages', feature_category: :projects do +RSpec.describe 'Packages', feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project) } diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb index 22c7e00be6b..358c55376d4 100644 --- a/spec/features/projects/pipeline_schedules_spec.rb +++ b/spec/features/projects/pipeline_schedules_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Pipeline Schedules', :js, feature_category: :projects do +RSpec.describe 'Pipeline Schedules', :js, feature_category: :groups_and_projects do include Spec::Support::Helpers::ModalHelpers let!(:project) { create(:project, :repository) } diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb index f1dfd962334..abc9e3d30fc 100644 --- a/spec/features/projects/pipelines/pipeline_spec.rb +++ b/spec/features/projects/pipelines/pipeline_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Pipeline', :js, feature_category: :projects do +RSpec.describe 'Pipeline', :js, feature_category: :groups_and_projects do include RoutesHelpers include ProjectForksHelper include ::ExclusiveLeaseHelpers diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb index ae40b0c7a17..b8bb81991fc 100644 --- a/spec/features/projects/pipelines/pipelines_spec.rb +++ b/spec/features/projects/pipelines/pipelines_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Pipelines', :js, feature_category: :projects do +RSpec.describe 'Pipelines', :js, feature_category: :groups_and_projects do include ListboxHelpers include ProjectForksHelper include Spec::Support::Helpers::ModalHelpers diff --git a/spec/features/projects/raw/user_interacts_with_raw_endpoint_spec.rb b/spec/features/projects/raw/user_interacts_with_raw_endpoint_spec.rb index fb7814285b8..0cc105353f5 100644 --- a/spec/features/projects/raw/user_interacts_with_raw_endpoint_spec.rb +++ b/spec/features/projects/raw/user_interacts_with_raw_endpoint_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Raw > User interacts with raw endpoint', feature_category: :projects do +RSpec.describe 'Projects > Raw > User interacts with raw endpoint', feature_category: :groups_and_projects do include RepoHelpers let(:user) { create(:user) } diff --git a/spec/features/projects/remote_mirror_spec.rb b/spec/features/projects/remote_mirror_spec.rb index aa0c1ead4c0..4f27ba04f37 100644 --- a/spec/features/projects/remote_mirror_spec.rb +++ b/spec/features/projects/remote_mirror_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project remote mirror', :feature, feature_category: :projects do +RSpec.describe 'Project remote mirror', :feature, feature_category: :groups_and_projects do let(:project) { create(:project, :repository, :remote_mirror) } let(:remote_mirror) { project.remote_mirrors.first } let(:user) { create(:user) } diff --git a/spec/features/projects/settings/branch_names_settings_spec.rb b/spec/features/projects/settings/branch_names_settings_spec.rb index 5d82dff1efd..cc7396513cb 100644 --- a/spec/features/projects/settings/branch_names_settings_spec.rb +++ b/spec/features/projects/settings/branch_names_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project settings > repositories > Branch names', :js, feature_category: :projects do +RSpec.describe 'Project settings > repositories > Branch names', :js, feature_category: :groups_and_projects do let_it_be(:project) { create(:project, :public) } let(:user) { create(:user) } diff --git a/spec/features/projects/settings/branch_rules_settings_spec.rb b/spec/features/projects/settings/branch_rules_settings_spec.rb index 59609fecd93..a6ecfa2d231 100644 --- a/spec/features/projects/settings/branch_rules_settings_spec.rb +++ b/spec/features/projects/settings/branch_rules_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Repository > Branch rules settings', feature_category: :projects do +RSpec.describe 'Projects > Settings > Repository > Branch rules settings', feature_category: :groups_and_projects do let(:project) { create(:project_empty_repo) } let(:user) { create(:user) } let(:role) { :developer } diff --git a/spec/features/projects/settings/external_authorization_service_settings_spec.rb b/spec/features/projects/settings/external_authorization_service_settings_spec.rb index a99fd5f9788..4a56e6c8bbf 100644 --- a/spec/features/projects/settings/external_authorization_service_settings_spec.rb +++ b/spec/features/projects/settings/external_authorization_service_settings_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe 'Projects > Settings > External Authorization Classification Label setting', -feature_category: :projects do +feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project_empty_repo) } diff --git a/spec/features/projects/settings/forked_project_settings_spec.rb b/spec/features/projects/settings/forked_project_settings_spec.rb index 6b646bcf7d3..c2a5b36a81b 100644 --- a/spec/features/projects/settings/forked_project_settings_spec.rb +++ b/spec/features/projects/settings/forked_project_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > For a forked project', :js, feature_category: :projects do +RSpec.describe 'Projects > Settings > For a forked project', :js, feature_category: :groups_and_projects do include ProjectForksHelper let(:user) { create(:user) } let(:original_project) { create(:project) } diff --git a/spec/features/projects/settings/lfs_settings_spec.rb b/spec/features/projects/settings/lfs_settings_spec.rb index 1695b49830d..bc5efecfe0d 100644 --- a/spec/features/projects/settings/lfs_settings_spec.rb +++ b/spec/features/projects/settings/lfs_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > LFS settings', feature_category: :projects do +RSpec.describe 'Projects > Settings > LFS settings', feature_category: :groups_and_projects do let(:project) { create(:project) } let(:user) { create(:user) } let(:role) { :maintainer } diff --git a/spec/features/projects/settings/merge_requests_settings_spec.rb b/spec/features/projects/settings/merge_requests_settings_spec.rb index ca90817b0a4..c6285d0f5c1 100644 --- a/spec/features/projects/settings/merge_requests_settings_spec.rb +++ b/spec/features/projects/settings/merge_requests_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Merge requests', feature_category: :projects do +RSpec.describe 'Projects > Settings > Merge requests', feature_category: :groups_and_projects do include ProjectForksHelper let(:user) { create(:user) } diff --git a/spec/features/projects/settings/monitor_settings_spec.rb b/spec/features/projects/settings/monitor_settings_spec.rb index a79d04d85d0..c5a5826a778 100644 --- a/spec/features/projects/settings/monitor_settings_spec.rb +++ b/spec/features/projects/settings/monitor_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > For a forked project', :js, feature_category: :projects do +RSpec.describe 'Projects > Settings > For a forked project', :js, feature_category: :groups_and_projects do include ListboxHelpers let_it_be(:project) { create(:project, :repository, create_templates: :issue) } diff --git a/spec/features/projects/settings/packages_settings_spec.rb b/spec/features/projects/settings/packages_settings_spec.rb index bf5c779b109..564a71e9a23 100644 --- a/spec/features/projects/settings/packages_settings_spec.rb +++ b/spec/features/projects/settings/packages_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Packages', :js, feature_category: :projects do +RSpec.describe 'Projects > Settings > Packages', :js, feature_category: :groups_and_projects do let_it_be(:project) { create(:project) } let(:user) { project.first_owner } diff --git a/spec/features/projects/settings/pipelines_settings_spec.rb b/spec/features/projects/settings/pipelines_settings_spec.rb index 51858ddf8c5..ef1c03f4f27 100644 --- a/spec/features/projects/settings/pipelines_settings_spec.rb +++ b/spec/features/projects/settings/pipelines_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "Projects > Settings > Pipelines settings", feature_category: :projects do +RSpec.describe "Projects > Settings > Pipelines settings", feature_category: :groups_and_projects do let(:project) { create(:project) } let(:user) { create(:user) } let(:role) { :developer } diff --git a/spec/features/projects/settings/project_badges_spec.rb b/spec/features/projects/settings/project_badges_spec.rb index f4c2265c2c2..1f170300155 100644 --- a/spec/features/projects/settings/project_badges_spec.rb +++ b/spec/features/projects/settings/project_badges_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project Badges', feature_category: :projects do +RSpec.describe 'Project Badges', feature_category: :groups_and_projects do include WaitForRequests let(:user) { create(:user) } diff --git a/spec/features/projects/settings/project_settings_spec.rb b/spec/features/projects/settings/project_settings_spec.rb index 46a41cfc6f1..1c1bbc7e85c 100644 --- a/spec/features/projects/settings/project_settings_spec.rb +++ b/spec/features/projects/settings/project_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects settings', feature_category: :projects do +RSpec.describe 'Projects settings', feature_category: :groups_and_projects do let_it_be(:project) { create(:project) } let(:user) { project.first_owner } diff --git a/spec/features/projects/settings/registry_settings_cleanup_tags_spec.rb b/spec/features/projects/settings/registry_settings_cleanup_tags_spec.rb index bdfe6a06dd1..50693dda685 100644 --- a/spec/features/projects/settings/registry_settings_cleanup_tags_spec.rb +++ b/spec/features/projects/settings/registry_settings_cleanup_tags_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe 'Project > Settings > Packages and registries > Container registry tag expiration policy', -feature_category: :projects do +feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:project, reload: true) { create(:project, namespace: user.namespace) } diff --git a/spec/features/projects/settings/registry_settings_spec.rb b/spec/features/projects/settings/registry_settings_spec.rb index 68e9b0225ea..b8016a5d2df 100644 --- a/spec/features/projects/settings/registry_settings_spec.rb +++ b/spec/features/projects/settings/registry_settings_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe 'Project > Settings > Packages and registries > Container registry tag expiration policy', -feature_category: :projects do +feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:project, reload: true) { create(:project, namespace: user.namespace) } diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb index 08abade7d18..a801f633882 100644 --- a/spec/features/projects/settings/repository_settings_spec.rb +++ b/spec/features/projects/settings/repository_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Repository settings', feature_category: :projects do +RSpec.describe 'Projects > Settings > Repository settings', feature_category: :groups_and_projects do include Features::MirroringHelpers let(:project) { create(:project_empty_repo) } diff --git a/spec/features/projects/settings/secure_files_spec.rb b/spec/features/projects/settings/secure_files_spec.rb index 9afe1f4de54..8ac64287fcb 100644 --- a/spec/features/projects/settings/secure_files_spec.rb +++ b/spec/features/projects/settings/secure_files_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Secure Files', :js, feature_category: :projects do +RSpec.describe 'Secure Files', :js, feature_category: :groups_and_projects do let(:project) { create(:project) } let(:user) { create(:user) } diff --git a/spec/features/projects/settings/service_desk_setting_spec.rb b/spec/features/projects/settings/service_desk_setting_spec.rb index 74139aa0d7f..c18da56f3ee 100644 --- a/spec/features/projects/settings/service_desk_setting_spec.rb +++ b/spec/features/projects/settings/service_desk_setting_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Service Desk Setting', :js, :clean_gitlab_redis_cache, feature_category: :projects do +RSpec.describe 'Service Desk Setting', :js, :clean_gitlab_redis_cache, feature_category: :groups_and_projects do let(:project) { create(:project_empty_repo, :private, service_desk_enabled: false) } let(:presenter) { project.present(current_user: user) } let(:user) { create(:user) } diff --git a/spec/features/projects/settings/user_archives_project_spec.rb b/spec/features/projects/settings/user_archives_project_spec.rb index a6aac02d272..e4a5249c678 100644 --- a/spec/features/projects/settings/user_archives_project_spec.rb +++ b/spec/features/projects/settings/user_archives_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User archives a project', feature_category: :projects do +RSpec.describe 'Projects > Settings > User archives a project', feature_category: :groups_and_projects do let(:user) { create(:user) } before do diff --git a/spec/features/projects/settings/user_changes_avatar_spec.rb b/spec/features/projects/settings/user_changes_avatar_spec.rb index 87043aec9b6..c589366d3df 100644 --- a/spec/features/projects/settings/user_changes_avatar_spec.rb +++ b/spec/features/projects/settings/user_changes_avatar_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User changes avatar', feature_category: :projects do +RSpec.describe 'Projects > Settings > User changes avatar', feature_category: :groups_and_projects do let(:project) { create(:project, :repository) } let(:user) { project.creator } diff --git a/spec/features/projects/settings/user_changes_default_branch_spec.rb b/spec/features/projects/settings/user_changes_default_branch_spec.rb index 67ba16a2716..5886699a192 100644 --- a/spec/features/projects/settings/user_changes_default_branch_spec.rb +++ b/spec/features/projects/settings/user_changes_default_branch_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User changes default branch', feature_category: :projects do +RSpec.describe 'Projects > Settings > User changes default branch', feature_category: :groups_and_projects do include ListboxHelpers let(:user) { create(:user) } diff --git a/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb b/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb index 3a58de9aa7d..0006762a971 100644 --- a/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb +++ b/spec/features/projects/settings/user_interacts_with_deploy_keys_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe "User interacts with deploy keys", :js, feature_category: :projects do +RSpec.describe "User interacts with deploy keys", :js, feature_category: :groups_and_projects do let(:project) { create(:project, :repository) } let(:user) { project.first_owner } diff --git a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb index cfefdd54c23..1189f5590f8 100644 --- a/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb +++ b/spec/features/projects/settings/user_manages_merge_requests_settings_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe 'Projects > Settings > User manages merge request settings', feature_category: :projects do +RSpec.describe 'Projects > Settings > User manages merge request settings', feature_category: :groups_and_projects do include ProjectForksHelper let(:user) { create(:user) } diff --git a/spec/features/projects/settings/user_manages_project_members_spec.rb b/spec/features/projects/settings/user_manages_project_members_spec.rb index b7463537fb2..df571e13979 100644 --- a/spec/features/projects/settings/user_manages_project_members_spec.rb +++ b/spec/features/projects/settings/user_manages_project_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User manages project members', feature_category: :projects do +RSpec.describe 'Projects > Settings > User manages project members', feature_category: :groups_and_projects do include Features::MembersHelpers include Spec::Support::Helpers::ModalHelpers include ListboxHelpers diff --git a/spec/features/projects/settings/user_renames_a_project_spec.rb b/spec/features/projects/settings/user_renames_a_project_spec.rb index a6b72e7a297..5a58c049601 100644 --- a/spec/features/projects/settings/user_renames_a_project_spec.rb +++ b/spec/features/projects/settings/user_renames_a_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User renames a project', feature_category: :projects do +RSpec.describe 'Projects > Settings > User renames a project', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project, namespace: user.namespace, path: 'gitlab', name: 'sample') } diff --git a/spec/features/projects/settings/user_searches_in_settings_spec.rb b/spec/features/projects/settings/user_searches_in_settings_spec.rb index 923a6a10671..f0ef4a285ad 100644 --- a/spec/features/projects/settings/user_searches_in_settings_spec.rb +++ b/spec/features/projects/settings/user_searches_in_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User searches project settings', :js, feature_category: :projects do +RSpec.describe 'User searches project settings', :js, feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :repository, namespace: user.namespace, pages_https_only: false) } diff --git a/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb b/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb index 65aed4fd06f..1bc5af39f12 100644 --- a/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb +++ b/spec/features/projects/settings/user_sees_revoke_deploy_token_modal_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Repository Settings > User sees revoke deploy token modal', :js, feature_category: :projects do +RSpec.describe 'Repository Settings > User sees revoke deploy token modal', :js, feature_category: :groups_and_projects do let(:project) { create(:project, :public, :repository) } let(:user) { project.creator } let(:role) { :developer } diff --git a/spec/features/projects/settings/user_tags_project_spec.rb b/spec/features/projects/settings/user_tags_project_spec.rb index 43e8e5a2d38..6b616b4abed 100644 --- a/spec/features/projects/settings/user_tags_project_spec.rb +++ b/spec/features/projects/settings/user_tags_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User tags a project', :js, feature_category: :projects do +RSpec.describe 'Projects > Settings > User tags a project', :js, feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project, namespace: user.namespace) } let!(:topic) { create(:topic, name: 'topic1') } diff --git a/spec/features/projects/settings/user_transfers_a_project_spec.rb b/spec/features/projects/settings/user_transfers_a_project_spec.rb index 53b4ee881f9..97871eed296 100644 --- a/spec/features/projects/settings/user_transfers_a_project_spec.rb +++ b/spec/features/projects/settings/user_transfers_a_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > User transfers a project', :js, feature_category: :projects do +RSpec.describe 'Projects > Settings > User transfers a project', :js, feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project, :repository, namespace: user.namespace) } let(:group) { create(:group) } diff --git a/spec/features/projects/settings/visibility_settings_spec.rb b/spec/features/projects/settings/visibility_settings_spec.rb index 5246eda976b..7d41b60199c 100644 --- a/spec/features/projects/settings/visibility_settings_spec.rb +++ b/spec/features/projects/settings/visibility_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Visibility settings', :js, feature_category: :projects do +RSpec.describe 'Projects > Settings > Visibility settings', :js, feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project, namespace: user.namespace, visibility_level: 20) } diff --git a/spec/features/projects/settings/webhooks_settings_spec.rb b/spec/features/projects/settings/webhooks_settings_spec.rb index e527d0c9c74..5d345c63d60 100644 --- a/spec/features/projects/settings/webhooks_settings_spec.rb +++ b/spec/features/projects/settings/webhooks_settings_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Settings > Webhook Settings', feature_category: :projects do +RSpec.describe 'Projects > Settings > Webhook Settings', feature_category: :groups_and_projects do let(:project) { create(:project) } let(:user) { create(:user) } let(:webhooks_path) { project_hooks_path(project) } diff --git a/spec/features/projects/show/clone_button_spec.rb b/spec/features/projects/show/clone_button_spec.rb index 48af4bf8277..e3964a37bcf 100644 --- a/spec/features/projects/show/clone_button_spec.rb +++ b/spec/features/projects/show/clone_button_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > Clone button', feature_category: :projects do +RSpec.describe 'Projects > Show > Clone button', feature_category: :groups_and_projects do let_it_be(:admin) { create(:admin) } let_it_be(:guest) { create(:user) } let_it_be(:project) { create(:project, :private, :in_group, :repository) } diff --git a/spec/features/projects/show/download_buttons_spec.rb b/spec/features/projects/show/download_buttons_spec.rb index e4d50daa6f4..a4df6a56e02 100644 --- a/spec/features/projects/show/download_buttons_spec.rb +++ b/spec/features/projects/show/download_buttons_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > Download buttons', feature_category: :projects do +RSpec.describe 'Projects > Show > Download buttons', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:role) { :developer } let(:status) { 'success' } diff --git a/spec/features/projects/show/no_password_spec.rb b/spec/features/projects/show/no_password_spec.rb index 9ead729af83..ff32f779c95 100644 --- a/spec/features/projects/show/no_password_spec.rb +++ b/spec/features/projects/show/no_password_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'No Password Alert', feature_category: :projects do +RSpec.describe 'No Password Alert', feature_category: :groups_and_projects do let_it_be(:message_password_auth_enabled) { 'Your account is authenticated with SSO or SAML. To push and pull over HTTP with Git using this account, you must set a password or set up a Personal Access Token to use instead of a password. For more information, see Clone with HTTPS.' } let_it_be(:message_password_auth_disabled) { 'Your account is authenticated with SSO or SAML. To push and pull over HTTP with Git using this account, you must set up a Personal Access Token to use instead of a password. For more information, see Clone with HTTPS.' } diff --git a/spec/features/projects/show/redirects_spec.rb b/spec/features/projects/show/redirects_spec.rb index d1cb896450f..ef326b92b98 100644 --- a/spec/features/projects/show/redirects_spec.rb +++ b/spec/features/projects/show/redirects_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > Redirects', feature_category: :projects do +RSpec.describe 'Projects > Show > Redirects', feature_category: :groups_and_projects do let(:user) { create :user } let(:public_project) { create :project, :public } let(:private_project) { create :project, :private } diff --git a/spec/features/projects/show/rss_spec.rb b/spec/features/projects/show/rss_spec.rb index c2e8a844094..f57bb5e8df3 100644 --- a/spec/features/projects/show/rss_spec.rb +++ b/spec/features/projects/show/rss_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > RSS', feature_category: :projects do +RSpec.describe 'Projects > Show > RSS', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) } let(:path) { project_path(project) } diff --git a/spec/features/projects/show/schema_markup_spec.rb b/spec/features/projects/show/schema_markup_spec.rb index 8262245c5cb..5c1b519bb6e 100644 --- a/spec/features/projects/show/schema_markup_spec.rb +++ b/spec/features/projects/show/schema_markup_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > Schema Markup', feature_category: :projects do +RSpec.describe 'Projects > Show > Schema Markup', feature_category: :groups_and_projects do let_it_be(:project) { create(:project, :repository, :public, :with_avatar, description: 'foobar', topic_list: 'topic1, topic2') } it 'shows SoftwareSourceCode structured markup', :js do diff --git a/spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb b/spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb index 2f33622d218..997a804e6ac 100644 --- a/spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb +++ b/spec/features/projects/show/user_interacts_with_auto_devops_banner_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe 'Project > Show > User interacts with auto devops implicitly enabled banner', -feature_category: :projects do +feature_category: :groups_and_projects do let(:project) { create(:project, :repository) } let(:user) { create(:user) } diff --git a/spec/features/projects/show/user_interacts_with_stars_spec.rb b/spec/features/projects/show/user_interacts_with_stars_spec.rb index e2166854ba3..e231068cad0 100644 --- a/spec/features/projects/show/user_interacts_with_stars_spec.rb +++ b/spec/features/projects/show/user_interacts_with_stars_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > User interacts with project stars', feature_category: :projects do +RSpec.describe 'Projects > Show > User interacts with project stars', feature_category: :groups_and_projects do let(:project) { create(:project, :public, :repository) } context 'when user is signed in', :js do diff --git a/spec/features/projects/show/user_manages_notifications_spec.rb b/spec/features/projects/show/user_manages_notifications_spec.rb index 8f6535fd4f0..455b931e7f3 100644 --- a/spec/features/projects/show/user_manages_notifications_spec.rb +++ b/spec/features/projects/show/user_manages_notifications_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > User manages notifications', :js, feature_category: :projects do +RSpec.describe 'Projects > Show > User manages notifications', :js, feature_category: :groups_and_projects do let(:project) { create(:project, :public, :repository) } before do diff --git a/spec/features/projects/show/user_sees_collaboration_links_spec.rb b/spec/features/projects/show/user_sees_collaboration_links_spec.rb index 145500a4c63..a86bc0ae97a 100644 --- a/spec/features/projects/show/user_sees_collaboration_links_spec.rb +++ b/spec/features/projects/show/user_sees_collaboration_links_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > Collaboration links', :js, feature_category: :projects do +RSpec.describe 'Projects > Show > Collaboration links', :js, feature_category: :groups_and_projects do using RSpec::Parameterized::TableSyntax let_it_be(:project) { create(:project, :repository, :public) } diff --git a/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb b/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb index 876eecfe559..0cc8919d1e9 100644 --- a/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb +++ b/spec/features/projects/show/user_sees_deletion_failure_message_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > User sees a deletion failure message', feature_category: :projects do +RSpec.describe 'Projects > Show > User sees a deletion failure message', feature_category: :groups_and_projects do let(:project) { create(:project, :empty_repo, pending_delete: true) } before do diff --git a/spec/features/projects/show/user_sees_git_instructions_spec.rb b/spec/features/projects/show/user_sees_git_instructions_spec.rb index 022f21f198d..d4a32728fdf 100644 --- a/spec/features/projects/show/user_sees_git_instructions_spec.rb +++ b/spec/features/projects/show/user_sees_git_instructions_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > User sees Git instructions', feature_category: :projects do +RSpec.describe 'Projects > Show > User sees Git instructions', feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } before do diff --git a/spec/features/projects/show/user_sees_last_commit_ci_status_spec.rb b/spec/features/projects/show/user_sees_last_commit_ci_status_spec.rb index 25d241f004e..70e316983d9 100644 --- a/spec/features/projects/show/user_sees_last_commit_ci_status_spec.rb +++ b/spec/features/projects/show/user_sees_last_commit_ci_status_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > User sees last commit CI status', feature_category: :projects do +RSpec.describe 'Projects > Show > User sees last commit CI status', feature_category: :groups_and_projects do let_it_be(:project) { create(:project, :repository, :public) } it 'shows the project README', :js do diff --git a/spec/features/projects/show/user_sees_readme_spec.rb b/spec/features/projects/show/user_sees_readme_spec.rb index a8c91b30f25..36fa800a7cf 100644 --- a/spec/features/projects/show/user_sees_readme_spec.rb +++ b/spec/features/projects/show/user_sees_readme_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > User sees README', feature_category: :projects do +RSpec.describe 'Projects > Show > User sees README', feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :repository, :public) } diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb index 9eb2d109829..41eab966895 100644 --- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb +++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > User sees setup shortcut buttons', feature_category: :projects do +RSpec.describe 'Projects > Show > User sees setup shortcut buttons', feature_category: :groups_and_projects do # For "New file", "Add license" functionality, # see spec/features/projects/files/project_owner_creates_license_file_spec.rb # see spec/features/projects/files/project_owner_sees_link_to_create_license_file_in_empty_project_spec.rb diff --git a/spec/features/projects/show/user_uploads_files_spec.rb b/spec/features/projects/show/user_uploads_files_spec.rb index ed378040ce9..5dde415151b 100644 --- a/spec/features/projects/show/user_uploads_files_spec.rb +++ b/spec/features/projects/show/user_uploads_files_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > Show > User uploads files', feature_category: :projects do +RSpec.describe 'Projects > Show > User uploads files', feature_category: :groups_and_projects do include DropzoneHelper let(:user) { create(:user) } diff --git a/spec/features/projects/sourcegraph_csp_spec.rb b/spec/features/projects/sourcegraph_csp_spec.rb index 4c8dd0a7df0..0e1a0c897e8 100644 --- a/spec/features/projects/sourcegraph_csp_spec.rb +++ b/spec/features/projects/sourcegraph_csp_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Sourcegraph Content Security Policy', feature_category: :projects do +RSpec.describe 'Sourcegraph Content Security Policy', feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :repository, namespace: user.namespace) } diff --git a/spec/features/projects/sub_group_issuables_spec.rb b/spec/features/projects/sub_group_issuables_spec.rb index 2502d969305..601f88708f4 100644 --- a/spec/features/projects/sub_group_issuables_spec.rb +++ b/spec/features/projects/sub_group_issuables_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Subgroup Issuables', :js, feature_category: :projects do +RSpec.describe 'Subgroup Issuables', :js, feature_category: :groups_and_projects do let!(:group) { create(:group, name: 'group') } let!(:subgroup) { create(:group, parent: group, name: 'subgroup') } let!(:project) { create(:project, namespace: subgroup, name: 'project') } diff --git a/spec/features/projects/terraform_spec.rb b/spec/features/projects/terraform_spec.rb index b7500b0cfb7..518fa79f003 100644 --- a/spec/features/projects/terraform_spec.rb +++ b/spec/features/projects/terraform_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Terraform', :js, feature_category: :projects do +RSpec.describe 'Terraform', :js, feature_category: :groups_and_projects do let_it_be(:project) { create(:project) } let_it_be(:terraform_state) { create(:terraform_state, :locked, :with_version, project: project) } diff --git a/spec/features/projects/tree/rss_spec.rb b/spec/features/projects/tree/rss_spec.rb index 0b016ee3dd9..176c5d85d93 100644 --- a/spec/features/projects/tree/rss_spec.rb +++ b/spec/features/projects/tree/rss_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project Tree RSS', feature_category: :projects do +RSpec.describe 'Project Tree RSS', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project, :repository, visibility_level: Gitlab::VisibilityLevel::PUBLIC) } let(:path) { project_tree_path(project, :master) } diff --git a/spec/features/projects/user_changes_project_visibility_spec.rb b/spec/features/projects/user_changes_project_visibility_spec.rb index 64af25aea28..f27a659f65f 100644 --- a/spec/features/projects/user_changes_project_visibility_spec.rb +++ b/spec/features/projects/user_changes_project_visibility_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User changes public project visibility', :js, feature_category: :projects do +RSpec.describe 'User changes public project visibility', :js, feature_category: :groups_and_projects do include ProjectForksHelper shared_examples 'changing visibility to private' do diff --git a/spec/features/projects/user_creates_project_spec.rb b/spec/features/projects/user_creates_project_spec.rb index af0bd932095..484808dcfd1 100644 --- a/spec/features/projects/user_creates_project_spec.rb +++ b/spec/features/projects/user_creates_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User creates a project', :js, feature_category: :projects do +RSpec.describe 'User creates a project', :js, feature_category: :groups_and_projects do let(:user) { create(:user) } before do diff --git a/spec/features/projects/user_sees_sidebar_spec.rb b/spec/features/projects/user_sees_sidebar_spec.rb index 3a6e11356a2..5a744be5d81 100644 --- a/spec/features/projects/user_sees_sidebar_spec.rb +++ b/spec/features/projects/user_sees_sidebar_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Projects > User sees sidebar', feature_category: :projects do +RSpec.describe 'Projects > User sees sidebar', feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project) { create(:project, :private, public_builds: false, namespace: user.namespace) } diff --git a/spec/features/projects/user_sees_user_popover_spec.rb b/spec/features/projects/user_sees_user_popover_spec.rb index 9d8d06c514e..523f1366a14 100644 --- a/spec/features/projects/user_sees_user_popover_spec.rb +++ b/spec/features/projects/user_sees_user_popover_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User sees user popover', :js, feature_category: :projects do +RSpec.describe 'User sees user popover', :js, feature_category: :groups_and_projects do include Features::NotesHelpers let_it_be(:user) { create(:user, pronouns: 'they/them') } diff --git a/spec/features/projects/user_sorts_projects_spec.rb b/spec/features/projects/user_sorts_projects_spec.rb index 6a18d95c840..b80caca5810 100644 --- a/spec/features/projects/user_sorts_projects_spec.rb +++ b/spec/features/projects/user_sorts_projects_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User sorts projects and order persists', feature_category: :projects do +RSpec.describe 'User sorts projects and order persists', feature_category: :groups_and_projects do include CookieHelper let_it_be(:user) { create(:user) } diff --git a/spec/features/projects/user_uses_shortcuts_spec.rb b/spec/features/projects/user_uses_shortcuts_spec.rb index e90e540ae32..77f753b92eb 100644 --- a/spec/features/projects/user_uses_shortcuts_spec.rb +++ b/spec/features/projects/user_uses_shortcuts_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User uses shortcuts', :js, feature_category: :projects do +RSpec.describe 'User uses shortcuts', :js, feature_category: :groups_and_projects do let_it_be(:project) { create(:project, :repository) } let(:user) { project.first_owner } diff --git a/spec/features/projects/user_views_empty_project_spec.rb b/spec/features/projects/user_views_empty_project_spec.rb index e38cfc2273a..cd7bf2e0e0e 100644 --- a/spec/features/projects/user_views_empty_project_spec.rb +++ b/spec/features/projects/user_views_empty_project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'User views an empty project', feature_category: :projects do +RSpec.describe 'User views an empty project', feature_category: :groups_and_projects do include Features::InviteMembersModalHelpers let_it_be(:project) { create(:project, :empty_repo) } diff --git a/spec/features/projects/view_on_env_spec.rb b/spec/features/projects/view_on_env_spec.rb index bf32431fc88..5f502c0297a 100644 --- a/spec/features/projects/view_on_env_spec.rb +++ b/spec/features/projects/view_on_env_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'View on environment', :js, feature_category: :projects do +RSpec.describe 'View on environment', :js, feature_category: :groups_and_projects do let(:branch_name) { 'feature' } let(:file_path) { 'files/ruby/feature.rb' } let(:project) { create(:project, :repository) } diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb index 73ee250a8b8..d28fafaac45 100644 --- a/spec/features/projects_spec.rb +++ b/spec/features/projects_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Project', feature_category: :projects do +RSpec.describe 'Project', feature_category: :groups_and_projects do include ProjectForksHelper include MobileHelpers diff --git a/spec/features/topic_show_spec.rb b/spec/features/topic_show_spec.rb index 39b8782ea58..7c2c6c2dd12 100644 --- a/spec/features/topic_show_spec.rb +++ b/spec/features/topic_show_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Topic show page', feature_category: :projects do +RSpec.describe 'Topic show page', feature_category: :groups_and_projects do let_it_be(:topic) { create(:topic, name: 'my-topic', title: 'My Topic', description: 'This is **my** topic https://google.com/ :poop: ```\ncode\n```', avatar: fixture_file_upload("spec/fixtures/dk.png", "image/png")) } context 'when topic does not exist' do diff --git a/spec/features/users/user_browses_projects_on_user_page_spec.rb b/spec/features/users/user_browses_projects_on_user_page_spec.rb index 52ca2397582..ccfb66838c5 100644 --- a/spec/features/users/user_browses_projects_on_user_page_spec.rb +++ b/spec/features/users/user_browses_projects_on_user_page_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Users > User browses projects on user page', :js, feature_category: :projects do +RSpec.describe 'Users > User browses projects on user page', :js, feature_category: :groups_and_projects do let!(:user) { create :user } let!(:private_project) do create :project, :private, name: 'private', namespace: user.namespace do |project| diff --git a/spec/finders/group_members_finder_spec.rb b/spec/finders/group_members_finder_spec.rb index 4fc49289fa4..4ac4dc3ba37 100644 --- a/spec/finders/group_members_finder_spec.rb +++ b/spec/finders/group_members_finder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GroupMembersFinder, '#execute', feature_category: :subgroups do +RSpec.describe GroupMembersFinder, '#execute', feature_category: :groups_and_projects do let_it_be(:group) { create(:group) } let_it_be(:sub_group) { create(:group, parent: group) } let_it_be(:sub_sub_group) { create(:group, parent: sub_group) } diff --git a/spec/finders/groups/accepting_project_creations_finder_spec.rb b/spec/finders/groups/accepting_project_creations_finder_spec.rb index 2ea5577dd90..61d673d6a99 100644 --- a/spec/finders/groups/accepting_project_creations_finder_spec.rb +++ b/spec/finders/groups/accepting_project_creations_finder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::AcceptingProjectCreationsFinder, feature_category: :subgroups do +RSpec.describe Groups::AcceptingProjectCreationsFinder, feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:group_where_direct_owner) { create(:group) } let_it_be(:subgroup_of_group_where_direct_owner) { create(:group, parent: group_where_direct_owner) } diff --git a/spec/finders/groups/accepting_project_shares_finder_spec.rb b/spec/finders/groups/accepting_project_shares_finder_spec.rb index 6af3fad2110..f5fd865cf4d 100644 --- a/spec/finders/groups/accepting_project_shares_finder_spec.rb +++ b/spec/finders/groups/accepting_project_shares_finder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::AcceptingProjectSharesFinder, feature_category: :subgroups do +RSpec.describe Groups::AcceptingProjectSharesFinder, feature_category: :groups_and_projects do subject(:result) { described_class.new(current_user, project, params).execute } let_it_be_with_reload(:current_user) { create(:user) } diff --git a/spec/finders/groups/user_groups_finder_spec.rb b/spec/finders/groups/user_groups_finder_spec.rb index f6df396037c..99974896311 100644 --- a/spec/finders/groups/user_groups_finder_spec.rb +++ b/spec/finders/groups/user_groups_finder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::UserGroupsFinder, feature_category: :subgroups do +RSpec.describe Groups::UserGroupsFinder, feature_category: :groups_and_projects do describe '#execute' do let_it_be(:user) { create(:user) } let_it_be(:root_group) { create(:group, name: 'Root group', path: 'root-group') } diff --git a/spec/finders/members_finder_spec.rb b/spec/finders/members_finder_spec.rb index afab4514ce2..4df6197e3b0 100644 --- a/spec/finders/members_finder_spec.rb +++ b/spec/finders/members_finder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe MembersFinder, feature_category: :subgroups do +RSpec.describe MembersFinder, feature_category: :groups_and_projects do shared_examples '#execute' do let_it_be(:group) { create(:group) } let_it_be(:nested_group) { create(:group, parent: group) } diff --git a/spec/finders/releases/group_releases_finder_spec.rb b/spec/finders/releases/group_releases_finder_spec.rb index c47477eb3d5..daefc94828b 100644 --- a/spec/finders/releases/group_releases_finder_spec.rb +++ b/spec/finders/releases/group_releases_finder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Releases::GroupReleasesFinder, feature_category: :subgroups do +RSpec.describe Releases::GroupReleasesFinder, feature_category: :groups_and_projects do let(:user) { create(:user) } let(:group) { create(:group) } let(:project) { create(:project, :repository, group: group) } diff --git a/spec/finders/releases_finder_spec.rb b/spec/finders/releases_finder_spec.rb index a3418f08b7d..f836b430f8c 100644 --- a/spec/finders/releases_finder_spec.rb +++ b/spec/finders/releases_finder_spec.rb @@ -12,17 +12,7 @@ RSpec.describe ReleasesFinder, feature_category: :release_orchestration do let_it_be(:v1_0_0) { create(:release, project: project, tag: 'v1.0.0') } let_it_be(:v1_1_0) { create(:release, project: project, tag: 'v1.1.0') } - shared_examples_for 'when the user is not part of the project' do - it 'returns no releases' do - is_expected.to be_empty - end - end - - shared_examples_for 'when the user is not part of the group' do - before do - allow(Ability).to receive(:allowed?).with(user, :read_release, group).and_return(false) - end - + shared_examples_for 'when the user is not authorized' do it 'returns no releases' do is_expected.to be_empty end @@ -57,9 +47,9 @@ RSpec.describe ReleasesFinder, feature_category: :release_orchestration do describe 'when parent is a project' do subject { described_class.new(project, user, params).execute(**args) } - it_behaves_like 'when the user is not part of the project' + it_behaves_like 'when the user is not authorized' - context 'when the user is a project guest' do + context 'when the user has guest privileges or higher' do before do project.add_guest(user) @@ -109,11 +99,9 @@ RSpec.describe ReleasesFinder, feature_category: :release_orchestration do subject { described_class.new([project, project2], user, params).execute(**args) } - context 'when the user is not part of any project' do - it_behaves_like 'when the user is not part of the project' - end + it_behaves_like 'when the user is not authorized' - context 'when the user is only part of one project' do + context 'when the user has guest privileges or higher on one project' do before do project.add_guest(user) end @@ -125,7 +113,7 @@ RSpec.describe ReleasesFinder, feature_category: :release_orchestration do end end - context 'when the user is a guest on all projects' do + context 'when the user has guest privileges or higher on all projects' do before do project.add_guest(user) project2.add_guest(user) diff --git a/spec/frontend/commit/components/commit_refs_spec.js b/spec/frontend/commit/components/commit_refs_spec.js index 7c35ff1969c..380b2e07842 100644 --- a/spec/frontend/commit/components/commit_refs_spec.js +++ b/spec/frontend/commit/components/commit_refs_spec.js @@ -42,7 +42,7 @@ describe('Commit references component', () => { [containingBranchesQuery, containingBranchesQueryHandler], ]), provide: { - fullPath: '/some/project', + fullPath: 'some/project', commitSha: 'xxx', }, }); @@ -50,13 +50,15 @@ describe('Commit references component', () => { await waitForPromises(); }; - it('renders component correcrly', async () => { + beforeEach(async () => { await createComponent(); + }); + + it('renders component correcrly', () => { expect(findRefsLists()).toHaveLength(2); }); - it('passes props to refs list', async () => { - await createComponent(); + it('passes props to refs list', () => { expect(branchesList().props()).toEqual(refsListPropsMock); }); @@ -79,4 +81,17 @@ describe('Commit references component', () => { await createComponent(successQueryHandler(mockOnlyBranchesResponse)); expect(findRefsLists()).toHaveLength(1); }); + + describe('with relative url', () => { + beforeEach(async () => { + gon.relative_url_root = '/gitlab'; + await createComponent(); + }); + + it('passes correct urlPart prop to refList', () => { + expect(branchesList().props('urlPart')).toBe( + `${gon.relative_url_root}${refsListPropsMock.urlPart}`, + ); + }); + }); }); diff --git a/spec/frontend/commit/components/refs_list_spec.js b/spec/frontend/commit/components/refs_list_spec.js index d124f4a41b8..594f8827d58 100644 --- a/spec/frontend/commit/components/refs_list_spec.js +++ b/spec/frontend/commit/components/refs_list_spec.js @@ -45,12 +45,12 @@ describe('Commit references component', () => { expect(findCollapseButton().text()).toContain(CONTAINING_COMMIT); }); - it('Emits event when collapse button is clicked', () => { + it('emits event when collapse button is clicked', () => { findCollapseButton().vm.$emit('click'); expect(wrapper.emitted()[FETCH_CONTAINING_REFS_EVENT]).toHaveLength(1); }); - it('Renders the list of containing branches or tags when collapse is expanded', () => { + it('renders the list of containing branches or tags when collapse is expanded', () => { createComponent({ containingRefs: containingBranchesMock }); const containingRefsList = findContainingRefs(); expect(containingRefsList.findAllComponents(GlBadge)).toHaveLength( @@ -58,12 +58,19 @@ describe('Commit references component', () => { ); }); - it('Does not reneder list of tipping branches or tags if there is no data', () => { + it('renders links to refs', () => { + const index = 0; + const refBadge = findTippingRefs().at(index); + const refUrl = `${refsListPropsMock.urlPart}${refsListPropsMock.tippingRefs[index]}`; + expect(refBadge.attributes('href')).toBe(refUrl); + }); + + it('does not reneder list of tipping branches or tags if there is no data', () => { createComponent({ tippingRefs: [] }); expect(findTippingRefs().exists()).toBe(false); }); - it('Renders skeleton loader when isLoading prop has true value', () => { + it('renders skeleton loader when isLoading prop has true value', () => { createComponent({ isLoading: true, containingRefs: [] }); expect(findSkeletonLoader().exists()).toBe(true); }); diff --git a/spec/frontend/commit/mock_data.js b/spec/frontend/commit/mock_data.js index 1c2bcb17663..9c8f9266986 100644 --- a/spec/frontend/commit/mock_data.js +++ b/spec/frontend/commit/mock_data.js @@ -288,4 +288,5 @@ export const refsListPropsMock = { namespace: 'Branches', tippingRefs: tippingBranchesMock, isLoading: false, + urlPart: '/some/project/-/commits/', }; diff --git a/spec/frontend/content_editor/components/content_editor_spec.js b/spec/frontend/content_editor/components/content_editor_spec.js index 59b46e95c45..0b8321ba8eb 100644 --- a/spec/frontend/content_editor/components/content_editor_spec.js +++ b/spec/frontend/content_editor/components/content_editor_spec.js @@ -105,6 +105,18 @@ describe('ContentEditor', () => { expect(findEditorElement().text()).not.toContain('For quick actions, type /'); }); + it('displays an attachment button', () => { + createWrapper(); + + expect(wrapper.findComponent(FormattingToolbar).props().hideAttachmentButton).toBe(false); + }); + + it('hides the attachment button if attachments are disabled', () => { + createWrapper({ disableAttachments: true }); + + expect(wrapper.findComponent(FormattingToolbar).props().hideAttachmentButton).toBe(true); + }); + describe('when setting initial content', () => { it('displays loading indicator', async () => { createWrapper(); diff --git a/spec/frontend/content_editor/components/formatting_toolbar_spec.js b/spec/frontend/content_editor/components/formatting_toolbar_spec.js index e04c6a00765..9d835381ff4 100644 --- a/spec/frontend/content_editor/components/formatting_toolbar_spec.js +++ b/spec/frontend/content_editor/components/formatting_toolbar_spec.js @@ -12,13 +12,14 @@ describe('content_editor/components/formatting_toolbar', () => { let wrapper; let trackingSpy; - const buildWrapper = () => { + const buildWrapper = (props) => { wrapper = shallowMountExtended(FormattingToolbar, { stubs: { GlTabs, GlTab, EditorModeSwitcher, }, + propsData: props, }); }; @@ -73,4 +74,12 @@ describe('content_editor/components/formatting_toolbar', () => { expect(wrapper.findComponent(EditorModeSwitcher).exists()).toBe(true); }); + + describe('when attachment button is hidden', () => { + it('does not show the attachment button', () => { + buildWrapper({ hideAttachmentButton: true }); + + expect(wrapper.findByTestId('attachment').exists()).toBe(false); + }); + }); }); 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 72454c113b0..e54e261b8e4 100644 --- a/spec/frontend/vue_shared/components/markdown/markdown_editor_spec.js +++ b/spec/frontend/vue_shared/components/markdown/markdown_editor_spec.js @@ -174,6 +174,20 @@ describe('vue_shared/component/markdown/markdown_editor', () => { }); }); + describe('when attachments are disabled', () => { + beforeEach(() => { + buildWrapper({ propsData: { disableAttachments: true } }); + }); + + it('disables canAttachFile', () => { + expect(findMarkdownField().props().canAttachFile).toBe(false); + }); + + it('passes `attach-file` to restrictedToolBarItems', () => { + expect(findMarkdownField().props().restrictedToolBarItems).toContain('attach-file'); + }); + }); + describe('disabled', () => { it('disables markdown field when disabled prop is true', () => { buildWrapper({ propsData: { disabled: true } }); diff --git a/spec/graphql/mutations/members/bulk_update_base_spec.rb b/spec/graphql/mutations/members/bulk_update_base_spec.rb index 61a27984824..d7a19e39890 100644 --- a/spec/graphql/mutations/members/bulk_update_base_spec.rb +++ b/spec/graphql/mutations/members/bulk_update_base_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Mutations::Members::BulkUpdateBase, feature_category: :subgroups do +RSpec.describe Mutations::Members::BulkUpdateBase, feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:user) { create(:user) } diff --git a/spec/graphql/resolvers/groups_resolver_spec.rb b/spec/graphql/resolvers/groups_resolver_spec.rb index 9d1ad46ed0e..6a317742349 100644 --- a/spec/graphql/resolvers/groups_resolver_spec.rb +++ b/spec/graphql/resolvers/groups_resolver_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Resolvers::GroupsResolver, feature_category: :subgroups do +RSpec.describe Resolvers::GroupsResolver, feature_category: :groups_and_projects do include GraphqlHelpers describe '#resolve' do diff --git a/spec/graphql/resolvers/namespace_projects_resolver_spec.rb b/spec/graphql/resolvers/namespace_projects_resolver_spec.rb index 07ea98f00c7..5974bf2a7b4 100644 --- a/spec/graphql/resolvers/namespace_projects_resolver_spec.rb +++ b/spec/graphql/resolvers/namespace_projects_resolver_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Resolvers::NamespaceProjectsResolver, feature_category: :subgroups do +RSpec.describe Resolvers::NamespaceProjectsResolver, feature_category: :groups_and_projects do include GraphqlHelpers let(:current_user) { create(:user) } diff --git a/spec/graphql/resolvers/nested_groups_resolver_spec.rb b/spec/graphql/resolvers/nested_groups_resolver_spec.rb index e58edc3fd4b..cc3b276754a 100644 --- a/spec/graphql/resolvers/nested_groups_resolver_spec.rb +++ b/spec/graphql/resolvers/nested_groups_resolver_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Resolvers::NestedGroupsResolver, feature_category: :subgroups do +RSpec.describe Resolvers::NestedGroupsResolver, feature_category: :groups_and_projects do include GraphqlHelpers describe '#resolve' do diff --git a/spec/graphql/types/member_access_level_enum_spec.rb b/spec/graphql/types/member_access_level_enum_spec.rb index 54aef667695..cb079f848e0 100644 --- a/spec/graphql/types/member_access_level_enum_spec.rb +++ b/spec/graphql/types/member_access_level_enum_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Types::MemberAccessLevelEnum, feature_category: :subgroups do +RSpec.describe Types::MemberAccessLevelEnum, feature_category: :groups_and_projects do specify { expect(described_class.graphql_name).to eq('MemberAccessLevel') } it 'exposes all the existing access levels' do diff --git a/spec/helpers/namespaces_helper_spec.rb b/spec/helpers/namespaces_helper_spec.rb index e7c8e40da7f..bc582544d16 100644 --- a/spec/helpers/namespaces_helper_spec.rb +++ b/spec/helpers/namespaces_helper_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe NamespacesHelper, feature_category: :subgroups do +RSpec.describe NamespacesHelper, feature_category: :groups_and_projects do let!(:admin) { create(:admin) } let!(:admin_project_creation_level) { nil } let!(:admin_group) do diff --git a/spec/lib/api/entities/plan_limit_spec.rb b/spec/lib/api/entities/plan_limit_spec.rb index dd687143aa9..a2d183fd631 100644 --- a/spec/lib/api/entities/plan_limit_spec.rb +++ b/spec/lib/api/entities/plan_limit_spec.rb @@ -17,15 +17,16 @@ RSpec.describe API::Entities::PlanLimit do :ci_registered_group_runners, :ci_registered_project_runners, :conan_max_file_size, + :enforcement_limit, :generic_packages_max_file_size, :helm_max_file_size, :maven_max_file_size, + :notification_limit, :npm_max_file_size, :nuget_max_file_size, :pypi_max_file_size, :terraform_module_max_file_size, :storage_size_limit, - :notification_limit, :pipeline_hierarchy_size ) end diff --git a/spec/lib/api/helpers/members_helpers_spec.rb b/spec/lib/api/helpers/members_helpers_spec.rb index ee1ae6b1781..3afa36656e9 100644 --- a/spec/lib/api/helpers/members_helpers_spec.rb +++ b/spec/lib/api/helpers/members_helpers_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe API::Helpers::MembersHelpers, feature_category: :subgroups do +RSpec.describe API::Helpers::MembersHelpers, feature_category: :groups_and_projects do let(:helper) do Class.new.include(described_class).new end diff --git a/spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb b/spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb index b92f1a74551..2f53a5da272 100644 --- a/spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb +++ b/spec/lib/gitlab/background_migration/disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' RSpec.describe Gitlab::BackgroundMigration::DisableLegacyOpenSourceLicenseForProjectsLessThanFiveMb, :migration, schema: 20221018095434, - feature_category: :projects do + feature_category: :groups_and_projects do let(:namespaces_table) { table(:namespaces) } let(:projects_table) { table(:projects) } let(:project_settings_table) { table(:project_settings) } diff --git a/spec/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects_spec.rb b/spec/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects_spec.rb index f671a673a08..facc3c435da 100644 --- a/spec/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects_spec.rb +++ b/spec/lib/gitlab/background_migration/nullify_creator_id_column_of_orphaned_projects_spec.rb @@ -2,8 +2,8 @@ require 'spec_helper' -RSpec.describe Gitlab::BackgroundMigration::NullifyCreatorIdColumnOfOrphanedProjects, feature_category: :projects, - schema: 20230130073109 do +RSpec.describe Gitlab::BackgroundMigration::NullifyCreatorIdColumnOfOrphanedProjects, + feature_category: :groups_and_projects, schema: 20230130073109 do let(:users) { table(:users) } let(:projects) { table(:projects) } let(:namespaces) { table(:namespaces) } diff --git a/spec/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups_spec.rb b/spec/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups_spec.rb index c45c402ab9d..126e928fa77 100644 --- a/spec/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups_spec.rb +++ b/spec/lib/gitlab/background_migration/remove_project_group_link_with_missing_groups_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Gitlab::BackgroundMigration::RemoveProjectGroupLinkWithMissingGroups, :migration, - feature_category: :subgroups, schema: 20230206172702 do + feature_category: :groups_and_projects, schema: 20230206172702 do let(:projects) { table(:projects) } let(:namespaces) { table(:namespaces) } let(:project_group_links) { table(:project_group_links) } diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb index 2cb84e2f02a..370d03b495c 100644 --- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb +++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase, :delete, feature_category: :subgroups do +RSpec.describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameBase, :delete, feature_category: :groups_and_projects do let(:migration) { FakeRenameReservedPathMigrationV1.new } let(:subject) { described_class.new(['the-path'], migration) } diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb index 5b5661020b0..b00a1d4a9e1 100644 --- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb +++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_namespaces_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameNamespaces, :delete, -feature_category: :subgroups do +feature_category: :groups_and_projects do let(:migration) { FakeRenameReservedPathMigrationV1.new } let(:subject) { described_class.new(['the-path'], migration) } let(:namespace) { create(:group, name: 'the-path') } diff --git a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb index 787c9e87038..d2665664fb0 100644 --- a/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb +++ b/spec/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_projects_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Gitlab::Database::RenameReservedPathsMigration::V1::RenameProjects, :delete, -feature_category: :projects do +feature_category: :groups_and_projects do let(:migration) { FakeRenameReservedPathMigrationV1.new } let(:subject) { described_class.new(['the-path'], migration) } let(:project) do diff --git a/spec/lib/gitlab/metrics/rails_slis_spec.rb b/spec/lib/gitlab/metrics/rails_slis_spec.rb index 32d3b7581f1..ef996f61082 100644 --- a/spec/lib/gitlab/metrics/rails_slis_spec.rb +++ b/spec/lib/gitlab/metrics/rails_slis_spec.rb @@ -11,7 +11,7 @@ RSpec.describe Gitlab::Metrics::RailsSlis, feature_category: :error_budgets do [ { endpoint_id: "ProjectsController#index", - feature_category: :projects, + feature_category: :groups_and_projects, request_urgency: :default } ] diff --git a/spec/lib/gitlab/sidekiq_middleware/defer_jobs_spec.rb b/spec/lib/gitlab/sidekiq_middleware/defer_jobs_spec.rb index 25b4544d9d6..16c0fceae3b 100644 --- a/spec/lib/gitlab/sidekiq_middleware/defer_jobs_spec.rb +++ b/spec/lib/gitlab/sidekiq_middleware/defer_jobs_spec.rb @@ -33,8 +33,8 @@ RSpec.describe Gitlab::SidekiqMiddleware::DeferJobs, feature_category: :scalabil describe '#call' do context 'when sidekiq_defer_jobs feature flag is enabled for a worker' do before do - stub_feature_flags("defer_sidekiq_jobs:#{TestDeferredWorker.name}": true) - stub_feature_flags("defer_sidekiq_jobs:#{UndeferredWorker.name}": false) + stub_feature_flags("defer_sidekiq_jobs_#{TestDeferredWorker.name}": true) + stub_feature_flags("defer_sidekiq_jobs_#{UndeferredWorker.name}": false) end context 'for the affected worker' do @@ -59,8 +59,8 @@ RSpec.describe Gitlab::SidekiqMiddleware::DeferJobs, feature_category: :scalabil context 'when sidekiq_defer_jobs feature flag is disabled' do before do - stub_feature_flags("defer_sidekiq_jobs:#{TestDeferredWorker.name}": false) - stub_feature_flags("defer_sidekiq_jobs:#{UndeferredWorker.name}": false) + stub_feature_flags("defer_sidekiq_jobs_#{TestDeferredWorker.name}": false) + stub_feature_flags("defer_sidekiq_jobs_#{UndeferredWorker.name}": false) end it 'runs the job normally' do diff --git a/spec/lib/gitlab/sidekiq_middleware_spec.rb b/spec/lib/gitlab/sidekiq_middleware_spec.rb index dabd734aa51..7e53b6598b6 100644 --- a/spec/lib/gitlab/sidekiq_middleware_spec.rb +++ b/spec/lib/gitlab/sidekiq_middleware_spec.rb @@ -31,7 +31,7 @@ RSpec.describe Gitlab::SidekiqMiddleware do shared_examples "a middleware chain" do before do configurator.call(chain) - stub_feature_flags("defer_sidekiq_jobs:#{worker_class.name}": false) # not letting this worker deferring its jobs + stub_feature_flags("defer_sidekiq_jobs_#{worker_class.name}": false) # not letting this worker deferring its jobs end it "passes through the right middlewares", :aggregate_failures do enabled_sidekiq_middlewares.each do |middleware| diff --git a/spec/migrations/20211203091642_add_index_to_projects_on_marked_for_deletion_at_spec.rb b/spec/migrations/20211203091642_add_index_to_projects_on_marked_for_deletion_at_spec.rb index 7be54bc13cc..a513e80a510 100644 --- a/spec/migrations/20211203091642_add_index_to_projects_on_marked_for_deletion_at_spec.rb +++ b/spec/migrations/20211203091642_add_index_to_projects_on_marked_for_deletion_at_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe AddIndexToProjectsOnMarkedForDeletionAt, feature_category: :projects do +RSpec.describe AddIndexToProjectsOnMarkedForDeletionAt, feature_category: :groups_and_projects do it 'correctly migrates up and down' do reversible_migration do |migration| migration.before -> { diff --git a/spec/migrations/20220208080921_schedule_migrate_personal_namespace_project_maintainer_to_owner_spec.rb b/spec/migrations/20220208080921_schedule_migrate_personal_namespace_project_maintainer_to_owner_spec.rb index 89583d1050b..3de9d992413 100644 --- a/spec/migrations/20220208080921_schedule_migrate_personal_namespace_project_maintainer_to_owner_spec.rb +++ b/spec/migrations/20220208080921_schedule_migrate_personal_namespace_project_maintainer_to_owner_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleMigratePersonalNamespaceProjectMaintainerToOwner, feature_category: :subgroups do +RSpec.describe ScheduleMigratePersonalNamespaceProjectMaintainerToOwner, feature_category: :groups_and_projects do let!(:migration) { described_class::MIGRATION } describe '#up' do diff --git a/spec/migrations/20220223124428_schedule_merge_topics_with_same_name_spec.rb b/spec/migrations/20220223124428_schedule_merge_topics_with_same_name_spec.rb index 425f622581b..0347dd8b88d 100644 --- a/spec/migrations/20220223124428_schedule_merge_topics_with_same_name_spec.rb +++ b/spec/migrations/20220223124428_schedule_merge_topics_with_same_name_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleMergeTopicsWithSameName, feature_category: :projects do +RSpec.describe ScheduleMergeTopicsWithSameName, feature_category: :groups_and_projects do let(:topics) { table(:topics) } describe '#up' do diff --git a/spec/migrations/20220324165436_schedule_backfill_project_settings_spec.rb b/spec/migrations/20220324165436_schedule_backfill_project_settings_spec.rb index 3fcfb84c214..82187f71ceb 100644 --- a/spec/migrations/20220324165436_schedule_backfill_project_settings_spec.rb +++ b/spec/migrations/20220324165436_schedule_backfill_project_settings_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleBackfillProjectSettings, feature_category: :projects do +RSpec.describe ScheduleBackfillProjectSettings, feature_category: :groups_and_projects do let!(:migration) { described_class::MIGRATION } describe '#up' do diff --git a/spec/migrations/20220331133802_schedule_backfill_topics_title_spec.rb b/spec/migrations/20220331133802_schedule_backfill_topics_title_spec.rb index b26cd9688ae..0b6252ffb53 100644 --- a/spec/migrations/20220331133802_schedule_backfill_topics_title_spec.rb +++ b/spec/migrations/20220331133802_schedule_backfill_topics_title_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleBackfillTopicsTitle, feature_category: :projects do +RSpec.describe ScheduleBackfillTopicsTitle, feature_category: :groups_and_projects do let(:topics) { table(:topics) } let!(:topic1) { topics.create!(name: 'topic1') } diff --git a/spec/migrations/20220416054011_schedule_backfill_project_member_namespace_id_spec.rb b/spec/migrations/20220416054011_schedule_backfill_project_member_namespace_id_spec.rb index c81ecc07779..019d17d5fc3 100644 --- a/spec/migrations/20220416054011_schedule_backfill_project_member_namespace_id_spec.rb +++ b/spec/migrations/20220416054011_schedule_backfill_project_member_namespace_id_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleBackfillProjectMemberNamespaceId, feature_category: :subgroups do +RSpec.describe ScheduleBackfillProjectMemberNamespaceId, feature_category: :groups_and_projects do let!(:migration) { described_class::MIGRATION } describe '#up' do diff --git a/spec/migrations/20220506154054_create_sync_namespace_details_trigger_spec.rb b/spec/migrations/20220506154054_create_sync_namespace_details_trigger_spec.rb index 3e784761dd4..cc386745547 100644 --- a/spec/migrations/20220506154054_create_sync_namespace_details_trigger_spec.rb +++ b/spec/migrations/20220506154054_create_sync_namespace_details_trigger_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' require_migration! -RSpec.describe CreateSyncNamespaceDetailsTrigger, feature_category: :subgroups do +RSpec.describe CreateSyncNamespaceDetailsTrigger, feature_category: :groups_and_projects do let(:migration) { described_class.new } let(:namespaces) { table(:namespaces) } let(:namespace_details) { table(:namespace_details) } diff --git a/spec/migrations/20220524184149_create_sync_project_namespace_details_trigger_spec.rb b/spec/migrations/20220524184149_create_sync_project_namespace_details_trigger_spec.rb index 21fddb08771..1b598266f50 100644 --- a/spec/migrations/20220524184149_create_sync_project_namespace_details_trigger_spec.rb +++ b/spec/migrations/20220524184149_create_sync_project_namespace_details_trigger_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' require_migration! -RSpec.describe CreateSyncProjectNamespaceDetailsTrigger, feature_category: :projects do +RSpec.describe CreateSyncProjectNamespaceDetailsTrigger, feature_category: :groups_and_projects do let(:migration) { described_class.new } let(:projects) { table(:projects) } let(:namespaces) { table(:namespaces) } diff --git a/spec/migrations/20220627090231_schedule_disable_legacy_open_source_license_for_inactive_public_projects_spec.rb b/spec/migrations/20220627090231_schedule_disable_legacy_open_source_license_for_inactive_public_projects_spec.rb index edefc378575..4927e61da95 100644 --- a/spec/migrations/20220627090231_schedule_disable_legacy_open_source_license_for_inactive_public_projects_spec.rb +++ b/spec/migrations/20220627090231_schedule_disable_legacy_open_source_license_for_inactive_public_projects_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleDisableLegacyOpenSourceLicenseForInactivePublicProjects, feature_category: :projects do +RSpec.describe ScheduleDisableLegacyOpenSourceLicenseForInactivePublicProjects, feature_category: :groups_and_projects do context 'on gitlab.com' do let(:migration) { described_class::MIGRATION } diff --git a/spec/migrations/20220627152642_queue_update_delayed_project_removal_to_null_for_user_namespace_spec.rb b/spec/migrations/20220627152642_queue_update_delayed_project_removal_to_null_for_user_namespace_spec.rb index fe46d6a8608..0335ba45993 100644 --- a/spec/migrations/20220627152642_queue_update_delayed_project_removal_to_null_for_user_namespace_spec.rb +++ b/spec/migrations/20220627152642_queue_update_delayed_project_removal_to_null_for_user_namespace_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe QueueUpdateDelayedProjectRemovalToNullForUserNamespace, feature_category: :subgroups do +RSpec.describe QueueUpdateDelayedProjectRemovalToNullForUserNamespace, feature_category: :groups_and_projects do let(:migration) { described_class::MIGRATION } describe '#up' do diff --git a/spec/migrations/20220628012902_finalise_project_namespace_members_spec.rb b/spec/migrations/20220628012902_finalise_project_namespace_members_spec.rb index fb1a4782f3b..e3ba45ff13b 100644 --- a/spec/migrations/20220628012902_finalise_project_namespace_members_spec.rb +++ b/spec/migrations/20220628012902_finalise_project_namespace_members_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe FinaliseProjectNamespaceMembers, :migration, feature_category: :subgroups do +RSpec.describe FinaliseProjectNamespaceMembers, :migration, feature_category: :groups_and_projects do let(:batched_migrations) { table(:batched_background_migrations) } let!(:migration) { described_class::MIGRATION } diff --git a/spec/migrations/20220721031446_schedule_disable_legacy_open_source_license_for_one_member_no_repo_projects_spec.rb b/spec/migrations/20220721031446_schedule_disable_legacy_open_source_license_for_one_member_no_repo_projects_spec.rb index 2dff9eb90cd..0701f05057a 100644 --- a/spec/migrations/20220721031446_schedule_disable_legacy_open_source_license_for_one_member_no_repo_projects_spec.rb +++ b/spec/migrations/20220721031446_schedule_disable_legacy_open_source_license_for_one_member_no_repo_projects_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleDisableLegacyOpenSourceLicenseForOneMemberNoRepoProjects, feature_category: :projects do +RSpec.describe ScheduleDisableLegacyOpenSourceLicenseForOneMemberNoRepoProjects, feature_category: :groups_and_projects do context 'when on gitlab.com' do let(:migration) { described_class::MIGRATION } diff --git a/spec/migrations/20220722084543_schedule_disable_legacy_open_source_license_for_no_issues_no_repo_projects_spec.rb b/spec/migrations/20220722084543_schedule_disable_legacy_open_source_license_for_no_issues_no_repo_projects_spec.rb index a994ddad850..83c658f700e 100644 --- a/spec/migrations/20220722084543_schedule_disable_legacy_open_source_license_for_no_issues_no_repo_projects_spec.rb +++ b/spec/migrations/20220722084543_schedule_disable_legacy_open_source_license_for_no_issues_no_repo_projects_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleDisableLegacyOpenSourceLicenseForNoIssuesNoRepoProjects, feature_category: :projects do +RSpec.describe ScheduleDisableLegacyOpenSourceLicenseForNoIssuesNoRepoProjects, feature_category: :groups_and_projects do context 'when on gitlab.com' do let(:migration) { described_class::MIGRATION } diff --git a/spec/migrations/20220722110026_reschedule_set_legacy_open_source_license_available_for_non_public_projects_spec.rb b/spec/migrations/20220722110026_reschedule_set_legacy_open_source_license_available_for_non_public_projects_spec.rb index ab246ea1b10..74638918e02 100644 --- a/spec/migrations/20220722110026_reschedule_set_legacy_open_source_license_available_for_non_public_projects_spec.rb +++ b/spec/migrations/20220722110026_reschedule_set_legacy_open_source_license_available_for_non_public_projects_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe RescheduleSetLegacyOpenSourceLicenseAvailableForNonPublicProjects, feature_category: :projects do +RSpec.describe RescheduleSetLegacyOpenSourceLicenseAvailableForNonPublicProjects, feature_category: :groups_and_projects do context 'when on gitlab.com' do let(:migration) { described_class::MIGRATION } diff --git a/spec/migrations/20220801155858_schedule_disable_legacy_open_source_licence_for_recent_public_projects_spec.rb b/spec/migrations/20220801155858_schedule_disable_legacy_open_source_licence_for_recent_public_projects_spec.rb index a9f0bdc8487..f383b4aafea 100644 --- a/spec/migrations/20220801155858_schedule_disable_legacy_open_source_licence_for_recent_public_projects_spec.rb +++ b/spec/migrations/20220801155858_schedule_disable_legacy_open_source_licence_for_recent_public_projects_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' require_migration! RSpec.describe ScheduleDisableLegacyOpenSourceLicenceForRecentPublicProjects, - schema: 20220801155858, feature_category: :projects do + schema: 20220801155858, feature_category: :groups_and_projects do context 'when on gitlab.com' do let(:background_migration) { described_class::MIGRATION } let(:migration) { described_class.new } diff --git a/spec/migrations/20220906074449_schedule_disable_legacy_open_source_license_for_projects_less_than_one_mb_spec.rb b/spec/migrations/20220906074449_schedule_disable_legacy_open_source_license_for_projects_less_than_one_mb_spec.rb index 852748bcdc1..75117b6c9b1 100644 --- a/spec/migrations/20220906074449_schedule_disable_legacy_open_source_license_for_projects_less_than_one_mb_spec.rb +++ b/spec/migrations/20220906074449_schedule_disable_legacy_open_source_license_for_projects_less_than_one_mb_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleDisableLegacyOpenSourceLicenseForProjectsLessThanOneMb, feature_category: :projects do +RSpec.describe ScheduleDisableLegacyOpenSourceLicenseForProjectsLessThanOneMb, feature_category: :groups_and_projects do let!(:migration) { described_class.new } let!(:post_migration) { described_class::MIGRATION } diff --git a/spec/migrations/20220921093355_schedule_backfill_namespace_details_spec.rb b/spec/migrations/20220921093355_schedule_backfill_namespace_details_spec.rb index 5ac49762dbf..41c4115c6a4 100644 --- a/spec/migrations/20220921093355_schedule_backfill_namespace_details_spec.rb +++ b/spec/migrations/20220921093355_schedule_backfill_namespace_details_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleBackfillNamespaceDetails, schema: 20220921093355, feature_category: :subgroups do +RSpec.describe ScheduleBackfillNamespaceDetails, schema: 20220921093355, feature_category: :groups_and_projects do context 'when on gitlab.com' do let(:background_migration) { described_class::MIGRATION } let(:migration) { described_class.new } diff --git a/spec/migrations/20221002234454_finalize_group_member_namespace_id_migration_spec.rb b/spec/migrations/20221002234454_finalize_group_member_namespace_id_migration_spec.rb index 632b23a8384..e3adea47273 100644 --- a/spec/migrations/20221002234454_finalize_group_member_namespace_id_migration_spec.rb +++ b/spec/migrations/20221002234454_finalize_group_member_namespace_id_migration_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe FinalizeGroupMemberNamespaceIdMigration, :migration, feature_category: :subgroups do +RSpec.describe FinalizeGroupMemberNamespaceIdMigration, :migration, feature_category: :groups_and_projects do let(:batched_migrations) { table(:batched_background_migrations) } let!(:migration) { described_class::MIGRATION } diff --git a/spec/migrations/20221004094814_schedule_destroy_invalid_members_spec.rb b/spec/migrations/20221004094814_schedule_destroy_invalid_members_spec.rb index 8bffa4b9b99..73896cf1cea 100644 --- a/spec/migrations/20221004094814_schedule_destroy_invalid_members_spec.rb +++ b/spec/migrations/20221004094814_schedule_destroy_invalid_members_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleDestroyInvalidMembers, :migration, feature_category: :subgroups do +RSpec.describe ScheduleDestroyInvalidMembers, :migration, feature_category: :groups_and_projects do let!(:migration) { described_class::MIGRATION } describe '#up' do diff --git a/spec/migrations/20221018062308_schedule_backfill_project_namespace_details_spec.rb b/spec/migrations/20221018062308_schedule_backfill_project_namespace_details_spec.rb index 4175d9b1ad8..9cca2a5adfc 100644 --- a/spec/migrations/20221018062308_schedule_backfill_project_namespace_details_spec.rb +++ b/spec/migrations/20221018062308_schedule_backfill_project_namespace_details_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleBackfillProjectNamespaceDetails, schema: 20221018062308, feature_category: :projects do +RSpec.describe ScheduleBackfillProjectNamespaceDetails, schema: 20221018062308, feature_category: :groups_and_projects do context 'when on gitlab.com' do let!(:background_migration) { described_class::MIGRATION } let!(:migration) { described_class.new } diff --git a/spec/migrations/20221018095434_schedule_disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb b/spec/migrations/20221018095434_schedule_disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb index 34bba8ed9c8..ba341ebe5ca 100644 --- a/spec/migrations/20221018095434_schedule_disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb +++ b/spec/migrations/20221018095434_schedule_disable_legacy_open_source_license_for_projects_less_than_five_mb_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleDisableLegacyOpenSourceLicenseForProjectsLessThanFiveMb, feature_category: :projects do +RSpec.describe ScheduleDisableLegacyOpenSourceLicenseForProjectsLessThanFiveMb, feature_category: :groups_and_projects do let!(:migration) { described_class.new } let!(:post_migration) { described_class::MIGRATION } diff --git a/spec/migrations/20230130073109_nullify_creator_id_of_orphaned_projects_spec.rb b/spec/migrations/20230130073109_nullify_creator_id_of_orphaned_projects_spec.rb index 9d4d50fab54..196bacd99ba 100644 --- a/spec/migrations/20230130073109_nullify_creator_id_of_orphaned_projects_spec.rb +++ b/spec/migrations/20230130073109_nullify_creator_id_of_orphaned_projects_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe NullifyCreatorIdOfOrphanedProjects, feature_category: :projects do +RSpec.describe NullifyCreatorIdOfOrphanedProjects, feature_category: :groups_and_projects do let!(:migration) { described_class::MIGRATION } describe '#up' do diff --git a/spec/migrations/20230209222452_schedule_remove_project_group_link_with_missing_groups_spec.rb b/spec/migrations/20230209222452_schedule_remove_project_group_link_with_missing_groups_spec.rb index 13ae12b2774..19c9b209634 100644 --- a/spec/migrations/20230209222452_schedule_remove_project_group_link_with_missing_groups_spec.rb +++ b/spec/migrations/20230209222452_schedule_remove_project_group_link_with_missing_groups_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe ScheduleRemoveProjectGroupLinkWithMissingGroups, feature_category: :subgroups do +RSpec.describe ScheduleRemoveProjectGroupLinkWithMissingGroups, feature_category: :groups_and_projects do let!(:migration) { described_class::MIGRATION } describe '#up' do diff --git a/spec/migrations/20230223065753_finalize_nullify_creator_id_of_orphaned_projects_spec.rb b/spec/migrations/20230223065753_finalize_nullify_creator_id_of_orphaned_projects_spec.rb index e4adf3ca540..006f44de0b7 100644 --- a/spec/migrations/20230223065753_finalize_nullify_creator_id_of_orphaned_projects_spec.rb +++ b/spec/migrations/20230223065753_finalize_nullify_creator_id_of_orphaned_projects_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' require_migration! -RSpec.describe FinalizeNullifyCreatorIdOfOrphanedProjects, :migration, feature_category: :projects do +RSpec.describe FinalizeNullifyCreatorIdOfOrphanedProjects, :migration, feature_category: :groups_and_projects do let(:batched_migrations) { table(:batched_background_migrations) } let(:batch_failed_status) { 2 } let(:batch_finalized_status) { 3 } diff --git a/spec/migrations/backfill_all_project_namespaces_spec.rb b/spec/migrations/backfill_all_project_namespaces_spec.rb index 52fa46eea57..5cd499a2988 100644 --- a/spec/migrations/backfill_all_project_namespaces_spec.rb +++ b/spec/migrations/backfill_all_project_namespaces_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe BackfillAllProjectNamespaces, :migration, feature_category: :subgroups do +RSpec.describe BackfillAllProjectNamespaces, :migration, feature_category: :groups_and_projects do let!(:migration) { described_class::MIGRATION } let(:projects) { table(:projects) } diff --git a/spec/migrations/backfill_member_namespace_id_for_group_members_spec.rb b/spec/migrations/backfill_member_namespace_id_for_group_members_spec.rb index 892589dd770..da6ddfe808e 100644 --- a/spec/migrations/backfill_member_namespace_id_for_group_members_spec.rb +++ b/spec/migrations/backfill_member_namespace_id_for_group_members_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe BackfillMemberNamespaceIdForGroupMembers, feature_category: :subgroups do +RSpec.describe BackfillMemberNamespaceIdForGroupMembers, feature_category: :groups_and_projects do let!(:migration) { described_class::MIGRATION } describe '#up' do diff --git a/spec/migrations/backfill_namespace_id_for_namespace_routes_spec.rb b/spec/migrations/backfill_namespace_id_for_namespace_routes_spec.rb index 627b18cd889..8fef4cdc806 100644 --- a/spec/migrations/backfill_namespace_id_for_namespace_routes_spec.rb +++ b/spec/migrations/backfill_namespace_id_for_namespace_routes_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe BackfillNamespaceIdForNamespaceRoutes, feature_category: :projects do +RSpec.describe BackfillNamespaceIdForNamespaceRoutes, feature_category: :groups_and_projects do let!(:migration) { described_class::MIGRATION } describe '#up' do diff --git a/spec/migrations/backfill_namespace_id_for_project_routes_spec.rb b/spec/migrations/backfill_namespace_id_for_project_routes_spec.rb index 773c1733a4a..998d5e88b9d 100644 --- a/spec/migrations/backfill_namespace_id_for_project_routes_spec.rb +++ b/spec/migrations/backfill_namespace_id_for_project_routes_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe BackfillNamespaceIdForProjectRoutes, :migration, feature_category: :subgroups do +RSpec.describe BackfillNamespaceIdForProjectRoutes, :migration, feature_category: :groups_and_projects do let(:migration) { described_class::MIGRATION } describe '#up' do diff --git a/spec/migrations/backfill_project_namespaces_for_group_spec.rb b/spec/migrations/backfill_project_namespaces_for_group_spec.rb index b21ed6e1aa2..5f69e37a2ad 100644 --- a/spec/migrations/backfill_project_namespaces_for_group_spec.rb +++ b/spec/migrations/backfill_project_namespaces_for_group_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe BackfillProjectNamespacesForGroup, feature_category: :subgroups do +RSpec.describe BackfillProjectNamespacesForGroup, feature_category: :groups_and_projects do let!(:migration) { described_class::MIGRATION } let(:projects) { table(:projects) } diff --git a/spec/migrations/cleanup_orphaned_routes_spec.rb b/spec/migrations/cleanup_orphaned_routes_spec.rb index a0ce9062c70..439ba5def99 100644 --- a/spec/migrations/cleanup_orphaned_routes_spec.rb +++ b/spec/migrations/cleanup_orphaned_routes_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe CleanupOrphanedRoutes, :migration, feature_category: :projects do +RSpec.describe CleanupOrphanedRoutes, :migration, feature_category: :groups_and_projects do let(:migration) { described_class::MIGRATION } describe '#up' do diff --git a/spec/migrations/finalize_invalid_member_cleanup_spec.rb b/spec/migrations/finalize_invalid_member_cleanup_spec.rb index c039edcc319..ace973ea1af 100644 --- a/spec/migrations/finalize_invalid_member_cleanup_spec.rb +++ b/spec/migrations/finalize_invalid_member_cleanup_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe FinalizeInvalidMemberCleanup, :migration, feature_category: :subgroups do +RSpec.describe FinalizeInvalidMemberCleanup, :migration, feature_category: :groups_and_projects do let(:batched_migrations) { table(:batched_background_migrations) } let!(:migration) { described_class::MIGRATION } diff --git a/spec/migrations/finalize_orphaned_routes_cleanup_spec.rb b/spec/migrations/finalize_orphaned_routes_cleanup_spec.rb index 215fdbb05ad..2b26ef2a762 100644 --- a/spec/migrations/finalize_orphaned_routes_cleanup_spec.rb +++ b/spec/migrations/finalize_orphaned_routes_cleanup_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe FinalizeOrphanedRoutesCleanup, :migration, feature_category: :projects do +RSpec.describe FinalizeOrphanedRoutesCleanup, :migration, feature_category: :groups_and_projects do let(:batched_migrations) { table(:batched_background_migrations) } let!(:migration) { described_class::MIGRATION } diff --git a/spec/migrations/finalize_project_namespaces_backfill_spec.rb b/spec/migrations/finalize_project_namespaces_backfill_spec.rb index 880bb6661a4..a63f05bed8d 100644 --- a/spec/migrations/finalize_project_namespaces_backfill_spec.rb +++ b/spec/migrations/finalize_project_namespaces_backfill_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe FinalizeProjectNamespacesBackfill, :migration, feature_category: :projects do +RSpec.describe FinalizeProjectNamespacesBackfill, :migration, feature_category: :groups_and_projects do let(:batched_migrations) { table(:batched_background_migrations) } let!(:migration) { described_class::MIGRATION } diff --git a/spec/migrations/finalize_routes_backfilling_for_projects_spec.rb b/spec/migrations/finalize_routes_backfilling_for_projects_spec.rb index 7618957d2f7..c9972d274ee 100644 --- a/spec/migrations/finalize_routes_backfilling_for_projects_spec.rb +++ b/spec/migrations/finalize_routes_backfilling_for_projects_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe FinalizeRoutesBackfillingForProjects, :migration, feature_category: :projects do +RSpec.describe FinalizeRoutesBackfillingForProjects, :migration, feature_category: :groups_and_projects do let(:batched_migrations) { table(:batched_background_migrations) } let!(:migration) { described_class::MIGRATION } diff --git a/spec/migrations/fix_and_backfill_project_namespaces_for_projects_with_duplicate_name_spec.rb b/spec/migrations/fix_and_backfill_project_namespaces_for_projects_with_duplicate_name_spec.rb index 6b9fb1c6f2c..fdeba216c4f 100644 --- a/spec/migrations/fix_and_backfill_project_namespaces_for_projects_with_duplicate_name_spec.rb +++ b/spec/migrations/fix_and_backfill_project_namespaces_for_projects_with_duplicate_name_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe FixAndBackfillProjectNamespacesForProjectsWithDuplicateName, :migration, feature_category: :projects do +RSpec.describe FixAndBackfillProjectNamespacesForProjectsWithDuplicateName, :migration, feature_category: :groups_and_projects do let(:projects) { table(:projects) } let(:namespaces) { table(:namespaces) } diff --git a/spec/migrations/insert_daily_invites_trial_plan_limits_spec.rb b/spec/migrations/insert_daily_invites_trial_plan_limits_spec.rb index ea1476b94a9..412bb5917e3 100644 --- a/spec/migrations/insert_daily_invites_trial_plan_limits_spec.rb +++ b/spec/migrations/insert_daily_invites_trial_plan_limits_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe InsertDailyInvitesTrialPlanLimits, feature_category: :subgroups do +RSpec.describe InsertDailyInvitesTrialPlanLimits, feature_category: :groups_and_projects do let(:plans) { table(:plans) } let(:plan_limits) { table(:plan_limits) } let!(:premium_trial_plan) { plans.create!(name: 'premium_trial') } diff --git a/spec/migrations/orphaned_invited_members_cleanup_spec.rb b/spec/migrations/orphaned_invited_members_cleanup_spec.rb index 1d4db5306bc..416e1ddd755 100644 --- a/spec/migrations/orphaned_invited_members_cleanup_spec.rb +++ b/spec/migrations/orphaned_invited_members_cleanup_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require_migration! -RSpec.describe OrphanedInvitedMembersCleanup, :migration, feature_category: :subgroups do +RSpec.describe OrphanedInvitedMembersCleanup, :migration, feature_category: :groups_and_projects do describe '#up', :aggregate_failures do it 'removes accepted members with no associated user' do user = create_user!('testuser1') diff --git a/spec/migrations/update_invalid_member_states_spec.rb b/spec/migrations/update_invalid_member_states_spec.rb index 6ae4b9f3c0f..2845a703ae3 100644 --- a/spec/migrations/update_invalid_member_states_spec.rb +++ b/spec/migrations/update_invalid_member_states_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' require_migration! -RSpec.describe UpdateInvalidMemberStates, feature_category: :subgroups do +RSpec.describe UpdateInvalidMemberStates, feature_category: :groups_and_projects do let(:members) { table(:members) } let(:groups) { table(:namespaces) } let(:projects) { table(:projects) } diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb index d59c8e253ce..52533a1087c 100644 --- a/spec/models/group_spec.rb +++ b/spec/models/group_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Group, feature_category: :subgroups do +RSpec.describe Group, feature_category: :groups_and_projects do include ReloadHelpers include StubGitlabCalls diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb index eea96e5e4ae..cf4aa362189 100644 --- a/spec/models/member_spec.rb +++ b/spec/models/member_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Member, feature_category: :subgroups do +RSpec.describe Member, feature_category: :groups_and_projects do include ExclusiveLeaseHelpers using RSpec::Parameterized::TableSyntax diff --git a/spec/models/namespace/traversal_hierarchy_spec.rb b/spec/models/namespace/traversal_hierarchy_spec.rb index b0088e44087..8bfcac50b1a 100644 --- a/spec/models/namespace/traversal_hierarchy_spec.rb +++ b/spec/models/namespace/traversal_hierarchy_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Namespace::TraversalHierarchy, type: :model, feature_category: :subgroups do +RSpec.describe Namespace::TraversalHierarchy, type: :model, feature_category: :groups_and_projects do let!(:root) { create(:group, :with_hierarchy) } describe '.for_namespace' do diff --git a/spec/models/namespace_setting_spec.rb b/spec/models/namespace_setting_spec.rb index 1cbc1696401..9ccb40705c4 100644 --- a/spec/models/namespace_setting_spec.rb +++ b/spec/models/namespace_setting_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe NamespaceSetting, feature_category: :subgroups, type: :model do +RSpec.describe NamespaceSetting, feature_category: :groups_and_projects, type: :model do it_behaves_like 'sanitizable', :namespace_settings, %i[default_branch_name] # Relationships diff --git a/spec/models/namespace_spec.rb b/spec/models/namespace_spec.rb index f7c4e34a6dc..2bb791c90df 100644 --- a/spec/models/namespace_spec.rb +++ b/spec/models/namespace_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Namespace, feature_category: :subgroups do +RSpec.describe Namespace, feature_category: :groups_and_projects do include ProjectForksHelper include ReloadHelpers diff --git a/spec/models/packages/package_file_spec.rb b/spec/models/packages/package_file_spec.rb index c9db1efc64a..055abff9144 100644 --- a/spec/models/packages/package_file_spec.rb +++ b/spec/models/packages/package_file_spec.rb @@ -9,7 +9,7 @@ RSpec.describe Packages::PackageFile, type: :model do let_it_be(:package_file2) { create(:package_file, :xml, file_name: 'ThisIsATest') } let_it_be(:package_file3) { create(:package_file, :xml, file_name: 'formatted.zip') } let_it_be(:package_file4) { create(:package_file, :nuget) } - let_it_be(:debian_package) { create(:debian_package, project: project) } + let_it_be(:debian_package) { create(:debian_package, project: project, with_changes_file: true) } it_behaves_like 'having unique enum values' it_behaves_like 'destructible', factory: :package_file diff --git a/spec/models/packages/package_spec.rb b/spec/models/packages/package_spec.rb index de13732bc54..5dd7a0982be 100644 --- a/spec/models/packages/package_spec.rb +++ b/spec/models/packages/package_spec.rb @@ -760,6 +760,23 @@ RSpec.describe Packages::Package, type: :model, feature_category: :package_regis end end + describe '.debian_incoming_package!' do + let!(:debian_package) { create(:debian_package) } + let!(:debian_processing_incoming) { create(:debian_incoming, :processing) } + + subject { described_class.debian_incoming_package! } + + context 'when incoming exists' do + let!(:debian_incoming) { create(:debian_incoming) } + + it { is_expected.to eq(debian_incoming) } + end + + context 'when incoming not found' do + it { expect { subject }.to raise_error(ActiveRecord::RecordNotFound) } + end + end + describe '.with_package_type' do let!(:package1) { create(:terraform_module_package) } let!(:package2) { create(:npm_package) } diff --git a/spec/models/plan_limits_spec.rb b/spec/models/plan_limits_spec.rb index 650b9331365..8b8ffb9d23c 100644 --- a/spec/models/plan_limits_spec.rb +++ b/spec/models/plan_limits_spec.rb @@ -14,6 +14,7 @@ RSpec.describe PlanLimits do describe 'validations' do it { is_expected.to validate_numericality_of(:notification_limit).only_integer } + it { is_expected.to validate_numericality_of(:enforcement_limit).only_integer } end describe '#exceeded?' do diff --git a/spec/models/preloaders/users_max_access_level_by_project_preloader_spec.rb b/spec/models/preloaders/users_max_access_level_by_project_preloader_spec.rb index f5bc0c8c2f8..653b697aee4 100644 --- a/spec/models/preloaders/users_max_access_level_by_project_preloader_spec.rb +++ b/spec/models/preloaders/users_max_access_level_by_project_preloader_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Preloaders::UsersMaxAccessLevelByProjectPreloader, feature_category: :projects do +RSpec.describe Preloaders::UsersMaxAccessLevelByProjectPreloader, feature_category: :groups_and_projects do let_it_be(:user_1) { create(:user) } let_it_be(:user_2) { create(:user) } let_it_be(:user_with_no_access) { create(:user) } # ensures we correctly cache NO_ACCESS diff --git a/spec/models/project_feature_spec.rb b/spec/models/project_feature_spec.rb index 87bfdd15773..8dd1f7b1831 100644 --- a/spec/models/project_feature_spec.rb +++ b/spec/models/project_feature_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ProjectFeature, feature_category: :projects do +RSpec.describe ProjectFeature, feature_category: :groups_and_projects do using RSpec::Parameterized::TableSyntax let_it_be_with_reload(:project) { create(:project) } diff --git a/spec/models/project_setting_spec.rb b/spec/models/project_setting_spec.rb index 0a2ead0aa6b..4b2760d7699 100644 --- a/spec/models/project_setting_spec.rb +++ b/spec/models/project_setting_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ProjectSetting, type: :model, feature_category: :projects do +RSpec.describe ProjectSetting, type: :model, feature_category: :groups_and_projects do using RSpec::Parameterized::TableSyntax it { is_expected.to belong_to(:project) } diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 32158ef9509..6cf7c16124f 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Project, factory_default: :keep, feature_category: :projects do +RSpec.describe Project, factory_default: :keep, feature_category: :groups_and_projects do include ProjectForksHelper include ExternalAuthorizationServiceHelpers include ReloadHelpers diff --git a/spec/models/project_team_spec.rb b/spec/models/project_team_spec.rb index f4cf3130aa9..8fec2eb3386 100644 --- a/spec/models/project_team_spec.rb +++ b/spec/models/project_team_spec.rb @@ -2,7 +2,7 @@ require "spec_helper" -RSpec.describe ProjectTeam, feature_category: :subgroups do +RSpec.describe ProjectTeam, feature_category: :groups_and_projects do include ProjectForksHelper let(:maintainer) { create(:user) } diff --git a/spec/policies/concerns/archived_abilities_spec.rb b/spec/policies/concerns/archived_abilities_spec.rb index d4d0498b0a3..648f728c8ac 100644 --- a/spec/policies/concerns/archived_abilities_spec.rb +++ b/spec/policies/concerns/archived_abilities_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ArchivedAbilities, feature_category: :projects do +RSpec.describe ArchivedAbilities, feature_category: :groups_and_projects do let(:test_class) do Class.new do include ArchivedAbilities diff --git a/spec/policies/namespaces/user_namespace_policy_spec.rb b/spec/policies/namespaces/user_namespace_policy_spec.rb index 3488f33f15c..41555ca4150 100644 --- a/spec/policies/namespaces/user_namespace_policy_spec.rb +++ b/spec/policies/namespaces/user_namespace_policy_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Namespaces::UserNamespacePolicy, feature_category: :subgroups do +RSpec.describe Namespaces::UserNamespacePolicy, feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:owner) { create(:user) } let_it_be(:admin) { create(:admin) } diff --git a/spec/presenters/member_presenter_spec.rb b/spec/presenters/member_presenter_spec.rb index 65e23d20051..7850399b711 100644 --- a/spec/presenters/member_presenter_spec.rb +++ b/spec/presenters/member_presenter_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe MemberPresenter, feature_category: :subgroups do +RSpec.describe MemberPresenter, feature_category: :groups_and_projects do let_it_be(:member) { build(:group_member) } let(:presenter) { described_class.new(member) } diff --git a/spec/requests/admin/projects_controller_spec.rb b/spec/requests/admin/projects_controller_spec.rb index 2462152b7c2..16e1827b912 100644 --- a/spec/requests/admin/projects_controller_spec.rb +++ b/spec/requests/admin/projects_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Admin::ProjectsController, :enable_admin_mode, feature_category: :projects do +RSpec.describe Admin::ProjectsController, :enable_admin_mode, feature_category: :groups_and_projects do let_it_be(:project) { create(:project, :public, name: 'test', description: 'test') } let_it_be(:admin) { create(:admin) } diff --git a/spec/requests/api/admin/plan_limits_spec.rb b/spec/requests/api/admin/plan_limits_spec.rb index 48146a40749..cad1111b76b 100644 --- a/spec/requests/api/admin/plan_limits_spec.rb +++ b/spec/requests/api/admin/plan_limits_spec.rb @@ -99,15 +99,16 @@ RSpec.describe API::Admin::PlanLimits, 'PlanLimits', feature_category: :shared d 'ci_registered_group_runners': 107, 'ci_registered_project_runners': 108, 'conan_max_file_size': 10, + 'enforcement_limit': 15, 'generic_packages_max_file_size': 20, 'helm_max_file_size': 25, 'maven_max_file_size': 30, + 'notification_limit': 90, 'npm_max_file_size': 40, 'nuget_max_file_size': 50, 'pypi_max_file_size': 60, 'terraform_module_max_file_size': 70, 'storage_size_limit': 80, - 'notification_limit': 90, 'pipeline_hierarchy_size': 250 } @@ -120,15 +121,16 @@ RSpec.describe API::Admin::PlanLimits, 'PlanLimits', feature_category: :shared d expect(json_response['ci_registered_group_runners']).to eq(107) expect(json_response['ci_registered_project_runners']).to eq(108) expect(json_response['conan_max_file_size']).to eq(10) + expect(json_response['enforcement_limit']).to eq(15) expect(json_response['generic_packages_max_file_size']).to eq(20) expect(json_response['helm_max_file_size']).to eq(25) expect(json_response['maven_max_file_size']).to eq(30) + expect(json_response['notification_limit']).to eq(90) expect(json_response['npm_max_file_size']).to eq(40) expect(json_response['nuget_max_file_size']).to eq(50) expect(json_response['pypi_max_file_size']).to eq(60) expect(json_response['terraform_module_max_file_size']).to eq(70) expect(json_response['storage_size_limit']).to eq(80) - expect(json_response['notification_limit']).to eq(90) expect(json_response['pipeline_hierarchy_size']).to eq(250) end @@ -165,15 +167,16 @@ RSpec.describe API::Admin::PlanLimits, 'PlanLimits', feature_category: :shared d 'ci_registered_group_runners': 't', 'ci_registered_project_runners': 's', 'conan_max_file_size': 'a', + 'enforcement_limit': 'e', 'generic_packages_max_file_size': 'b', 'helm_max_file_size': 'h', 'maven_max_file_size': 'c', + 'notification_limit': 'n', 'npm_max_file_size': 'd', 'nuget_max_file_size': 'e', 'pypi_max_file_size': 'f', 'terraform_module_max_file_size': 'g', 'storage_size_limit': 'j', - 'notification_limit': 'm', 'pipeline_hierarchy_size': 'r' } @@ -187,15 +190,16 @@ RSpec.describe API::Admin::PlanLimits, 'PlanLimits', feature_category: :shared d 'ci_registered_group_runners is invalid', 'ci_registered_project_runners is invalid', 'conan_max_file_size is invalid', + 'enforcement_limit is invalid', 'generic_packages_max_file_size is invalid', 'helm_max_file_size is invalid', 'maven_max_file_size is invalid', + 'notification_limit is invalid', 'npm_max_file_size is invalid', 'nuget_max_file_size is invalid', 'pypi_max_file_size is invalid', 'terraform_module_max_file_size is invalid', 'storage_size_limit is invalid', - 'notification_limit is invalid', 'pipeline_hierarchy_size is invalid' ) end diff --git a/spec/requests/api/badges_spec.rb b/spec/requests/api/badges_spec.rb index 1c09c1129a2..0b340b95b20 100644 --- a/spec/requests/api/badges_spec.rb +++ b/spec/requests/api/badges_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe API::Badges, feature_category: :projects do +RSpec.describe API::Badges, feature_category: :groups_and_projects do let(:maintainer) { create(:user, username: 'maintainer_user') } let(:developer) { create(:user) } let(:access_requester) { create(:user) } diff --git a/spec/requests/api/debian_project_packages_spec.rb b/spec/requests/api/debian_project_packages_spec.rb index 030962044c6..b1566860ffc 100644 --- a/spec/requests/api/debian_project_packages_spec.rb +++ b/spec/requests/api/debian_project_packages_spec.rb @@ -1,4 +1,5 @@ # frozen_string_literal: true + require 'spec_helper' RSpec.describe API::DebianProjectPackages, feature_category: :package_registry do diff --git a/spec/requests/api/graphql/current_user/groups_query_spec.rb b/spec/requests/api/graphql/current_user/groups_query_spec.rb index 151d07ff0a7..435e5e62f69 100644 --- a/spec/requests/api/graphql/current_user/groups_query_spec.rb +++ b/spec/requests/api/graphql/current_user/groups_query_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Query current user groups', feature_category: :subgroups do +RSpec.describe 'Query current user groups', feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:user) { create(:user) } diff --git a/spec/requests/api/graphql/group/group_members_spec.rb b/spec/requests/api/graphql/group/group_members_spec.rb index 26d1fb48408..e56e901466a 100644 --- a/spec/requests/api/graphql/group/group_members_spec.rb +++ b/spec/requests/api/graphql/group/group_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'getting group members information', feature_category: :subgroups do +RSpec.describe 'getting group members information', feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:parent_group) { create(:group, :public) } diff --git a/spec/requests/api/graphql/group_query_spec.rb b/spec/requests/api/graphql/group_query_spec.rb index ce5816999a6..6debe2d3d67 100644 --- a/spec/requests/api/graphql/group_query_spec.rb +++ b/spec/requests/api/graphql/group_query_spec.rb @@ -4,7 +4,7 @@ require 'spec_helper' # Based on spec/requests/api/groups_spec.rb # Should follow closely in order to ensure all situations are covered -RSpec.describe 'getting group information', :with_license, feature_category: :subgroups do +RSpec.describe 'getting group information', :with_license, feature_category: :groups_and_projects do include GraphqlHelpers include UploadHelpers diff --git a/spec/requests/api/graphql/groups_query_spec.rb b/spec/requests/api/graphql/groups_query_spec.rb index 84c8d3c3388..460cb40b68a 100644 --- a/spec/requests/api/graphql/groups_query_spec.rb +++ b/spec/requests/api/graphql/groups_query_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'searching groups', :with_license, feature_category: :subgroups do +RSpec.describe 'searching groups', :with_license, feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:user) { create(:user) } diff --git a/spec/requests/api/graphql/metadata_query_spec.rb b/spec/requests/api/graphql/metadata_query_spec.rb index 7d1850b1b93..b973e7d4d51 100644 --- a/spec/requests/api/graphql/metadata_query_spec.rb +++ b/spec/requests/api/graphql/metadata_query_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'getting project information', feature_category: :projects do +RSpec.describe 'getting project information', feature_category: :groups_and_projects do include GraphqlHelpers let(:query) { graphql_query_for('metadata', {}, all_graphql_fields_for('Metadata')) } diff --git a/spec/requests/api/graphql/mutations/groups/update_spec.rb b/spec/requests/api/graphql/mutations/groups/update_spec.rb index a9acc593229..b75b2464c22 100644 --- a/spec/requests/api/graphql/mutations/groups/update_spec.rb +++ b/spec/requests/api/graphql/mutations/groups/update_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'GroupUpdate', feature_category: :subgroups do +RSpec.describe 'GroupUpdate', feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:user) { create(:user) } diff --git a/spec/requests/api/graphql/mutations/members/groups/bulk_update_spec.rb b/spec/requests/api/graphql/mutations/members/groups/bulk_update_spec.rb index f15b52f53a3..1395f7b778f 100644 --- a/spec/requests/api/graphql/mutations/members/groups/bulk_update_spec.rb +++ b/spec/requests/api/graphql/mutations/members/groups/bulk_update_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'GroupMemberBulkUpdate', feature_category: :subgroups do +RSpec.describe 'GroupMemberBulkUpdate', feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:parent_group) { create(:group) } diff --git a/spec/requests/api/graphql/mutations/members/projects/bulk_update_spec.rb b/spec/requests/api/graphql/mutations/members/projects/bulk_update_spec.rb index cbef9715cbe..910e512f6d6 100644 --- a/spec/requests/api/graphql/mutations/members/projects/bulk_update_spec.rb +++ b/spec/requests/api/graphql/mutations/members/projects/bulk_update_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'ProjectMemberBulkUpdate', feature_category: :projects do +RSpec.describe 'ProjectMemberBulkUpdate', feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:parent_group) { create(:group) } diff --git a/spec/requests/api/graphql/namespace/projects_spec.rb b/spec/requests/api/graphql/namespace/projects_spec.rb index 83edacaf831..a4bc94798be 100644 --- a/spec/requests/api/graphql/namespace/projects_spec.rb +++ b/spec/requests/api/graphql/namespace/projects_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'getting projects', feature_category: :projects do +RSpec.describe 'getting projects', feature_category: :groups_and_projects do include GraphqlHelpers let(:group) { create(:group) } diff --git a/spec/requests/api/graphql/namespace_query_spec.rb b/spec/requests/api/graphql/namespace_query_spec.rb index d12a3875ebf..c0c7c5fee2b 100644 --- a/spec/requests/api/graphql/namespace_query_spec.rb +++ b/spec/requests/api/graphql/namespace_query_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Query', feature_category: :subgroups do +RSpec.describe 'Query', feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:user) { create(:user) } diff --git a/spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb b/spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb index c4843c3cf97..0ca4ec0e363 100644 --- a/spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb +++ b/spec/requests/api/graphql/project/alert_management/alert/assignees_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'getting Alert Management Alert Assignees', feature_category: :projects do +RSpec.describe 'getting Alert Management Alert Assignees', feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:project) { create(:project) } diff --git a/spec/requests/api/graphql/project/project_members_spec.rb b/spec/requests/api/graphql/project/project_members_spec.rb index 1f1d8027592..faeb3ddd693 100644 --- a/spec/requests/api/graphql/project/project_members_spec.rb +++ b/spec/requests/api/graphql/project/project_members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'getting project members information', feature_category: :projects do +RSpec.describe 'getting project members information', feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:parent_group) { create(:group, :public) } diff --git a/spec/requests/api/graphql/project_query_spec.rb b/spec/requests/api/graphql/project_query_spec.rb index 9f51258c163..54f141d9401 100644 --- a/spec/requests/api/graphql/project_query_spec.rb +++ b/spec/requests/api/graphql/project_query_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'getting project information', feature_category: :projects do +RSpec.describe 'getting project information', feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:group) { create(:group) } diff --git a/spec/requests/api/graphql/user/group_member_query_spec.rb b/spec/requests/api/graphql/user/group_member_query_spec.rb index d09cb319877..d317651bd8f 100644 --- a/spec/requests/api/graphql/user/group_member_query_spec.rb +++ b/spec/requests/api/graphql/user/group_member_query_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'GroupMember', feature_category: :subgroups do +RSpec.describe 'GroupMember', feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:member) { create(:group_member, :developer) } diff --git a/spec/requests/api/graphql/user/project_member_query_spec.rb b/spec/requests/api/graphql/user/project_member_query_spec.rb index 1baa7815793..b68e9d653ad 100644 --- a/spec/requests/api/graphql/user/project_member_query_spec.rb +++ b/spec/requests/api/graphql/user/project_member_query_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'ProjectMember', feature_category: :subgroups do +RSpec.describe 'ProjectMember', feature_category: :groups_and_projects do include GraphqlHelpers let_it_be(:member) { create(:project_member, :developer) } diff --git a/spec/requests/api/graphql/user/starred_projects_query_spec.rb b/spec/requests/api/graphql/user/starred_projects_query_spec.rb index 7d4284300d8..07ace6e5dca 100644 --- a/spec/requests/api/graphql/user/starred_projects_query_spec.rb +++ b/spec/requests/api/graphql/user/starred_projects_query_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'Getting starredProjects of the user', feature_category: :projects do +RSpec.describe 'Getting starredProjects of the user', feature_category: :groups_and_projects do include GraphqlHelpers let(:query) do diff --git a/spec/requests/api/group_avatar_spec.rb b/spec/requests/api/group_avatar_spec.rb index 9a0e79ee9f8..c8d06aa19dc 100644 --- a/spec/requests/api/group_avatar_spec.rb +++ b/spec/requests/api/group_avatar_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe API::GroupAvatar, feature_category: :subgroups do +RSpec.describe API::GroupAvatar, feature_category: :groups_and_projects do def avatar_path(group) "/groups/#{ERB::Util.url_encode(group.full_path)}/avatar" end diff --git a/spec/requests/api/groups_spec.rb b/spec/requests/api/groups_spec.rb index 84d48b4edb4..2adf71f2a18 100644 --- a/spec/requests/api/groups_spec.rb +++ b/spec/requests/api/groups_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe API::Groups, feature_category: :subgroups do +RSpec.describe API::Groups, feature_category: :groups_and_projects do include GroupAPIHelpers include UploadHelpers include WorkhorseHelpers diff --git a/spec/requests/api/members_spec.rb b/spec/requests/api/members_spec.rb index 353fddcb08d..f3e5f3ab891 100644 --- a/spec/requests/api/members_spec.rb +++ b/spec/requests/api/members_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe API::Members, feature_category: :subgroups do +RSpec.describe API::Members, feature_category: :groups_and_projects do let_it_be(:maintainer) { create(:user, username: 'maintainer_user') } let_it_be(:maintainer2) { create(:user, username: 'user-with-maintainer-role') } let_it_be(:developer) { create(:user) } diff --git a/spec/requests/api/namespaces_spec.rb b/spec/requests/api/namespaces_spec.rb index f268a092034..0ad9b3c82ab 100644 --- a/spec/requests/api/namespaces_spec.rb +++ b/spec/requests/api/namespaces_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe API::Namespaces, :aggregate_failures, feature_category: :subgroups do +RSpec.describe API::Namespaces, :aggregate_failures, feature_category: :groups_and_projects do let_it_be(:admin) { create(:admin) } let_it_be(:user) { create(:user) } let_it_be(:group1) { create(:group, name: 'group.one') } diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index 5dde98ceeef..1b08e7f0dc6 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -46,7 +46,7 @@ RSpec.shared_examples 'languages and percentages JSON response' do end end -RSpec.describe API::Projects, :aggregate_failures, feature_category: :projects do +RSpec.describe API::Projects, :aggregate_failures, feature_category: :groups_and_projects do include ProjectForksHelper include WorkhorseHelpers include StubRequests diff --git a/spec/requests/api/releases_spec.rb b/spec/requests/api/releases_spec.rb index 0b5cc3611bd..a018b91019b 100644 --- a/spec/requests/api/releases_spec.rb +++ b/spec/requests/api/releases_spec.rb @@ -791,16 +791,16 @@ RSpec.describe API::Releases, :aggregate_failures, feature_category: :release_or name: 'New release', tag_name: 'v0.1', description: 'Super nice release', - assets: { - links: [ - { - name: 'An example runbook link', - url: 'https://example.com/runbook', - link_type: 'runbook', - filepath: '/permanent/path/to/runbook' - } - ] - } + assets: { links: [link_asset] } + } + end + + let(:link_asset) do + { + name: 'An example runbook link', + url: 'https://example.com/runbook', + link_type: 'runbook', + filepath: '/permanent/path/to/runbook' } end @@ -906,8 +906,13 @@ RSpec.describe API::Releases, :aggregate_failures, feature_category: :release_or end context 'when using `direct_asset_path` for the asset link' do - before do - params[:direct_asset_path] = params.delete(:filepath) + let(:link_asset) do + { + name: 'An example runbook link', + url: 'https://example.com/runbook', + link_type: 'runbook', + direct_asset_path: '/permanent/path/to/runbook' + } end it 'creates a new release successfully' do @@ -915,8 +920,9 @@ RSpec.describe API::Releases, :aggregate_failures, feature_category: :release_or post api("/projects/#{project.id}/releases", maintainer), params: params end.to change { Release.count }.by(1) - release = project.releases.last + expect(response).to have_gitlab_http_status(:created) + release = project.releases.last expect(release.links.last.filepath).to eq('/permanent/path/to/runbook') end end diff --git a/spec/requests/api/topics_spec.rb b/spec/requests/api/topics_spec.rb index 560f22c94be..0d64a96acb8 100644 --- a/spec/requests/api/topics_spec.rb +++ b/spec/requests/api/topics_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe API::Topics, :aggregate_failures, feature_category: :projects do +RSpec.describe API::Topics, :aggregate_failures, feature_category: :groups_and_projects do include WorkhorseHelpers let_it_be(:file) { fixture_file_upload('spec/fixtures/dk.png') } diff --git a/spec/requests/concerns/planning_hierarchy_spec.rb b/spec/requests/concerns/planning_hierarchy_spec.rb index 89232916936..97b987fa770 100644 --- a/spec/requests/concerns/planning_hierarchy_spec.rb +++ b/spec/requests/concerns/planning_hierarchy_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe PlanningHierarchy, type: :request, feature_category: :projects do +RSpec.describe PlanningHierarchy, type: :request, feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:group) { create(:group) } let_it_be(:project) { create(:project, group: group) } diff --git a/spec/requests/dashboard/projects_controller_spec.rb b/spec/requests/dashboard/projects_controller_spec.rb index 752799196c9..478804bba29 100644 --- a/spec/requests/dashboard/projects_controller_spec.rb +++ b/spec/requests/dashboard/projects_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Dashboard::ProjectsController, feature_category: :projects do +RSpec.describe Dashboard::ProjectsController, feature_category: :groups_and_projects do context 'token authentication' do it_behaves_like 'authenticates sessionless user for the request spec', 'index atom', public_resource: false do let(:url) { dashboard_projects_url(:atom) } diff --git a/spec/requests/groups/autocomplete_sources_spec.rb b/spec/requests/groups/autocomplete_sources_spec.rb index e44fb9f6c37..02fb04a4af8 100644 --- a/spec/requests/groups/autocomplete_sources_spec.rb +++ b/spec/requests/groups/autocomplete_sources_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'groups autocomplete', feature_category: :subgroups do +RSpec.describe 'groups autocomplete', feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be_with_reload(:group) { create(:group, :private) } diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb index 7fc14910819..cd4b32e4982 100644 --- a/spec/requests/groups_controller_spec.rb +++ b/spec/requests/groups_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GroupsController, feature_category: :subgroups do +RSpec.describe GroupsController, feature_category: :groups_and_projects do context 'token authentication' do context 'when public group' do let_it_be(:public_group) { create(:group, :public) } diff --git a/spec/requests/projects/redirect_controller_spec.rb b/spec/requests/projects/redirect_controller_spec.rb index e828c546198..962d8062161 100644 --- a/spec/requests/projects/redirect_controller_spec.rb +++ b/spec/requests/projects/redirect_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe "Projects::RedirectController requests", feature_category: :projects do +RSpec.describe "Projects::RedirectController requests", feature_category: :groups_and_projects do using RSpec::Parameterized::TableSyntax let_it_be(:private_project) { create(:project, :private) } diff --git a/spec/requests/projects_controller_spec.rb b/spec/requests/projects_controller_spec.rb index 613f528e8c2..a4cfad32e4a 100644 --- a/spec/requests/projects_controller_spec.rb +++ b/spec/requests/projects_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ProjectsController, :with_license, feature_category: :projects do +RSpec.describe ProjectsController, :with_license, feature_category: :groups_and_projects do context 'token authentication' do context 'when public project' do let_it_be(:public_project) { create(:project, :public) } diff --git a/spec/services/admin/plan_limits/update_service_spec.rb b/spec/services/admin/plan_limits/update_service_spec.rb index 45b3ff890f1..4a384b98299 100644 --- a/spec/services/admin/plan_limits/update_service_spec.rb +++ b/spec/services/admin/plan_limits/update_service_spec.rb @@ -16,15 +16,16 @@ RSpec.describe Admin::PlanLimits::UpdateService, feature_category: :shared do ci_registered_group_runners: 107, ci_registered_project_runners: 108, conan_max_file_size: 10, + enforcement_limit: 15, generic_packages_max_file_size: 20, helm_max_file_size: 25, - maven_max_file_size: 30, - npm_max_file_size: 40, - nuget_max_file_size: 50, - pypi_max_file_size: 60, - terraform_module_max_file_size: 70, - storage_size_limit: 80, - notification_limit: 90, + notification_limit: 30, + maven_max_file_size: 40, + npm_max_file_size: 60, + nuget_max_file_size: 60, + pypi_max_file_size: 70, + terraform_module_max_file_size: 80, + storage_size_limit: 90, pipeline_hierarchy_size: 250 } end diff --git a/spec/services/authorized_project_update/find_records_due_for_refresh_service_spec.rb b/spec/services/authorized_project_update/find_records_due_for_refresh_service_spec.rb index e8f86b4d7c5..ca766590ada 100644 --- a/spec/services/authorized_project_update/find_records_due_for_refresh_service_spec.rb +++ b/spec/services/authorized_project_update/find_records_due_for_refresh_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe AuthorizedProjectUpdate::FindRecordsDueForRefreshService, feature_category: :projects do +RSpec.describe AuthorizedProjectUpdate::FindRecordsDueForRefreshService, feature_category: :groups_and_projects do # We're using let! here so that any expectations for the service class are not # triggered twice. let!(:project) { create(:project) } diff --git a/spec/services/authorized_project_update/periodic_recalculate_service_spec.rb b/spec/services/authorized_project_update/periodic_recalculate_service_spec.rb index 51cab6d188b..88099e76a8c 100644 --- a/spec/services/authorized_project_update/periodic_recalculate_service_spec.rb +++ b/spec/services/authorized_project_update/periodic_recalculate_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe AuthorizedProjectUpdate::PeriodicRecalculateService, feature_category: :projects do +RSpec.describe AuthorizedProjectUpdate::PeriodicRecalculateService, feature_category: :groups_and_projects do subject(:service) { described_class.new } describe '#execute' do diff --git a/spec/services/authorized_project_update/project_access_changed_service_spec.rb b/spec/services/authorized_project_update/project_access_changed_service_spec.rb index 7c09d7755ca..12c2f7cb5d5 100644 --- a/spec/services/authorized_project_update/project_access_changed_service_spec.rb +++ b/spec/services/authorized_project_update/project_access_changed_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe AuthorizedProjectUpdate::ProjectAccessChangedService, feature_category: :projects do +RSpec.describe AuthorizedProjectUpdate::ProjectAccessChangedService, feature_category: :groups_and_projects do describe '#execute' do it 'executes projects_authorizations refresh' do expect(AuthorizedProjectUpdate::ProjectRecalculateWorker).to receive(:bulk_perform_async) diff --git a/spec/services/authorized_project_update/project_recalculate_per_user_service_spec.rb b/spec/services/authorized_project_update/project_recalculate_per_user_service_spec.rb index 7b2dd52810f..9cc31810b84 100644 --- a/spec/services/authorized_project_update/project_recalculate_per_user_service_spec.rb +++ b/spec/services/authorized_project_update/project_recalculate_per_user_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe AuthorizedProjectUpdate::ProjectRecalculatePerUserService, '#execute', feature_category: :projects do +RSpec.describe AuthorizedProjectUpdate::ProjectRecalculatePerUserService, '#execute', feature_category: :groups_and_projects do let_it_be(:project) { create(:project) } let_it_be(:user) { create(:user) } let_it_be(:another_user) { create(:user) } diff --git a/spec/services/authorized_project_update/project_recalculate_service_spec.rb b/spec/services/authorized_project_update/project_recalculate_service_spec.rb index 8360f3c67ab..4ccbaa3185d 100644 --- a/spec/services/authorized_project_update/project_recalculate_service_spec.rb +++ b/spec/services/authorized_project_update/project_recalculate_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe AuthorizedProjectUpdate::ProjectRecalculateService, '#execute', feature_category: :projects do +RSpec.describe AuthorizedProjectUpdate::ProjectRecalculateService, '#execute', feature_category: :groups_and_projects do let_it_be(:project) { create(:project) } subject(:execute) { described_class.new(project).execute } diff --git a/spec/services/groups/autocomplete_service_spec.rb b/spec/services/groups/autocomplete_service_spec.rb index 9f55322e72d..4fb14b525ac 100644 --- a/spec/services/groups/autocomplete_service_spec.rb +++ b/spec/services/groups/autocomplete_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::AutocompleteService, feature_category: :subgroups do +RSpec.describe Groups::AutocompleteService, feature_category: :groups_and_projects do let_it_be(:group, refind: true) { create(:group, :nested, :private, avatar: fixture_file_upload('spec/fixtures/dk.png')) } let_it_be(:sub_group) { create(:group, :private, parent: group) } diff --git a/spec/services/groups/create_service_spec.rb b/spec/services/groups/create_service_spec.rb index 84794b5f6f8..2317c6fba61 100644 --- a/spec/services/groups/create_service_spec.rb +++ b/spec/services/groups/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::CreateService, '#execute', feature_category: :subgroups do +RSpec.describe Groups::CreateService, '#execute', feature_category: :groups_and_projects do let!(:user) { create(:user) } let!(:group_params) { { path: "group_path", visibility_level: Gitlab::VisibilityLevel::PUBLIC } } diff --git a/spec/services/groups/destroy_service_spec.rb b/spec/services/groups/destroy_service_spec.rb index 7c3710aeeb2..929f7d5b4e3 100644 --- a/spec/services/groups/destroy_service_spec.rb +++ b/spec/services/groups/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::DestroyService, feature_category: :subgroups do +RSpec.describe Groups::DestroyService, feature_category: :groups_and_projects do let!(:user) { create(:user) } let!(:group) { create(:group) } let!(:nested_group) { create(:group, parent: group) } diff --git a/spec/services/groups/group_links/create_service_spec.rb b/spec/services/groups/group_links/create_service_spec.rb index ced87421858..8acbcdc77af 100644 --- a/spec/services/groups/group_links/create_service_spec.rb +++ b/spec/services/groups/group_links/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::GroupLinks::CreateService, '#execute', feature_category: :subgroups do +RSpec.describe Groups::GroupLinks::CreateService, '#execute', feature_category: :groups_and_projects do let_it_be(:shared_with_group_parent) { create(:group, :private) } let_it_be(:shared_with_group) { create(:group, :private, parent: shared_with_group_parent) } let_it_be(:shared_with_group_child) { create(:group, :private, parent: shared_with_group) } diff --git a/spec/services/groups/group_links/destroy_service_spec.rb b/spec/services/groups/group_links/destroy_service_spec.rb index 5821ec44192..65f24323f8b 100644 --- a/spec/services/groups/group_links/destroy_service_spec.rb +++ b/spec/services/groups/group_links/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::GroupLinks::DestroyService, '#execute', feature_category: :subgroups do +RSpec.describe Groups::GroupLinks::DestroyService, '#execute', feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:group) { create(:group, :private) } let_it_be(:shared_group) { create(:group, :private) } diff --git a/spec/services/groups/group_links/update_service_spec.rb b/spec/services/groups/group_links/update_service_spec.rb index f17d2f50a02..79fc25e111a 100644 --- a/spec/services/groups/group_links/update_service_spec.rb +++ b/spec/services/groups/group_links/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::GroupLinks::UpdateService, '#execute', feature_category: :subgroups do +RSpec.describe Groups::GroupLinks::UpdateService, '#execute', feature_category: :groups_and_projects do let(:user) { create(:user) } let_it_be(:group) { create(:group, :private) } diff --git a/spec/services/groups/merge_requests_count_service_spec.rb b/spec/services/groups/merge_requests_count_service_spec.rb index 32c4c618eda..cdcb344bd40 100644 --- a/spec/services/groups/merge_requests_count_service_spec.rb +++ b/spec/services/groups/merge_requests_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::MergeRequestsCountService, :use_clean_rails_memory_store_caching, feature_category: :subgroups do +RSpec.describe Groups::MergeRequestsCountService, :use_clean_rails_memory_store_caching, feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } let_it_be(:group) { create(:group, :public) } let_it_be(:project) { create(:project, :repository, namespace: group) } diff --git a/spec/services/groups/nested_create_service_spec.rb b/spec/services/groups/nested_create_service_spec.rb index 476bc2aa23c..1efb5bf0c9c 100644 --- a/spec/services/groups/nested_create_service_spec.rb +++ b/spec/services/groups/nested_create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::NestedCreateService, feature_category: :subgroups do +RSpec.describe Groups::NestedCreateService, feature_category: :groups_and_projects do let(:user) { create(:user) } subject(:service) { described_class.new(user, params) } diff --git a/spec/services/groups/open_issues_count_service_spec.rb b/spec/services/groups/open_issues_count_service_spec.rb index 725b913bf15..ef3c86869a0 100644 --- a/spec/services/groups/open_issues_count_service_spec.rb +++ b/spec/services/groups/open_issues_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::OpenIssuesCountService, :use_clean_rails_memory_store_caching, feature_category: :subgroups do +RSpec.describe Groups::OpenIssuesCountService, :use_clean_rails_memory_store_caching, feature_category: :groups_and_projects do let_it_be(:group) { create(:group, :public) } let_it_be(:project) { create(:project, :public, namespace: group) } let_it_be(:user) { create(:user) } diff --git a/spec/services/groups/participants_service_spec.rb b/spec/services/groups/participants_service_spec.rb index 37966a523c2..eee9cfce1b1 100644 --- a/spec/services/groups/participants_service_spec.rb +++ b/spec/services/groups/participants_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::ParticipantsService, feature_category: :subgroups do +RSpec.describe Groups::ParticipantsService, feature_category: :groups_and_projects do describe '#group_members' do let(:user) { create(:user) } let(:parent_group) { create(:group) } diff --git a/spec/services/groups/transfer_service_spec.rb b/spec/services/groups/transfer_service_spec.rb index 8ee9a75bdf0..a3020241377 100644 --- a/spec/services/groups/transfer_service_spec.rb +++ b/spec/services/groups/transfer_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::TransferService, :sidekiq_inline, feature_category: :subgroups do +RSpec.describe Groups::TransferService, :sidekiq_inline, feature_category: :groups_and_projects do shared_examples 'project namespace path is in sync with project path' do it 'keeps project and project namespace attributes in sync' do projects_with_project_namespace.each do |project| diff --git a/spec/services/groups/update_service_spec.rb b/spec/services/groups/update_service_spec.rb index 6baa8e5d6b6..2842097199f 100644 --- a/spec/services/groups/update_service_spec.rb +++ b/spec/services/groups/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::UpdateService, feature_category: :subgroups do +RSpec.describe Groups::UpdateService, feature_category: :groups_and_projects do let!(:user) { create(:user) } let!(:private_group) { create(:group, :private) } let!(:internal_group) { create(:group, :internal) } diff --git a/spec/services/groups/update_shared_runners_service_spec.rb b/spec/services/groups/update_shared_runners_service_spec.rb index 48c81f109aa..0acf1ec3d35 100644 --- a/spec/services/groups/update_shared_runners_service_spec.rb +++ b/spec/services/groups/update_shared_runners_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::UpdateSharedRunnersService, feature_category: :subgroups do +RSpec.describe Groups::UpdateSharedRunnersService, feature_category: :groups_and_projects do let(:user) { create(:user) } let(:group) { create(:group) } let(:params) { {} } diff --git a/spec/services/groups/update_statistics_service_spec.rb b/spec/services/groups/update_statistics_service_spec.rb index 13a88839de0..6bab36eca89 100644 --- a/spec/services/groups/update_statistics_service_spec.rb +++ b/spec/services/groups/update_statistics_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Groups::UpdateStatisticsService, feature_category: :subgroups do +RSpec.describe Groups::UpdateStatisticsService, feature_category: :groups_and_projects do let_it_be(:group, reload: true) { create(:group) } let(:statistics) { %w(wiki_size) } diff --git a/spec/services/jira/requests/projects/list_service_spec.rb b/spec/services/jira/requests/projects/list_service_spec.rb index 37e9f66d273..f9e3a3e8510 100644 --- a/spec/services/jira/requests/projects/list_service_spec.rb +++ b/spec/services/jira/requests/projects/list_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Jira::Requests::Projects::ListService, feature_category: :projects do +RSpec.describe Jira::Requests::Projects::ListService, feature_category: :groups_and_projects do include AfterNextHelpers let(:jira_integration) { create(:jira_integration) } diff --git a/spec/services/markup/rendering_service_spec.rb b/spec/services/markup/rendering_service_spec.rb index 952ee33da98..1a30fcb648d 100644 --- a/spec/services/markup/rendering_service_spec.rb +++ b/spec/services/markup/rendering_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Markup::RenderingService, feature_category: :projects do +RSpec.describe Markup::RenderingService, feature_category: :groups_and_projects do describe '#execute' do let_it_be(:project) { create(:project, :repository) } let_it_be(:user) do diff --git a/spec/services/members/approve_access_request_service_spec.rb b/spec/services/members/approve_access_request_service_spec.rb index 6c0d47e98ba..460b1caad5b 100644 --- a/spec/services/members/approve_access_request_service_spec.rb +++ b/spec/services/members/approve_access_request_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::ApproveAccessRequestService, feature_category: :subgroups do +RSpec.describe Members::ApproveAccessRequestService, feature_category: :groups_and_projects do let(:project) { create(:project, :public) } let(:group) { create(:group, :public) } let(:current_user) { create(:user) } diff --git a/spec/services/members/base_service_spec.rb b/spec/services/members/base_service_spec.rb index 514c25fbc03..09c903bb82b 100644 --- a/spec/services/members/base_service_spec.rb +++ b/spec/services/members/base_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::BaseService, feature_category: :projects do +RSpec.describe Members::BaseService, feature_category: :groups_and_projects do let_it_be(:access_requester) { create(:group_member) } describe '#resolve_access_request_todos' do diff --git a/spec/services/members/create_service_spec.rb b/spec/services/members/create_service_spec.rb index 13f233162cd..c9dee0aadda 100644 --- a/spec/services/members/create_service_spec.rb +++ b/spec/services/members/create_service_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Members::CreateService, :aggregate_failures, :clean_gitlab_redis_cache, :clean_gitlab_redis_shared_state, :sidekiq_inline, - feature_category: :subgroups do + feature_category: :groups_and_projects do let_it_be(:source, reload: true) { create(:project) } let_it_be(:user) { create(:user) } let_it_be(:member) { create(:user) } diff --git a/spec/services/members/creator_service_spec.rb b/spec/services/members/creator_service_spec.rb index 8191eefbe95..e58d501d02d 100644 --- a/spec/services/members/creator_service_spec.rb +++ b/spec/services/members/creator_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::CreatorService, feature_category: :subgroups do +RSpec.describe Members::CreatorService, feature_category: :groups_and_projects do let_it_be(:source, reload: true) { create(:group, :public) } let_it_be(:member_type) { GroupMember } let_it_be(:user) { create(:user) } diff --git a/spec/services/members/destroy_service_spec.rb b/spec/services/members/destroy_service_spec.rb index 498b9576875..4218a3297b3 100644 --- a/spec/services/members/destroy_service_spec.rb +++ b/spec/services/members/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::DestroyService, feature_category: :subgroups do +RSpec.describe Members::DestroyService, feature_category: :groups_and_projects do let(:current_user) { create(:user) } let(:member_user) { create(:user) } let(:group) { create(:group, :public) } diff --git a/spec/services/members/groups/creator_service_spec.rb b/spec/services/members/groups/creator_service_spec.rb index 4c13106145e..4716bc7485b 100644 --- a/spec/services/members/groups/creator_service_spec.rb +++ b/spec/services/members/groups/creator_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::Groups::CreatorService, feature_category: :subgroups do +RSpec.describe Members::Groups::CreatorService, feature_category: :groups_and_projects do let_it_be(:source, reload: true) { create(:group, :public) } let_it_be(:source2, reload: true) { create(:group, :public) } let_it_be(:user) { create(:user) } diff --git a/spec/services/members/import_project_team_service_spec.rb b/spec/services/members/import_project_team_service_spec.rb index af9b30aa0b3..7dcdb70f2cd 100644 --- a/spec/services/members/import_project_team_service_spec.rb +++ b/spec/services/members/import_project_team_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::ImportProjectTeamService, feature_category: :subgroups do +RSpec.describe Members::ImportProjectTeamService, feature_category: :groups_and_projects do describe '#execute' do let_it_be(:source_project) { create(:project) } let_it_be(:target_project) { create(:project) } diff --git a/spec/services/members/invitation_reminder_email_service_spec.rb b/spec/services/members/invitation_reminder_email_service_spec.rb index da23965eabe..2b72a4919b4 100644 --- a/spec/services/members/invitation_reminder_email_service_spec.rb +++ b/spec/services/members/invitation_reminder_email_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::InvitationReminderEmailService, feature_category: :subgroups do +RSpec.describe Members::InvitationReminderEmailService, feature_category: :groups_and_projects do describe 'sending invitation reminders' do subject { described_class.new(invitation).execute } diff --git a/spec/services/members/invite_member_builder_spec.rb b/spec/services/members/invite_member_builder_spec.rb index e7bbec4e0ef..62c33b42fa2 100644 --- a/spec/services/members/invite_member_builder_spec.rb +++ b/spec/services/members/invite_member_builder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::InviteMemberBuilder, feature_category: :subgroups do +RSpec.describe Members::InviteMemberBuilder, feature_category: :groups_and_projects do let_it_be(:source) { create(:group) } let_it_be(:existing_member) { create(:group_member) } diff --git a/spec/services/members/invite_service_spec.rb b/spec/services/members/invite_service_spec.rb index 22294b3fda5..1c0466980f4 100644 --- a/spec/services/members/invite_service_spec.rb +++ b/spec/services/members/invite_service_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' RSpec.describe Members::InviteService, :aggregate_failures, :clean_gitlab_redis_shared_state, :sidekiq_inline, - feature_category: :subgroups do + feature_category: :groups_and_projects do let_it_be(:project, reload: true) { create(:project) } let_it_be(:user) { project.first_owner } let_it_be(:project_user) { create(:user) } diff --git a/spec/services/members/projects/creator_service_spec.rb b/spec/services/members/projects/creator_service_spec.rb index 7ec7361a285..7f2b1869847 100644 --- a/spec/services/members/projects/creator_service_spec.rb +++ b/spec/services/members/projects/creator_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::Projects::CreatorService, feature_category: :projects do +RSpec.describe Members::Projects::CreatorService, feature_category: :groups_and_projects do let_it_be(:source, reload: true) { create(:project, :public) } let_it_be(:source2, reload: true) { create(:project, :public) } let_it_be(:user) { create(:user) } diff --git a/spec/services/members/request_access_service_spec.rb b/spec/services/members/request_access_service_spec.rb index ef8ee6492ab..68eef253452 100644 --- a/spec/services/members/request_access_service_spec.rb +++ b/spec/services/members/request_access_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::RequestAccessService, feature_category: :subgroups do +RSpec.describe Members::RequestAccessService, feature_category: :groups_and_projects do let(:user) { create(:user) } shared_examples 'a service raising Gitlab::Access::AccessDeniedError' do diff --git a/spec/services/members/standard_member_builder_spec.rb b/spec/services/members/standard_member_builder_spec.rb index 69b764f3f16..96dda83fe54 100644 --- a/spec/services/members/standard_member_builder_spec.rb +++ b/spec/services/members/standard_member_builder_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::StandardMemberBuilder, feature_category: :subgroups do +RSpec.describe Members::StandardMemberBuilder, feature_category: :groups_and_projects do let_it_be(:source) { create(:group) } let_it_be(:existing_member) { create(:group_member) } diff --git a/spec/services/members/unassign_issuables_service_spec.rb b/spec/services/members/unassign_issuables_service_spec.rb index 37dfbd16c56..9623cef868b 100644 --- a/spec/services/members/unassign_issuables_service_spec.rb +++ b/spec/services/members/unassign_issuables_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::UnassignIssuablesService, feature_category: :subgroups do +RSpec.describe Members::UnassignIssuablesService, feature_category: :groups_and_projects do let_it_be(:group) { create(:group, :private) } let_it_be(:project) { create(:project, group: group) } let_it_be(:user, reload: true) { create(:user) } diff --git a/spec/services/members/update_service_spec.rb b/spec/services/members/update_service_spec.rb index b94b44c8485..1c4b1abcfdb 100644 --- a/spec/services/members/update_service_spec.rb +++ b/spec/services/members/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Members::UpdateService, feature_category: :subgroups do +RSpec.describe Members::UpdateService, feature_category: :groups_and_projects do let_it_be(:project) { create(:project, :public) } let_it_be(:group) { create(:group, :public) } let_it_be(:current_user) { create(:user) } diff --git a/spec/services/namespace_settings/update_service_spec.rb b/spec/services/namespace_settings/update_service_spec.rb index 5f1ff6746bc..daffae1dda7 100644 --- a/spec/services/namespace_settings/update_service_spec.rb +++ b/spec/services/namespace_settings/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe NamespaceSettings::UpdateService, feature_category: :subgroups do +RSpec.describe NamespaceSettings::UpdateService, feature_category: :groups_and_projects do let(:user) { create(:user) } let(:group) { create(:group) } let(:settings) { {} } diff --git a/spec/services/namespaces/statistics_refresher_service_spec.rb b/spec/services/namespaces/statistics_refresher_service_spec.rb index 750f98615cc..4c33e5e80d6 100644 --- a/spec/services/namespaces/statistics_refresher_service_spec.rb +++ b/spec/services/namespaces/statistics_refresher_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Namespaces::StatisticsRefresherService, '#execute', feature_category: :subgroups do +RSpec.describe Namespaces::StatisticsRefresherService, '#execute', feature_category: :groups_and_projects do let(:group) { create(:group) } let(:subgroup) { create(:group, parent: group) } let(:projects) { create_list(:project, 5, namespace: group) } diff --git a/spec/services/packages/debian/create_package_file_service_spec.rb b/spec/services/packages/debian/create_package_file_service_spec.rb index b527bf8c1de..7dfbfa0b429 100644 --- a/spec/services/packages/debian/create_package_file_service_spec.rb +++ b/spec/services/packages/debian/create_package_file_service_spec.rb @@ -35,7 +35,6 @@ RSpec.describe Packages::Debian::CreatePackageFileService, feature_category: :pa expect(::Packages::Debian::ProcessPackageFileWorker).not_to receive(:perform_async) end - expect(::Packages::Debian::ProcessChangesWorker).not_to receive(:perform_async) expect(package_file).to be_valid expect(package_file.file.read).to start_with('!<arch>') expect(package_file.size).to eq(1124) @@ -52,8 +51,8 @@ RSpec.describe Packages::Debian::CreatePackageFileService, feature_category: :pa shared_examples 'a valid changes' do it 'creates a new package file', :aggregate_failures do - expect(::Packages::Debian::ProcessChangesWorker) - .to receive(:perform_async).with(an_instance_of(Integer), current_user.id) + expect(::Packages::Debian::ProcessPackageFileWorker) + .to receive(:perform_async).with(an_instance_of(Integer), nil, nil) expect(package_file).to be_valid expect(package_file.file.read).to start_with('Format: 1.8') diff --git a/spec/services/packages/debian/extract_changes_metadata_service_spec.rb b/spec/services/packages/debian/extract_changes_metadata_service_spec.rb index a22c1fc7acc..68137c3abe1 100644 --- a/spec/services/packages/debian/extract_changes_metadata_service_spec.rb +++ b/spec/services/packages/debian/extract_changes_metadata_service_spec.rb @@ -1,13 +1,17 @@ # frozen_string_literal: true + require 'spec_helper' RSpec.describe Packages::Debian::ExtractChangesMetadataService, feature_category: :package_registry do describe '#execute' do let_it_be(:incoming) { create(:debian_incoming) } + let_it_be(:temp_package) do + create(:debian_package, without_package_files: true, with_changes_file: true, project: incoming.project) + end let(:source_file) { incoming.package_files.first } let(:dsc_file) { incoming.package_files.second } - let(:changes_file) { incoming.package_files.last } + let(:changes_file) { temp_package.package_files.first } let(:service) { described_class.new(changes_file) } subject { service.execute } diff --git a/spec/services/packages/debian/process_changes_service_spec.rb b/spec/services/packages/debian/process_changes_service_spec.rb index dbfcc359f9c..39b917cf1bc 100644 --- a/spec/services/packages/debian/process_changes_service_spec.rb +++ b/spec/services/packages/debian/process_changes_service_spec.rb @@ -7,7 +7,7 @@ RSpec.describe Packages::Debian::ProcessChangesService, feature_category: :packa let_it_be(:user) { create(:user) } let_it_be_with_reload(:distribution) { create(:debian_project_distribution, :with_file, suite: 'unstable') } - let!(:incoming) { create(:debian_incoming, project: distribution.project) } + let!(:incoming) { create(:debian_incoming, project: distribution.project, with_changes_file: true) } let(:package_file) { incoming.package_files.with_file_name('sample_1.2.3~alpha2_amd64.changes').first } diff --git a/spec/services/packages/debian/process_package_file_service_spec.rb b/spec/services/packages/debian/process_package_file_service_spec.rb index 7782b5fc1a6..d4e37403b87 100644 --- a/spec/services/packages/debian/process_package_file_service_spec.rb +++ b/spec/services/packages/debian/process_package_file_service_spec.rb @@ -3,211 +3,408 @@ require 'spec_helper' RSpec.describe Packages::Debian::ProcessPackageFileService, feature_category: :package_registry do + include ExclusiveLeaseHelpers + + let_it_be(:distribution) { create(:debian_project_distribution, :with_file, suite: 'unstable') } + + let(:debian_file_metadatum) { package_file.debian_file_metadatum } + let(:service) { described_class.new(package_file, distribution_name, component_name) } + describe '#execute' do - let_it_be_with_reload(:distribution) { create(:debian_project_distribution, :with_suite, :with_file) } + using RSpec::Parameterized::TableSyntax + + subject { service.execute } + + shared_examples 'common validations' do + context 'with package file without Debian metadata' do + let!(:package_file) { create(:debian_package_file, without_loaded_metadatum: true) } + + let(:expected_error) { ArgumentError } + let(:expected_message) { 'package file without Debian metadata' } + + it_behaves_like 'raises error' + end + + context 'with already processed package file' do + let!(:package_file) { create(:debian_package_file) } + + let(:expected_error) { ArgumentError } + let(:expected_message) { 'already processed package file' } + + it_behaves_like 'raises error' + end + + context 'without a distribution' do + let(:expected_error) { ActiveRecord::RecordNotFound } + let(:expected_message) { /^Couldn't find Packages::Debian::ProjectDistribution with / } + + before do + # Workaround ActiveRecord cache + Packages::Debian::ProjectDistribution.find(distribution.id).delete + end + + it_behaves_like 'raises error' + end + + context 'when there is a matching published package in another distribution' do + let!(:matching_package) do + create( + :debian_package, + project: distribution.project, + name: 'sample', + version: '1.2.3~alpha2' + ) + end + + let(:expected_error) { ArgumentError } + + let(:expected_message) do + "Debian package sample 1.2.3~alpha2 exists in distribution #{matching_package.debian_distribution.codename}" + end + + it_behaves_like 'raises error' + end + end + + shared_examples 'raises error' do + it 'raises error', :aggregate_failures do + expect(::Packages::Debian::GenerateDistributionWorker).not_to receive(:perform_async) + expect { subject } + .to not_change(Packages::Package, :count) + .and not_change(Packages::PackageFile, :count) + .and not_change { Packages::Debian::Publication.count } + .and not_change(package.package_files, :count) + .and not_change { package.reload.name } + .and not_change { package.version } + .and not_change { package.status } + .and not_change { debian_file_metadatum&.reload&.file_type } + .and not_change { debian_file_metadatum&.component } + .and raise_error(expected_error, expected_message) + end + end - let!(:package) { create(:debian_package, :processing, project: distribution.project, published_in: nil) } - let(:distribution_name) { distribution.codename } - let(:component_name) { 'main' } - let(:debian_file_metadatum) { package_file.debian_file_metadatum } + shared_examples 'does nothing' do + it 'does nothing', :aggregate_failures do + expect(::Packages::Debian::GenerateDistributionWorker).not_to receive(:perform_async) + expect { subject } + .to not_change(Packages::Package, :count) + .and not_change(Packages::PackageFile, :count) + .and not_change { Packages::Debian::Publication.count } + .and not_change(package.package_files, :count) + .and not_change { package.reload.name } + .and not_change { package.version } + .and not_change { package.status } + .and not_change { debian_file_metadatum&.reload&.file_type } + .and not_change { debian_file_metadatum&.component } + end + end - subject { described_class.new(package_file, distribution_name, component_name) } + shared_examples 'updates package and changes file' do + it 'updates package and changes file', :aggregate_failures do + expect(::Packages::Debian::GenerateDistributionWorker) + .to receive(:perform_async).with(:project, distribution.id) + expect { subject } + .to not_change(Packages::Package, :count) + .and not_change(Packages::PackageFile, :count) + .and change { Packages::Debian::Publication.count }.by(1) + .and change { package.package_files.count }.from(1).to(8) + .and change { package.reload.name }.to('sample') + .and change { package.version }.to('1.2.3~alpha2') + .and change { package.status }.from('processing').to('default') + .and change { package.debian_publication }.from(nil) + .and change { debian_file_metadatum.file_type }.from('unknown').to('changes') + .and not_change { debian_file_metadatum.component } + end + end shared_examples 'updates package and package file' do it 'updates package and package file', :aggregate_failures do expect(::Packages::Debian::GenerateDistributionWorker) .to receive(:perform_async).with(:project, distribution.id) - expect { subject.execute } + expect { subject } .to not_change(Packages::Package, :count) .and not_change(Packages::PackageFile, :count) .and change { Packages::Debian::Publication.count }.by(1) .and not_change(package.package_files, :count) .and change { package.reload.name }.to('sample') - .and change { package.reload.version }.to('1.2.3~alpha2') - .and change { package.reload.status }.from('processing').to('default') - .and change { package.reload.debian_publication }.from(nil) + .and change { package.version }.to('1.2.3~alpha2') + .and change { package.status }.from('processing').to('default') + .and change { package.debian_publication }.from(nil) .and change { debian_file_metadatum.file_type }.from('unknown').to(expected_file_type) .and change { debian_file_metadatum.component }.from(nil).to(component_name) end end - using RSpec::Parameterized::TableSyntax + context 'with a changes file' do + let!(:incoming) { create(:debian_incoming, project: distribution.project) } + let!(:temporary_with_changes) { create(:debian_temporary_with_changes, project: distribution.project) } + let(:package) { temporary_with_changes } - where(:case_name, :expected_file_type, :file_name, :component_name) do - 'with a deb' | 'deb' | 'libsample0_1.2.3~alpha2_amd64.deb' | 'main' - 'with an udeb' | 'udeb' | 'sample-udeb_1.2.3~alpha2_amd64.udeb' | 'contrib' - 'with an ddeb' | 'ddeb' | 'sample-ddeb_1.2.3~alpha2_amd64.ddeb' | 'main' - end + let(:package_file) { temporary_with_changes.package_files.first } + let(:distribution_name) { nil } + let(:component_name) { nil } - with_them do - context 'with Debian package file' do - let(:package_file) { package.package_files.with_file_name(file_name).first } + it_behaves_like 'common validations' - context 'when there is no matching published package' do - it_behaves_like 'updates package and package file' + context 'with distribution_name' do + let(:distribution_name) { distribution.codename } + let(:expected_error) { ArgumentError } + let(:expected_message) { 'unwanted distribution name' } - context 'with suite as distribution name' do - let(:distribution_name) { distribution.suite } + it_behaves_like 'raises error' + end - it_behaves_like 'updates package and package file' - end + context 'with component_name' do + let(:component_name) { 'main' } + let(:expected_error) { ArgumentError } + let(:expected_message) { 'unwanted component name' } + + it_behaves_like 'raises error' + end + + context 'with crafted file_metadata' do + let(:complete_file_metadata) do + { + file_type: :changes, + fields: { + 'Source' => 'abc', + 'Version' => '1.0', + 'Distribution' => 'sid' + } + } end - context 'when there is a matching published package' do - let!(:matching_package) do - create( - :debian_package, - project: distribution.project, - published_in: distribution, - name: 'sample', - version: '1.2.3~alpha2' - ) - end + let(:expected_error) { ArgumentError } - it 'reuses existing package and update package file', :aggregate_failures do - expect(::Packages::Debian::GenerateDistributionWorker) - .to receive(:perform_async).with(:project, distribution.id) - expect { subject.execute } - .to change { Packages::Package.count }.from(2).to(1) - .and change { Packages::PackageFile.count }.from(16).to(9) - .and not_change(Packages::Debian::Publication, :count) - .and change { package.package_files.count }.from(8).to(0) - .and change { package_file.package }.from(package).to(matching_package) - .and not_change(matching_package, :name) - .and not_change(matching_package, :version) - .and change { debian_file_metadatum.file_type }.from('unknown').to(expected_file_type) - .and change { debian_file_metadatum.component }.from(nil).to(component_name) - - expect { package.reload } - .to raise_error(ActiveRecord::RecordNotFound) + before do + allow_next_instance_of(::Packages::Debian::ExtractChangesMetadataService) do |extract_changes_metadata_svc| + allow(extract_changes_metadata_svc).to receive(:execute).and_return(file_metadata) end end - context 'when there is a matching published package in another distribution' do - let!(:matching_package) do - create( - :debian_package, - project: distribution.project, - name: 'sample', - version: '1.2.3~alpha2' - ) - end + context 'with missing Source field' do + let(:file_metadata) { complete_file_metadata.tap { |m| m[:fields].delete 'Source' } } + let(:expected_message) { 'missing Source field' } - it 'raise ArgumentError', :aggregate_failures do - expect(::Packages::Debian::GenerateDistributionWorker).not_to receive(:perform_async) - expect { subject.execute } - .to not_change(Packages::Package, :count) - .and not_change(Packages::PackageFile, :count) - .and not_change(package.package_files, :count) - .and raise_error(ArgumentError, "Debian package sample 1.2.3~alpha2 exists " \ - "in distribution #{matching_package.debian_distribution.codename}") - end + it_behaves_like 'raises error' end - context 'when there is a matching published package pending destruction' do - let!(:matching_package) do - create( - :debian_package, - :pending_destruction, - project: distribution.project, - published_in: distribution, - name: 'sample', - version: '1.2.3~alpha2' - ) - end + context 'with missing Version field' do + let(:file_metadata) { complete_file_metadata.tap { |m| m[:fields].delete 'Version' } } + let(:expected_message) { 'missing Version field' } + + it_behaves_like 'raises error' + end + + context 'with missing Distribution field' do + let(:file_metadata) { complete_file_metadata.tap { |m| m[:fields].delete 'Distribution' } } + let(:expected_message) { 'missing Distribution field' } - it_behaves_like 'updates package and package file' + it_behaves_like 'raises error' end end - end - context 'without a distribution' do - let(:package_file) { package.package_files.with_file_name('libsample0_1.2.3~alpha2_amd64.deb').first } - let(:component_name) { 'main' } + context 'when lease is already taken' do + before do + stub_exclusive_lease_taken( + "packages:debian:process_package_file_service:#{distribution.project_id}_sample_1.2.3~alpha2", + timeout: Packages::Debian::ProcessPackageFileService::DEFAULT_LEASE_TIMEOUT) + end - before do - distribution.destroy! + it_behaves_like 'does nothing' end - it 'raise ActiveRecord::RecordNotFound', :aggregate_failures do - expect(::Packages::Debian::GenerateDistributionWorker).not_to receive(:perform_async) - expect { subject.execute } - .to not_change(Packages::Package, :count) - .and not_change(Packages::PackageFile, :count) - .and not_change(package.package_files, :count) - .and raise_error(ActiveRecord::RecordNotFound) + context 'when there is no matching published package' do + it_behaves_like 'updates package and changes file' end - end - context 'without distribution name' do - let!(:package_file) { create(:debian_package_file, without_loaded_metadatum: true) } - let(:distribution_name) { '' } + context 'when there is a matching published package' do + let!(:matching_package) do + create( + :debian_package, + project: distribution.project, + published_in: distribution, + name: 'sample', + version: '1.2.3~alpha2' + ) + end - it 'raise ArgumentError', :aggregate_failures do - expect(::Packages::Debian::GenerateDistributionWorker).not_to receive(:perform_async) - expect { subject.execute } - .to not_change(Packages::Package, :count) - .and not_change(Packages::PackageFile, :count) - .and not_change(package.package_files, :count) - .and raise_error(ArgumentError, 'missing distribution name') + it 'reuses existing package and update package file', :aggregate_failures do + expect(::Packages::Debian::GenerateDistributionWorker) + .to receive(:perform_async).with(:project, distribution.id) + expect { subject } + .to change { Packages::Package.count }.from(3).to(2) + .and not_change { Packages::PackageFile.count } + .and not_change(Packages::Debian::Publication, :count) + .and change { package.package_files.count }.from(1).to(0) + .and change { incoming.package_files.count }.from(7).to(0) + .and change { matching_package.package_files.count }.from(7).to(15) + .and change { package_file.package }.from(package).to(matching_package) + .and not_change(matching_package, :name) + .and not_change(matching_package, :version) + .and change { debian_file_metadatum.file_type }.from('unknown').to('changes') + .and not_change { debian_file_metadatum.component } + + expect { package.reload } + .to raise_error(ActiveRecord::RecordNotFound) + end end - end - context 'without component name' do - let!(:package_file) { create(:debian_package_file, without_loaded_metadatum: true) } - let(:component_name) { '' } + context 'when there is a matching published package pending destruction' do + let!(:matching_package) do + create( + :debian_package, + :pending_destruction, + project: distribution.project, + published_in: distribution, + name: 'sample', + version: '1.2.3~alpha2' + ) + end - it 'raise ArgumentError', :aggregate_failures do - expect(::Packages::Debian::GenerateDistributionWorker).not_to receive(:perform_async) - expect { subject.execute } - .to not_change(Packages::Package, :count) - .and not_change(Packages::PackageFile, :count) - .and not_change(package.package_files, :count) - .and raise_error(ArgumentError, 'missing component name') + it_behaves_like 'updates package and changes file' end end - context 'with package file without Debian metadata' do - let!(:package_file) { create(:debian_package_file, without_loaded_metadatum: true) } + context 'with a package file' do + let!(:temporary_with_files) { create(:debian_temporary_with_files, project: distribution.project) } + let(:package) { temporary_with_files } + + let(:package_file) { package.package_files.with_file_name('libsample0_1.2.3~alpha2_amd64.deb').first } + let(:distribution_name) { distribution.codename } let(:component_name) { 'main' } - it 'raise ArgumentError', :aggregate_failures do - expect(::Packages::Debian::GenerateDistributionWorker).not_to receive(:perform_async) - expect { subject.execute } - .to not_change(Packages::Package, :count) - .and not_change(Packages::PackageFile, :count) - .and not_change(package.package_files, :count) - .and raise_error(ArgumentError, 'package file without Debian metadata') + where(:case_name, :expected_file_type, :file_name, :component_name) do + 'with a deb' | 'deb' | 'libsample0_1.2.3~alpha2_amd64.deb' | 'main' + 'with an udeb' | 'udeb' | 'sample-udeb_1.2.3~alpha2_amd64.udeb' | 'contrib' + 'with an ddeb' | 'ddeb' | 'sample-ddeb_1.2.3~alpha2_amd64.ddeb' | 'main' end - end - context 'with already processed package file' do - let_it_be(:package_file) { create(:debian_package_file) } + with_them do + context 'with Debian package file' do + let(:package_file) { package.package_files.with_file_name(file_name).first } - let(:component_name) { 'main' } + it_behaves_like 'common validations' - it 'raise ArgumentError', :aggregate_failures do - expect(::Packages::Debian::GenerateDistributionWorker).not_to receive(:perform_async) - expect { subject.execute } - .to not_change(Packages::Package, :count) - .and not_change(Packages::PackageFile, :count) - .and not_change(package.package_files, :count) - .and raise_error(ArgumentError, 'already processed package file') + context 'without distribution name' do + let(:distribution_name) { '' } + let(:expected_error) { ArgumentError } + let(:expected_message) { 'missing distribution name' } + + it_behaves_like 'raises error' + end + + context 'without component name' do + let(:component_name) { '' } + let(:expected_error) { ArgumentError } + let(:expected_message) { 'missing component name' } + + it_behaves_like 'raises error' + end + + context 'with invalid package file type' do + let(:package_file) { package.package_files.with_file_name('sample_1.2.3~alpha2.tar.xz').first } + let(:expected_error) { ArgumentError } + let(:expected_message) { 'invalid package file type: source' } + + it_behaves_like 'raises error' + end + + context 'when lease is already taken' do + before do + stub_exclusive_lease_taken( + "packages:debian:process_package_file_service:#{distribution.project_id}_sample_1.2.3~alpha2", + timeout: Packages::Debian::ProcessPackageFileService::DEFAULT_LEASE_TIMEOUT) + end + + it_behaves_like 'does nothing' + end + + context 'when there is no matching published package' do + it_behaves_like 'updates package and package file' + + context 'with suite as distribution name' do + let(:distribution_name) { distribution.suite } + + it_behaves_like 'updates package and package file' + end + end + + context 'when there is a matching published package' do + let!(:matching_package) do + create( + :debian_package, + project: distribution.project, + published_in: distribution, + name: 'sample', + version: '1.2.3~alpha2' + ) + end + + it 'reuses existing package and update package file', :aggregate_failures do + expect(::Packages::Debian::GenerateDistributionWorker) + .to receive(:perform_async).with(:project, distribution.id) + expect { subject } + .to change { Packages::Package.count }.from(2).to(1) + .and change { Packages::PackageFile.count }.from(14).to(8) + .and not_change(Packages::Debian::Publication, :count) + .and change { package.package_files.count }.from(7).to(0) + .and change { package_file.package }.from(package).to(matching_package) + .and not_change(matching_package, :name) + .and not_change(matching_package, :version) + .and change { debian_file_metadatum.file_type }.from('unknown').to(expected_file_type) + .and change { debian_file_metadatum.component }.from(nil).to(component_name) + + expect { package.reload } + .to raise_error(ActiveRecord::RecordNotFound) + end + end + + context 'when there is a matching published package pending destruction' do + let!(:matching_package) do + create( + :debian_package, + :pending_destruction, + project: distribution.project, + published_in: distribution, + name: 'sample', + version: '1.2.3~alpha2' + ) + end + + it_behaves_like 'updates package and package file' + end + end end end + end + + describe '#lease_key' do + let(:prefix) { 'packages:debian:process_package_file_service' } + + subject { service.send(:lease_key) } + + context 'with a changes file' do + let!(:incoming) { create(:debian_incoming, project: distribution.project) } + let!(:temporary_with_changes) { create(:debian_temporary_with_changes, project: distribution.project) } + let(:package) { temporary_with_changes } + + let(:package_file) { temporary_with_changes.package_files.first } + let(:distribution_name) { nil } + let(:component_name) { nil } + + it { is_expected.to eq("#{prefix}:#{distribution.project_id}_sample_1.2.3~alpha2") } + end + + context 'with a package file' do + let!(:temporary_with_files) { create(:debian_temporary_with_files, project: distribution.project) } + let(:package) { temporary_with_files } - context 'with invalid package file type' do - let(:package_file) { package.package_files.with_file_name('sample_1.2.3~alpha2.tar.xz').first } + let(:package_file) { package.package_files.with_file_name('libsample0_1.2.3~alpha2_amd64.deb').first } + let(:distribution_name) { distribution.codename } let(:component_name) { 'main' } - it 'raise ArgumentError', :aggregate_failures do - expect(::Packages::Debian::GenerateDistributionWorker).not_to receive(:perform_async) - expect { subject.execute } - .to not_change(Packages::Package, :count) - .and not_change(Packages::PackageFile, :count) - .and not_change(package.package_files, :count) - .and raise_error(ArgumentError, 'invalid package file type: source') - end + it { is_expected.to eq("#{prefix}:#{distribution.project_id}_sample_1.2.3~alpha2") } end end end diff --git a/spec/services/projects/after_rename_service_spec.rb b/spec/services/projects/after_rename_service_spec.rb index 3097d6d1498..411ff5662d4 100644 --- a/spec/services/projects/after_rename_service_spec.rb +++ b/spec/services/projects/after_rename_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::AfterRenameService, feature_category: :projects do +RSpec.describe Projects::AfterRenameService, feature_category: :groups_and_projects do let(:legacy_storage) { Storage::LegacyProject.new(project) } let(:hashed_storage) { Storage::Hashed.new(project) } let!(:path_before_rename) { project.path } diff --git a/spec/services/projects/alerting/notify_service_spec.rb b/spec/services/projects/alerting/notify_service_spec.rb index 8cd9b5d3e00..bbe69e4102f 100644 --- a/spec/services/projects/alerting/notify_service_spec.rb +++ b/spec/services/projects/alerting/notify_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::Alerting::NotifyService, feature_category: :projects do +RSpec.describe Projects::Alerting::NotifyService, feature_category: :groups_and_projects do let_it_be_with_reload(:project) { create(:project) } let(:payload) { ActionController::Parameters.new(payload_raw).permit! } diff --git a/spec/services/projects/all_issues_count_service_spec.rb b/spec/services/projects/all_issues_count_service_spec.rb index e8e08a25c45..0118f0d5e8b 100644 --- a/spec/services/projects/all_issues_count_service_spec.rb +++ b/spec/services/projects/all_issues_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::AllIssuesCountService, :use_clean_rails_memory_store_caching, feature_category: :projects do +RSpec.describe Projects::AllIssuesCountService, :use_clean_rails_memory_store_caching, feature_category: :groups_and_projects do let_it_be(:group) { create(:group, :public) } let_it_be(:project) { create(:project, :public, namespace: group) } let_it_be(:banned_user) { create(:user, :banned) } diff --git a/spec/services/projects/all_merge_requests_count_service_spec.rb b/spec/services/projects/all_merge_requests_count_service_spec.rb index ca10fbc00ad..7f4465fd8e7 100644 --- a/spec/services/projects/all_merge_requests_count_service_spec.rb +++ b/spec/services/projects/all_merge_requests_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::AllMergeRequestsCountService, :use_clean_rails_memory_store_caching, feature_category: :projects do +RSpec.describe Projects::AllMergeRequestsCountService, :use_clean_rails_memory_store_caching, feature_category: :groups_and_projects do let_it_be(:project) { create(:project) } subject { described_class.new(project) } diff --git a/spec/services/projects/apple_target_platform_detector_service_spec.rb b/spec/services/projects/apple_target_platform_detector_service_spec.rb index 787faaa0f79..74a04da9e68 100644 --- a/spec/services/projects/apple_target_platform_detector_service_spec.rb +++ b/spec/services/projects/apple_target_platform_detector_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::AppleTargetPlatformDetectorService, feature_category: :projects do +RSpec.describe Projects::AppleTargetPlatformDetectorService, feature_category: :groups_and_projects do let_it_be(:project) { build(:project) } subject { described_class.new(project).execute } diff --git a/spec/services/projects/autocomplete_service_spec.rb b/spec/services/projects/autocomplete_service_spec.rb index 9d3075874a2..67e715142f8 100644 --- a/spec/services/projects/autocomplete_service_spec.rb +++ b/spec/services/projects/autocomplete_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::AutocompleteService, feature_category: :projects do +RSpec.describe Projects::AutocompleteService, feature_category: :groups_and_projects do describe '#issues' do describe 'confidential issues' do let(:author) { create(:user) } diff --git a/spec/services/projects/batch_open_issues_count_service_spec.rb b/spec/services/projects/batch_open_issues_count_service_spec.rb index d29115a697f..578c3d066e1 100644 --- a/spec/services/projects/batch_open_issues_count_service_spec.rb +++ b/spec/services/projects/batch_open_issues_count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::BatchOpenIssuesCountService, feature_category: :projects do +RSpec.describe Projects::BatchOpenIssuesCountService, feature_category: :groups_and_projects do let!(:project_1) { create(:project) } let!(:project_2) { create(:project) } diff --git a/spec/services/projects/count_service_spec.rb b/spec/services/projects/count_service_spec.rb index 71940fa396e..8797f30bed2 100644 --- a/spec/services/projects/count_service_spec.rb +++ b/spec/services/projects/count_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::CountService, feature_category: :projects do +RSpec.describe Projects::CountService, feature_category: :groups_and_projects do let(:project) { build(:project, id: 1) } let(:service) { described_class.new(project) } diff --git a/spec/services/projects/create_from_template_service_spec.rb b/spec/services/projects/create_from_template_service_spec.rb index a3fdb258f75..0d649dee022 100644 --- a/spec/services/projects/create_from_template_service_spec.rb +++ b/spec/services/projects/create_from_template_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::CreateFromTemplateService, feature_category: :projects do +RSpec.describe Projects::CreateFromTemplateService, feature_category: :groups_and_projects do let(:user) { create(:user) } let(:template_name) { 'rails' } let(:project_params) do diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb index 1b6971ff897..59db0b47a3c 100644 --- a/spec/services/projects/create_service_spec.rb +++ b/spec/services/projects/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::CreateService, '#execute', feature_category: :projects do +RSpec.describe Projects::CreateService, '#execute', feature_category: :groups_and_projects do include ExternalAuthorizationServiceHelpers let(:user) { create :user } diff --git a/spec/services/projects/destroy_service_spec.rb b/spec/services/projects/destroy_service_spec.rb index 7da23a59a58..7aa6980fb24 100644 --- a/spec/services/projects/destroy_service_spec.rb +++ b/spec/services/projects/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::DestroyService, :aggregate_failures, :event_store_publisher, feature_category: :projects do +RSpec.describe Projects::DestroyService, :aggregate_failures, :event_store_publisher, feature_category: :groups_and_projects do include ProjectForksHelper include BatchDestroyDependentAssociationsHelper diff --git a/spec/services/projects/detect_repository_languages_service_spec.rb b/spec/services/projects/detect_repository_languages_service_spec.rb index 5759f8128d0..29d5569ba76 100644 --- a/spec/services/projects/detect_repository_languages_service_spec.rb +++ b/spec/services/projects/detect_repository_languages_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::DetectRepositoryLanguagesService, :clean_gitlab_redis_shared_state, feature_category: :projects do +RSpec.describe Projects::DetectRepositoryLanguagesService, :clean_gitlab_redis_shared_state, feature_category: :groups_and_projects do let_it_be(:project, reload: true) { create(:project, :repository) } subject { described_class.new(project) } diff --git a/spec/services/projects/download_service_spec.rb b/spec/services/projects/download_service_spec.rb index 52bdbefe01a..e062ee04bf4 100644 --- a/spec/services/projects/download_service_spec.rb +++ b/spec/services/projects/download_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::DownloadService, feature_category: :projects do +RSpec.describe Projects::DownloadService, feature_category: :groups_and_projects do describe 'File service' do before do @user = create(:user) diff --git a/spec/services/projects/fetch_statistics_increment_service_spec.rb b/spec/services/projects/fetch_statistics_increment_service_spec.rb index 9e24e68fa98..5ad91e142a0 100644 --- a/spec/services/projects/fetch_statistics_increment_service_spec.rb +++ b/spec/services/projects/fetch_statistics_increment_service_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' module Projects - RSpec.describe FetchStatisticsIncrementService, feature_category: :projects do + RSpec.describe FetchStatisticsIncrementService, feature_category: :groups_and_projects do let(:project) { create(:project) } describe '#execute' do diff --git a/spec/services/projects/group_links/create_service_spec.rb b/spec/services/projects/group_links/create_service_spec.rb index 4f2f480cf1c..ca2902af472 100644 --- a/spec/services/projects/group_links/create_service_spec.rb +++ b/spec/services/projects/group_links/create_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::GroupLinks::CreateService, '#execute', feature_category: :subgroups do +RSpec.describe Projects::GroupLinks::CreateService, '#execute', feature_category: :groups_and_projects do let_it_be(:user) { create :user } let_it_be(:group) { create :group } let_it_be(:project) { create(:project, namespace: create(:namespace, :with_namespace_settings)) } diff --git a/spec/services/projects/group_links/destroy_service_spec.rb b/spec/services/projects/group_links/destroy_service_spec.rb index 76bdd536a0d..103aff8c659 100644 --- a/spec/services/projects/group_links/destroy_service_spec.rb +++ b/spec/services/projects/group_links/destroy_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::GroupLinks::DestroyService, '#execute', feature_category: :subgroups do +RSpec.describe Projects::GroupLinks::DestroyService, '#execute', feature_category: :groups_and_projects do let_it_be(:user) { create :user } let_it_be(:project) { create(:project, :private) } let_it_be(:group) { create(:group) } diff --git a/spec/services/projects/group_links/update_service_spec.rb b/spec/services/projects/group_links/update_service_spec.rb index 4232412cf54..f7607deef04 100644 --- a/spec/services/projects/group_links/update_service_spec.rb +++ b/spec/services/projects/group_links/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::GroupLinks::UpdateService, '#execute', feature_category: :subgroups do +RSpec.describe Projects::GroupLinks::UpdateService, '#execute', feature_category: :groups_and_projects do let_it_be(:user) { create :user } let_it_be(:group) { create :group } let_it_be(:project) { create :project } diff --git a/spec/services/projects/hashed_storage/base_attachment_service_spec.rb b/spec/services/projects/hashed_storage/base_attachment_service_spec.rb index 01036fc2d9c..e32747ad907 100644 --- a/spec/services/projects/hashed_storage/base_attachment_service_spec.rb +++ b/spec/services/projects/hashed_storage/base_attachment_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::HashedStorage::BaseAttachmentService, feature_category: :projects do +RSpec.describe Projects::HashedStorage::BaseAttachmentService, feature_category: :groups_and_projects do let(:project) { create(:project, :repository, storage_version: 0, skip_disk_validation: true) } subject(:service) { described_class.new(project: project, old_disk_path: project.full_path, logger: nil) } diff --git a/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb b/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb index 39263506bca..6a87b2fafb9 100644 --- a/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb +++ b/spec/services/projects/hashed_storage/migrate_attachments_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::HashedStorage::MigrateAttachmentsService, feature_category: :projects do +RSpec.describe Projects::HashedStorage::MigrateAttachmentsService, feature_category: :groups_and_projects do subject(:service) { described_class.new(project: project, old_disk_path: project.full_path, logger: nil) } let(:project) { create(:project, :repository, storage_version: 1, skip_disk_validation: true) } diff --git a/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb b/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb index bcc914e72b5..e21d8b6fa83 100644 --- a/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb +++ b/spec/services/projects/hashed_storage/migrate_repository_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::HashedStorage::MigrateRepositoryService, feature_category: :projects do +RSpec.describe Projects::HashedStorage::MigrateRepositoryService, feature_category: :groups_and_projects do let(:gitlab_shell) { Gitlab::Shell.new } let(:project) { create(:project, :legacy_storage, :repository, :wiki_repo, :design_repo) } let(:legacy_storage) { Storage::LegacyProject.new(project) } diff --git a/spec/services/projects/hashed_storage/migration_service_spec.rb b/spec/services/projects/hashed_storage/migration_service_spec.rb index 89bc55dbaf6..ffbd5c2500a 100644 --- a/spec/services/projects/hashed_storage/migration_service_spec.rb +++ b/spec/services/projects/hashed_storage/migration_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::HashedStorage::MigrationService, feature_category: :projects do +RSpec.describe Projects::HashedStorage::MigrationService, feature_category: :groups_and_projects do let(:project) { create(:project, :empty_repo, :wiki_repo, :legacy_storage) } let(:logger) { double } let!(:project_attachment) { build(:file_uploader, project: project) } diff --git a/spec/services/projects/hashed_storage/rollback_attachments_service_spec.rb b/spec/services/projects/hashed_storage/rollback_attachments_service_spec.rb index 95491d63df2..d1a68503fa3 100644 --- a/spec/services/projects/hashed_storage/rollback_attachments_service_spec.rb +++ b/spec/services/projects/hashed_storage/rollback_attachments_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::HashedStorage::RollbackAttachmentsService, feature_category: :projects do +RSpec.describe Projects::HashedStorage::RollbackAttachmentsService, feature_category: :groups_and_projects do subject(:service) { described_class.new(project: project, old_disk_path: project.disk_path, logger: nil) } let(:project) { create(:project, :repository, skip_disk_validation: true) } diff --git a/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb b/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb index 19f1856e39a..1e5d4ae4d20 100644 --- a/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb +++ b/spec/services/projects/hashed_storage/rollback_repository_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::HashedStorage::RollbackRepositoryService, :clean_gitlab_redis_shared_state, feature_category: :projects do +RSpec.describe Projects::HashedStorage::RollbackRepositoryService, :clean_gitlab_redis_shared_state, feature_category: :groups_and_projects do let(:gitlab_shell) { Gitlab::Shell.new } let(:project) { create(:project, :repository, :wiki_repo, :design_repo, storage_version: ::Project::HASHED_STORAGE_FEATURES[:repository]) } let(:legacy_storage) { Storage::LegacyProject.new(project) } diff --git a/spec/services/projects/hashed_storage/rollback_service_spec.rb b/spec/services/projects/hashed_storage/rollback_service_spec.rb index 6d047f856ec..088eb9d2734 100644 --- a/spec/services/projects/hashed_storage/rollback_service_spec.rb +++ b/spec/services/projects/hashed_storage/rollback_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::HashedStorage::RollbackService, feature_category: :projects do +RSpec.describe Projects::HashedStorage::RollbackService, feature_category: :groups_and_projects do let(:project) { create(:project, :empty_repo, :wiki_repo) } let(:logger) { double } let!(:project_attachment) { build(:file_uploader, project: project) } diff --git a/spec/services/projects/move_access_service_spec.rb b/spec/services/projects/move_access_service_spec.rb index b9244002f6c..a6407ddc849 100644 --- a/spec/services/projects/move_access_service_spec.rb +++ b/spec/services/projects/move_access_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::MoveAccessService, feature_category: :projects do +RSpec.describe Projects::MoveAccessService, feature_category: :groups_and_projects do let(:user) { create(:user) } let(:group) { create(:group) } let(:project_with_access) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_notification_settings_service_spec.rb b/spec/services/projects/move_notification_settings_service_spec.rb index 5ef6e8a0647..e9b523f6273 100644 --- a/spec/services/projects/move_notification_settings_service_spec.rb +++ b/spec/services/projects/move_notification_settings_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::MoveNotificationSettingsService, feature_category: :projects do +RSpec.describe Projects::MoveNotificationSettingsService, feature_category: :groups_and_projects do let(:user) { create(:user) } let(:project_with_notifications) { create(:project, namespace: user.namespace) } let(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_project_authorizations_service_spec.rb b/spec/services/projects/move_project_authorizations_service_spec.rb index 6cd0b056325..c01a0b2c90e 100644 --- a/spec/services/projects/move_project_authorizations_service_spec.rb +++ b/spec/services/projects/move_project_authorizations_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::MoveProjectAuthorizationsService, feature_category: :projects do +RSpec.describe Projects::MoveProjectAuthorizationsService, feature_category: :groups_and_projects do let!(:user) { create(:user) } let(:project_with_users) { create(:project, namespace: user.namespace) } let(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_project_group_links_service_spec.rb b/spec/services/projects/move_project_group_links_service_spec.rb index cfd4b51b001..6d6a8b402de 100644 --- a/spec/services/projects/move_project_group_links_service_spec.rb +++ b/spec/services/projects/move_project_group_links_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::MoveProjectGroupLinksService, feature_category: :projects do +RSpec.describe Projects::MoveProjectGroupLinksService, feature_category: :groups_and_projects do let!(:user) { create(:user) } let(:project_with_groups) { create(:project, namespace: user.namespace) } let(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_project_members_service_spec.rb b/spec/services/projects/move_project_members_service_spec.rb index 364fb7faaf2..d8330863405 100644 --- a/spec/services/projects/move_project_members_service_spec.rb +++ b/spec/services/projects/move_project_members_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::MoveProjectMembersService, feature_category: :projects do +RSpec.describe Projects::MoveProjectMembersService, feature_category: :groups_and_projects do let!(:user) { create(:user) } let(:project_with_users) { create(:project, namespace: user.namespace) } let(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/move_users_star_projects_service_spec.rb b/spec/services/projects/move_users_star_projects_service_spec.rb index b99e51d954b..6a01896bd58 100644 --- a/spec/services/projects/move_users_star_projects_service_spec.rb +++ b/spec/services/projects/move_users_star_projects_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::MoveUsersStarProjectsService, feature_category: :projects do +RSpec.describe Projects::MoveUsersStarProjectsService, feature_category: :groups_and_projects do let!(:user) { create(:user) } let!(:project_with_stars) { create(:project, namespace: user.namespace) } let!(:target_project) { create(:project, namespace: user.namespace) } diff --git a/spec/services/projects/operations/update_service_spec.rb b/spec/services/projects/operations/update_service_spec.rb index 7babaf4d0d8..da45d3c8ebc 100644 --- a/spec/services/projects/operations/update_service_spec.rb +++ b/spec/services/projects/operations/update_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::Operations::UpdateService, feature_category: :projects do +RSpec.describe Projects::Operations::UpdateService, feature_category: :groups_and_projects do let_it_be_with_refind(:project) { create(:project) } let_it_be(:user) { create(:user) } diff --git a/spec/services/projects/overwrite_project_service_spec.rb b/spec/services/projects/overwrite_project_service_spec.rb index b4faf45a1cb..99be630d6f6 100644 --- a/spec/services/projects/overwrite_project_service_spec.rb +++ b/spec/services/projects/overwrite_project_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::OverwriteProjectService, feature_category: :projects do +RSpec.describe Projects::OverwriteProjectService, feature_category: :groups_and_projects do include ProjectForksHelper let(:user) { create(:user) } diff --git a/spec/services/projects/participants_service_spec.rb b/spec/services/projects/participants_service_spec.rb index bd297343879..8c0f68dee4c 100644 --- a/spec/services/projects/participants_service_spec.rb +++ b/spec/services/projects/participants_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::ParticipantsService, feature_category: :projects do +RSpec.describe Projects::ParticipantsService, feature_category: :groups_and_projects do describe '#execute' do let_it_be(:user) { create(:user) } let_it_be(:project) { create(:project, :public) } diff --git a/spec/services/projects/readme_renderer_service_spec.rb b/spec/services/projects/readme_renderer_service_spec.rb index 842d75e82ee..4d599a26c22 100644 --- a/spec/services/projects/readme_renderer_service_spec.rb +++ b/spec/services/projects/readme_renderer_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::ReadmeRendererService, '#execute', feature_category: :projects do +RSpec.describe Projects::ReadmeRendererService, '#execute', feature_category: :groups_and_projects do using RSpec::Parameterized::TableSyntax subject(:service) { described_class.new(project, nil, opts) } diff --git a/spec/services/projects/record_target_platforms_service_spec.rb b/spec/services/projects/record_target_platforms_service_spec.rb index 17aa7fd7009..7c6907c7a95 100644 --- a/spec/services/projects/record_target_platforms_service_spec.rb +++ b/spec/services/projects/record_target_platforms_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::RecordTargetPlatformsService, '#execute', feature_category: :projects do +RSpec.describe Projects::RecordTargetPlatformsService, '#execute', feature_category: :groups_and_projects do let_it_be(:project) { create(:project) } let(:detector_service) { Projects::AppleTargetPlatformDetectorService } diff --git a/spec/services/projects/transfer_service_spec.rb b/spec/services/projects/transfer_service_spec.rb index 37adc9e4867..46fe7d7bbbe 100644 --- a/spec/services/projects/transfer_service_spec.rb +++ b/spec/services/projects/transfer_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::TransferService, feature_category: :projects do +RSpec.describe Projects::TransferService, feature_category: :groups_and_projects do let_it_be(:group) { create(:group) } let_it_be(:user) { create(:user) } let_it_be(:group_integration) { create(:integrations_slack, :group, group: group, webhook: 'http://group.slack.com') } diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb index 8f55ee705ab..badbc8b628e 100644 --- a/spec/services/projects/update_service_spec.rb +++ b/spec/services/projects/update_service_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'spec_helper' -RSpec.describe Projects::UpdateService, feature_category: :projects do +RSpec.describe Projects::UpdateService, feature_category: :groups_and_projects do include ExternalAuthorizationServiceHelpers include ProjectForksHelper diff --git a/spec/services/projects/update_statistics_service_spec.rb b/spec/services/projects/update_statistics_service_spec.rb index f685b86acc0..762378c93ec 100644 --- a/spec/services/projects/update_statistics_service_spec.rb +++ b/spec/services/projects/update_statistics_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::UpdateStatisticsService, feature_category: :projects do +RSpec.describe Projects::UpdateStatisticsService, feature_category: :groups_and_projects do using RSpec::Parameterized::TableSyntax let(:service) { described_class.new(project, nil, statistics: statistics) } diff --git a/spec/services/reset_project_cache_service_spec.rb b/spec/services/reset_project_cache_service_spec.rb index 6ae516a5f07..6540b93bcc5 100644 --- a/spec/services/reset_project_cache_service_spec.rb +++ b/spec/services/reset_project_cache_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ResetProjectCacheService, feature_category: :projects do +RSpec.describe ResetProjectCacheService, feature_category: :groups_and_projects do let(:project) { create(:project) } let(:user) { create(:user) } diff --git a/spec/services/system_notes/alert_management_service_spec.rb b/spec/services/system_notes/alert_management_service_spec.rb index 4d40a6a6cfd..1e3be24b05f 100644 --- a/spec/services/system_notes/alert_management_service_spec.rb +++ b/spec/services/system_notes/alert_management_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe ::SystemNotes::AlertManagementService, feature_category: :projects do +RSpec.describe ::SystemNotes::AlertManagementService, feature_category: :groups_and_projects do let_it_be(:author) { create(:user) } let_it_be(:project) { create(:project, :repository) } let_it_be(:noteable) { create(:alert_management_alert, :with_incident, :acknowledged, project: project) } diff --git a/spec/services/system_notes/base_service_spec.rb b/spec/services/system_notes/base_service_spec.rb index 6ea4751b613..5c0ecf71d01 100644 --- a/spec/services/system_notes/base_service_spec.rb +++ b/spec/services/system_notes/base_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe SystemNotes::BaseService, feature_category: :projects do +RSpec.describe SystemNotes::BaseService, feature_category: :groups_and_projects do let(:noteable) { double } let(:project) { double } let(:author) { double } diff --git a/spec/support/shared_contexts/requests/api/debian_repository_shared_context.rb b/spec/support/shared_contexts/requests/api/debian_repository_shared_context.rb index ad64e4d5be5..70c3ee48345 100644 --- a/spec/support/shared_contexts/requests/api/debian_repository_shared_context.rb +++ b/spec/support/shared_contexts/requests/api/debian_repository_shared_context.rb @@ -50,8 +50,8 @@ RSpec.shared_context 'Debian repository shared context' do |container_type, can_ let_it_be(:public_project_distribution) { public_distribution } end - let_it_be(:private_package) { create(:debian_package, project: private_project, published_in: private_project_distribution) } - let_it_be(:public_package) { create(:debian_package, project: public_project, published_in: public_project_distribution) } + let_it_be(:private_package) { create(:debian_package, project: private_project, published_in: private_project_distribution, with_changes_file: true) } + let_it_be(:public_package) { create(:debian_package, project: public_project, published_in: public_project_distribution, with_changes_file: true) } let(:visibility_level) { :public } diff --git a/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb b/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb index bc7ad570441..5cb6c3d310f 100644 --- a/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb +++ b/spec/support/shared_examples/requests/api/debian_packages_shared_examples.rb @@ -20,17 +20,11 @@ RSpec.shared_examples 'Debian packages upload request' do |status, body = nil| if status == :created it 'creates package files', :aggregate_failures do expect(::Packages::Debian::CreatePackageFileService).to receive(:new).with(package: be_a(Packages::Package), current_user: be_an(User), params: be_an(Hash)).and_call_original + expect(::Packages::Debian::ProcessChangesWorker).not_to receive(:perform_async) - if file_name.end_with? '.changes' - expect(::Packages::Debian::ProcessChangesWorker).to receive(:perform_async) - else - expect(::Packages::Debian::ProcessChangesWorker).not_to receive(:perform_async) - end - - if extra_params[:distribution] + if extra_params[:distribution] || file_name.end_with?('.changes') expect(::Packages::Debian::FindOrCreateIncomingService).not_to receive(:new) - expect(::Packages::Debian::ProcessPackageFileWorker).to receive(:perform_async) - + expect(::Packages::Debian::ProcessPackageFileWorker).to receive(:perform_async).with(be_a(Integer), extra_params[:distribution], extra_params[:component]) expect { subject } .to change { container.packages.debian.count }.by(1) .and not_change { container.packages.debian.where(name: 'incoming').count } diff --git a/spec/tasks/gitlab/seed/group_seed_rake_spec.rb b/spec/tasks/gitlab/seed/group_seed_rake_spec.rb index 43351031414..85d81103000 100644 --- a/spec/tasks/gitlab/seed/group_seed_rake_spec.rb +++ b/spec/tasks/gitlab/seed/group_seed_rake_spec.rb @@ -2,7 +2,7 @@ require 'rake_helper' -RSpec.describe 'gitlab:seed:group_seed rake task', :silence_stdout, feature_category: :subgroups do +RSpec.describe 'gitlab:seed:group_seed rake task', :silence_stdout, feature_category: :groups_and_projects do let(:username) { 'group_seed' } let!(:user) { create(:user, username: username) } let(:task_params) { [2, username] } diff --git a/spec/views/admin/application_settings/network.html.haml_spec.rb b/spec/views/admin/application_settings/network.html.haml_spec.rb index 17515dbcc2c..989977bac3e 100644 --- a/spec/views/admin/application_settings/network.html.haml_spec.rb +++ b/spec/views/admin/application_settings/network.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'admin/application_settings/network.html.haml', feature_category: :projects do +RSpec.describe 'admin/application_settings/network.html.haml', feature_category: :groups_and_projects do let_it_be(:admin) { build_stubbed(:admin) } let_it_be(:application_setting) { build(:application_setting) } diff --git a/spec/views/admin/groups/_form.html.haml_spec.rb b/spec/views/admin/groups/_form.html.haml_spec.rb index 87929571a84..34b09a97ccc 100644 --- a/spec/views/admin/groups/_form.html.haml_spec.rb +++ b/spec/views/admin/groups/_form.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'admin/groups/_form', feature_category: :subgroups do +RSpec.describe 'admin/groups/_form', feature_category: :groups_and_projects do using RSpec::Parameterized::TableSyntax let_it_be(:admin) { build(:user, :admin) } diff --git a/spec/views/admin/projects/_form.html.haml_spec.rb b/spec/views/admin/projects/_form.html.haml_spec.rb index d36b32a1cbc..5bd73c064d5 100644 --- a/spec/views/admin/projects/_form.html.haml_spec.rb +++ b/spec/views/admin/projects/_form.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'admin/projects/_form', feature_category: :projects do +RSpec.describe 'admin/projects/_form', feature_category: :groups_and_projects do using RSpec::Parameterized::TableSyntax let_it_be(:admin) { build_stubbed(:admin) } diff --git a/spec/views/explore/projects/page_out_of_bounds.html.haml_spec.rb b/spec/views/explore/projects/page_out_of_bounds.html.haml_spec.rb index 1ace28be5b4..36f00ea5393 100644 --- a/spec/views/explore/projects/page_out_of_bounds.html.haml_spec.rb +++ b/spec/views/explore/projects/page_out_of_bounds.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'explore/projects/page_out_of_bounds.html.haml', feature_category: :projects do +RSpec.describe 'explore/projects/page_out_of_bounds.html.haml', feature_category: :groups_and_projects do let(:page_limit) { 10 } let(:unsafe_param) { 'hacked_using_unsafe_param!' } diff --git a/spec/views/groups/edit.html.haml_spec.rb b/spec/views/groups/edit.html.haml_spec.rb index 1400791f12b..f33a4190bf8 100644 --- a/spec/views/groups/edit.html.haml_spec.rb +++ b/spec/views/groups/edit.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'groups/edit.html.haml', feature_category: :subgroups do +RSpec.describe 'groups/edit.html.haml', feature_category: :groups_and_projects do include Devise::Test::ControllerHelpers before do diff --git a/spec/views/groups/group_members/index.html.haml_spec.rb b/spec/views/groups/group_members/index.html.haml_spec.rb index fdc6b09d32a..d7d381ba82b 100644 --- a/spec/views/groups/group_members/index.html.haml_spec.rb +++ b/spec/views/groups/group_members/index.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'groups/group_members/index', :aggregate_failures, feature_category: :subgroups do +RSpec.describe 'groups/group_members/index', :aggregate_failures, feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } # rubocop:todo RSpec/FactoryBot/AvoidCreate let_it_be(:group) { create(:group) } # rubocop:todo RSpec/FactoryBot/AvoidCreate diff --git a/spec/views/groups/settings/_general.html.haml_spec.rb b/spec/views/groups/settings/_general.html.haml_spec.rb index 9f16e43be13..13503556046 100644 --- a/spec/views/groups/settings/_general.html.haml_spec.rb +++ b/spec/views/groups/settings/_general.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'groups/settings/_general.html.haml', feature_category: :subgroups do +RSpec.describe 'groups/settings/_general.html.haml', feature_category: :groups_and_projects do describe 'Group Settings README' do let_it_be(:group) { build_stubbed(:group) } let_it_be(:user) { build_stubbed(:admin) } diff --git a/spec/views/groups/show.html.haml_spec.rb b/spec/views/groups/show.html.haml_spec.rb index ac687f68ef6..c4142f4a245 100644 --- a/spec/views/groups/show.html.haml_spec.rb +++ b/spec/views/groups/show.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'groups/show', feature_category: :subgroups do +RSpec.describe 'groups/show', feature_category: :groups_and_projects do describe 'group README' do let_it_be(:group) { build_stubbed(:group) } let_it_be(:readme_project) { build_stubbed(:project, :readme) } diff --git a/spec/views/layouts/group.html.haml_spec.rb b/spec/views/layouts/group.html.haml_spec.rb index 0b8f735a1d6..d1f262cda1f 100644 --- a/spec/views/layouts/group.html.haml_spec.rb +++ b/spec/views/layouts/group.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'layouts/group', feature_category: :subgroups do +RSpec.describe 'layouts/group', feature_category: :groups_and_projects do let_it_be(:group) { create(:group) } # rubocop:todo RSpec/FactoryBot/AvoidCreate let(:invite_member) { true } diff --git a/spec/views/layouts/project.html.haml_spec.rb b/spec/views/layouts/project.html.haml_spec.rb index 588828f7bd6..d19c600d9f2 100644 --- a/spec/views/layouts/project.html.haml_spec.rb +++ b/spec/views/layouts/project.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'layouts/project', feature_category: :projects do +RSpec.describe 'layouts/project', feature_category: :groups_and_projects do let(:invite_member) { true } before do diff --git a/spec/views/projects/_files.html.haml_spec.rb b/spec/views/projects/_files.html.haml_spec.rb index 618a0948739..96c6c2bdfab 100644 --- a/spec/views/projects/_files.html.haml_spec.rb +++ b/spec/views/projects/_files.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'projects/_files', feature_category: :projects do +RSpec.describe 'projects/_files', feature_category: :groups_and_projects do let_it_be(:template) { 'projects/files' } let_it_be(:namespace) { build_stubbed(:namespace) } let_it_be(:user) { build_stubbed(:user, namespace: namespace) } diff --git a/spec/views/projects/project_members/index.html.haml_spec.rb b/spec/views/projects/project_members/index.html.haml_spec.rb index 2fcc5c6935b..7a32a8562e0 100644 --- a/spec/views/projects/project_members/index.html.haml_spec.rb +++ b/spec/views/projects/project_members/index.html.haml_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe 'projects/project_members/index', :aggregate_failures, feature_category: :projects do +RSpec.describe 'projects/project_members/index', :aggregate_failures, feature_category: :groups_and_projects do let_it_be(:user) { create(:user) } # rubocop:todo RSpec/FactoryBot/AvoidCreate let_it_be(:project) { create(:project, :empty_repo, :with_namespace_settings).present(current_user: user) } # rubocop:todo RSpec/FactoryBot/AvoidCreate diff --git a/spec/workers/ci/pending_builds/update_group_worker_spec.rb b/spec/workers/ci/pending_builds/update_group_worker_spec.rb index c16262c0502..bd278f4c923 100644 --- a/spec/workers/ci/pending_builds/update_group_worker_spec.rb +++ b/spec/workers/ci/pending_builds/update_group_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Ci::PendingBuilds::UpdateGroupWorker, feature_category: :subgroups do +RSpec.describe Ci::PendingBuilds::UpdateGroupWorker, feature_category: :groups_and_projects do describe '#perform' do let(:worker) { described_class.new } diff --git a/spec/workers/ci/pending_builds/update_project_worker_spec.rb b/spec/workers/ci/pending_builds/update_project_worker_spec.rb index 281b4fb920b..d50209fba90 100644 --- a/spec/workers/ci/pending_builds/update_project_worker_spec.rb +++ b/spec/workers/ci/pending_builds/update_project_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Ci::PendingBuilds::UpdateProjectWorker, feature_category: :projects do +RSpec.describe Ci::PendingBuilds::UpdateProjectWorker, feature_category: :groups_and_projects do describe '#perform' do let(:worker) { described_class.new } diff --git a/spec/workers/disallow_two_factor_for_group_worker_spec.rb b/spec/workers/disallow_two_factor_for_group_worker_spec.rb index c732f8a3d00..a7a5a4ae279 100644 --- a/spec/workers/disallow_two_factor_for_group_worker_spec.rb +++ b/spec/workers/disallow_two_factor_for_group_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe DisallowTwoFactorForGroupWorker, feature_category: :subgroups do +RSpec.describe DisallowTwoFactorForGroupWorker, feature_category: :groups_and_projects do let_it_be(:group) { create(:group, require_two_factor_authentication: true) } let_it_be(:user) { create(:user, require_two_factor_authentication_from_group: true) } diff --git a/spec/workers/disallow_two_factor_for_subgroups_worker_spec.rb b/spec/workers/disallow_two_factor_for_subgroups_worker_spec.rb index 7584355deab..e5871ba8c21 100644 --- a/spec/workers/disallow_two_factor_for_subgroups_worker_spec.rb +++ b/spec/workers/disallow_two_factor_for_subgroups_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe DisallowTwoFactorForSubgroupsWorker, feature_category: :subgroups do +RSpec.describe DisallowTwoFactorForSubgroupsWorker, feature_category: :groups_and_projects do let_it_be(:group) { create(:group) } let_it_be(:subgroup_with_2fa) { create(:group, parent: group, require_two_factor_authentication: true) } let_it_be(:subgroup_without_2fa) { create(:group, parent: group, require_two_factor_authentication: false) } diff --git a/spec/workers/group_destroy_worker_spec.rb b/spec/workers/group_destroy_worker_spec.rb index fba4573718a..1bb2959f980 100644 --- a/spec/workers/group_destroy_worker_spec.rb +++ b/spec/workers/group_destroy_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe GroupDestroyWorker, feature_category: :subgroups do +RSpec.describe GroupDestroyWorker, feature_category: :groups_and_projects do let_it_be(:group) { create(:group) } let_it_be(:project) { create(:project, namespace: group) } let_it_be(:user) { create(:user) } diff --git a/spec/workers/member_invitation_reminder_emails_worker_spec.rb b/spec/workers/member_invitation_reminder_emails_worker_spec.rb index 4c6295285ea..0a58939c0f5 100644 --- a/spec/workers/member_invitation_reminder_emails_worker_spec.rb +++ b/spec/workers/member_invitation_reminder_emails_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe MemberInvitationReminderEmailsWorker, feature_category: :subgroups do +RSpec.describe MemberInvitationReminderEmailsWorker, feature_category: :groups_and_projects do describe '#perform' do subject { described_class.new.perform } diff --git a/spec/workers/packages/debian/process_changes_worker_spec.rb b/spec/workers/packages/debian/process_changes_worker_spec.rb index ddd608e768c..435ca33b223 100644 --- a/spec/workers/packages/debian/process_changes_worker_spec.rb +++ b/spec/workers/packages/debian/process_changes_worker_spec.rb @@ -8,7 +8,7 @@ RSpec.describe Packages::Debian::ProcessChangesWorker, type: :worker, feature_ca create(:debian_project_distribution, :with_file, codename: FFaker::Lorem.word, suite: 'unstable') end - let(:incoming) { create(:debian_incoming, project: distribution.project) } + let(:incoming) { create(:debian_incoming, project: distribution.project, with_changes_file: true) } let(:package_file) { incoming.package_files.with_file_name('sample_1.2.3~alpha2_amd64.changes').first } let(:worker) { described_class.new } diff --git a/spec/workers/packages/debian/process_package_file_worker_spec.rb b/spec/workers/packages/debian/process_package_file_worker_spec.rb index 6010f4eac27..1ef3119ecd3 100644 --- a/spec/workers/packages/debian/process_package_file_worker_spec.rb +++ b/spec/workers/packages/debian/process_package_file_worker_spec.rb @@ -3,119 +3,147 @@ require 'spec_helper' RSpec.describe Packages::Debian::ProcessPackageFileWorker, type: :worker, feature_category: :package_registry do - let_it_be_with_reload(:distribution) { create(:debian_project_distribution, :with_file) } - let_it_be_with_reload(:package) do - create(:debian_package, :processing, project: distribution.project, published_in: nil) + shared_examples 'returns early without error' do + it 'returns early without error' do + expect(Gitlab::ErrorTracking).not_to receive(:log_exception) + expect(::Packages::Debian::ProcessPackageFileService).not_to receive(:new) + + subject + end end - let(:distribution_name) { distribution.codename } - let(:debian_file_metadatum) { package_file.debian_file_metadatum } - let(:worker) { described_class.new } + let_it_be_with_reload(:distribution) { create(:debian_project_distribution, :with_file) } + let_it_be_with_reload(:incoming) { create(:debian_incoming, project: distribution.project) } + let_it_be_with_reload(:temp_with_changes) { create(:debian_temporary_with_changes, project: distribution.project) } + let_it_be_with_reload(:temp_with_files) { create(:debian_temporary_with_files, project: distribution.project) } describe '#perform' do + let(:package) { temp_with_files } + let(:package_file) { package.package_files.with_file_name('libsample0_1.2.3~alpha2_amd64.deb').first } + let(:debian_file_metadatum) { package_file.debian_file_metadatum } + let(:worker) { described_class.new } + let(:package_file_id) { package_file.id } + let(:distribution_name) { distribution.codename } + let(:component_name) { 'main' } subject { worker.perform(package_file_id, distribution_name, component_name) } - shared_examples 'returns early without error' do - it 'returns early without error' do - expect(Gitlab::ErrorTracking).not_to receive(:log_exception) - expect(::Packages::Debian::ProcessPackageFileService).not_to receive(:new) + context 'with non existing package file' do + let(:package_file_id) { non_existing_record_id } - subject - end + it_behaves_like 'returns early without error' end - using RSpec::Parameterized::TableSyntax + context 'with nil package file id' do + let(:package_file_id) { nil } - where(:case_name, :expected_file_type, :file_name, :component_name) do - 'with a deb' | 'deb' | 'libsample0_1.2.3~alpha2_amd64.deb' | 'main' - 'with an udeb' | 'udeb' | 'sample-udeb_1.2.3~alpha2_amd64.udeb' | 'contrib' - 'with a ddeb' | 'ddeb' | 'sample-ddeb_1.2.3~alpha2_amd64.ddeb' | 'main' + it_behaves_like 'returns early without error' end - with_them do - context 'with Debian package file' do - let(:package_file) { package.package_files.with_file_name(file_name).first } - - context 'with mocked service' do - it 'calls ProcessPackageFileService' do - expect(Gitlab::ErrorTracking).not_to receive(:log_exception) - expect_next_instance_of(::Packages::Debian::ProcessPackageFileService) do |service| - expect(service).to receive(:execute) - .with(no_args) - end - - subject - end - end + context 'with already processed package file' do + let_it_be(:package_file) { create(:debian_package_file) } - context 'when the service raises an error' do - let(:package_file) { package.package_files.with_file_name('sample_1.2.3~alpha2.tar.xz').first } - - it 'marks the package as errored', :aggregate_failures do - expect(Gitlab::ErrorTracking).to receive(:log_exception).with( - instance_of(ArgumentError), - package_file_id: package_file_id, - distribution_name: distribution_name, - component_name: component_name - ) - expect { subject } - .to not_change(Packages::Package, :count) - .and not_change { Packages::PackageFile.count } - .and not_change { package.package_files.count } - .and change { package_file.reload.status }.to('error') - .and change { package.reload.status }.from('processing').to('error') - end - end + it_behaves_like 'returns early without error' + end - it_behaves_like 'an idempotent worker' do - let(:job_args) { [package_file.id, distribution_name, component_name] } - - it 'sets the Debian file type as deb', :aggregate_failures do - expect(::Packages::Debian::GenerateDistributionWorker) - .to receive(:perform_async).with(:project, distribution.id) - expect(Gitlab::ErrorTracking).not_to receive(:log_exception) - - # Using subject inside this block will process the job multiple times - expect { subject } - .to not_change(Packages::Package, :count) - .and not_change(Packages::PackageFile, :count) - .and change { Packages::Debian::Publication.count }.by(1) - .and not_change(package.package_files, :count) - .and change { package.reload.name }.to('sample') - .and change { package.version }.to('1.2.3~alpha2') - .and change { package.status }.from('processing').to('default') - .and change { package.debian_publication }.from(nil) - .and change { debian_file_metadatum.reload.file_type }.from('unknown').to(expected_file_type) - .and change { debian_file_metadatum.component }.from(nil).to(component_name) - end + context 'with mocked service' do + it 'calls ProcessPackageFileService' do + expect(Gitlab::ErrorTracking).not_to receive(:log_exception) + expect_next_instance_of(::Packages::Debian::ProcessPackageFileService) do |service| + expect(service).to receive(:execute) + .with(no_args) end + + subject end end - context 'with already processed package file' do - let_it_be(:package_file) { create(:debian_package_file) } - - let(:component_name) { 'main' } - - it_behaves_like 'returns early without error' + context 'when the service raises an error' do + let(:package_file) { package.package_files.with_file_name('sample_1.2.3~alpha2.tar.xz').first } + + it 'marks the package as errored', :aggregate_failures do + expect(Gitlab::ErrorTracking).to receive(:log_exception).with( + instance_of(ArgumentError), + package_file_id: package_file_id, + distribution_name: distribution_name, + component_name: component_name + ) + expect { subject } + .to not_change(Packages::Package, :count) + .and not_change { Packages::PackageFile.count } + .and not_change { package.package_files.count } + .and change { package_file.reload.status }.to('error') + .and change { package.reload.status }.from('processing').to('error') + end end - context 'with a deb' do - let(:package_file) { package.package_files.with_file_name('libsample0_1.2.3~alpha2_amd64.deb').first } - let(:component_name) { 'main' } + context 'with a Debian changes file' do + let(:package) { temp_with_changes } + let(:package_file) { package.package_files.first } + let(:distribution_name) { nil } + let(:component_name) { nil } - context 'with non existing package file' do - let(:package_file_id) { non_existing_record_id } + before do + distribution.update! suite: 'unstable' + end - it_behaves_like 'returns early without error' + it_behaves_like 'an idempotent worker' do + let(:job_args) { [package_file.id, distribution_name, component_name] } + + it 'sets the Debian file type to changes', :aggregate_failures do + expect(::Packages::Debian::GenerateDistributionWorker) + .to receive(:perform_async).with(:project, distribution.id) + expect(Gitlab::ErrorTracking).not_to receive(:log_exception) + + # Using subject inside this block will process the job multiple times + expect { subject } + .to not_change(Packages::Package, :count) + .and not_change(Packages::PackageFile, :count) + .and change { Packages::Debian::Publication.count }.by(1) + .and change { package.package_files.count }.from(1).to(8) + .and change { package.reload.name }.to('sample') + .and change { package.version }.to('1.2.3~alpha2') + .and change { package.status }.from('processing').to('default') + .and change { package.debian_publication }.from(nil) + .and change { debian_file_metadatum.reload.file_type }.from('unknown').to('changes') + .and not_change { debian_file_metadatum.component } + end end + end + + using RSpec::Parameterized::TableSyntax - context 'with nil package file id' do - let(:package_file_id) { nil } + where(:case_name, :expected_file_type, :file_name, :component_name) do + 'with a deb' | 'deb' | 'libsample0_1.2.3~alpha2_amd64.deb' | 'main' + 'with an udeb' | 'udeb' | 'sample-udeb_1.2.3~alpha2_amd64.udeb' | 'contrib' + 'with a ddeb' | 'ddeb' | 'sample-ddeb_1.2.3~alpha2_amd64.ddeb' | 'main' + end - it_behaves_like 'returns early without error' + with_them do + let(:package_file) { package.package_files.with_file_name(file_name).first } + + it_behaves_like 'an idempotent worker' do + let(:job_args) { [package_file.id, distribution_name, component_name] } + + it 'sets the correct Debian file type', :aggregate_failures do + expect(::Packages::Debian::GenerateDistributionWorker) + .to receive(:perform_async).with(:project, distribution.id) + expect(Gitlab::ErrorTracking).not_to receive(:log_exception) + + # Using subject inside this block will process the job multiple times + expect { subject } + .to not_change(Packages::Package, :count) + .and not_change(Packages::PackageFile, :count) + .and change { Packages::Debian::Publication.count }.by(1) + .and not_change(package.package_files, :count) + .and change { package.reload.name }.to('sample') + .and change { package.version }.to('1.2.3~alpha2') + .and change { package.status }.from('processing').to('default') + .and change { package.debian_publication }.from(nil) + .and change { debian_file_metadatum.reload.file_type }.from('unknown').to(expected_file_type) + .and change { debian_file_metadatum.component }.from(nil).to(component_name) + end end end end diff --git a/spec/workers/projects/finalize_project_statistics_refresh_worker_spec.rb b/spec/workers/projects/finalize_project_statistics_refresh_worker_spec.rb index 1379b6785eb..da2d35e97d8 100644 --- a/spec/workers/projects/finalize_project_statistics_refresh_worker_spec.rb +++ b/spec/workers/projects/finalize_project_statistics_refresh_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::FinalizeProjectStatisticsRefreshWorker, feature_category: :projects do +RSpec.describe Projects::FinalizeProjectStatisticsRefreshWorker, feature_category: :groups_and_projects do let_it_be(:record) { create(:project_build_artifacts_size_refresh, :finalizing) } describe '#perform' do diff --git a/spec/workers/projects/record_target_platforms_worker_spec.rb b/spec/workers/projects/record_target_platforms_worker_spec.rb index 0e106fe32f9..ecb6aab7349 100644 --- a/spec/workers/projects/record_target_platforms_worker_spec.rb +++ b/spec/workers/projects/record_target_platforms_worker_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::RecordTargetPlatformsWorker, feature_category: :projects do +RSpec.describe Projects::RecordTargetPlatformsWorker, feature_category: :groups_and_projects do include ExclusiveLeaseHelpers let_it_be(:swift) { create(:programming_language, name: 'Swift') } diff --git a/tests.yml b/tests.yml index dee78aae486..f93932201d3 100644 --- a/tests.yml +++ b/tests.yml @@ -1,133 +1,121 @@ mapping: - # EE app should map to respective spec - - source: ee/app/(.+)\.rb - test: ee/spec/%s_spec.rb - - # FOSS app should map to respective spec - - source: app/(.+)\.rb - test: spec/%s_spec.rb + # EE/FOSS app should map to respective spec + - source: '(ee/)?app/(.+)\.rb' + test: '%sspec/%s_spec.rb' # EE extension should also map to its FOSS class spec - - source: ee/app/(.*/)ee/(.+)\.rb - test: spec/%s%s_spec.rb + - source: 'ee/app/(.*/)ee/(.+)\.rb' + test: 'spec/%s%s_spec.rb' # Some EE extensions also map to its EE class spec, but this is not recommended: # https://docs.gitlab.com/ee/development/ee_features.html#testing-ee-features-based-on-ce-features - - source: ee/app/(.*/)ee/(.+)\.rb - test: ee/spec/%s%s_spec.rb + - source: 'ee/app/(.*/)ee/(.+)\.rb' + test: 'ee/spec/%s%s_spec.rb' - # EE lib should map to respective spec - - source: ee/lib/(.+)\.rb - test: ee/spec/lib/%s_spec.rb - - # FOSS lib should map to respective spec - - source: lib/(.+)\.rb - test: spec/lib/%s_spec.rb + # EE/FOSS lib should map to respective spec + - source: '(ee/)?lib/(.+)\.rb' + test: '%sspec/lib/%s_spec.rb' # Map rake tasks to its respective specs - source: '(ee/)?lib/tasks/(.+)\.rake' test: '%sspec/tasks/%s_rake_spec.rb' # See https://gitlab.com/gitlab-org/gitlab/-/issues/368628 - - source: lib/gitlab/usage_data_counters/(.+)\.rb - test: spec/lib/gitlab/usage_data_spec.rb + - source: '(ee/)?lib/gitlab/usage_data_counters/(.+)\.rb' + test: 'spec/lib/gitlab/usage_data_spec.rb' # See https://gitlab.com/gitlab-org/quality/engineering-productivity/master-broken-incidents/-/issues/54#note_1160811638 - - source: lib/gitlab/ci/config/(.+)\.rb - test: spec/lib/gitlab/ci/yaml_processor_spec.rb - - source: ee/lib/gitlab/ci/config/(.+)\.rb - test: spec/lib/gitlab/ci/yaml_processor_spec.rb - - source: ee/lib/gitlab/ci/config/(.+)\.rb - test: ee/spec/lib/gitlab/ci/yaml_processor_spec.rb + - source: '(ee/)?lib/gitlab/ci/config/(.+)\.rb' + test: 'spec/lib/gitlab/ci/yaml_processor_spec.rb' + - source: 'ee/lib/gitlab/ci/config/(.+)\.rb' + test: 'ee/spec/lib/gitlab/ci/yaml_processor_spec.rb' # FOSS tooling should map to respective spec - - source: tooling/(.+)\.rb - test: spec/tooling/%s_spec.rb + - source: 'tooling/(.+)\.rb' + test: 'spec/tooling/%s_spec.rb' # RuboCop related specs - - source: rubocop/(.+)\.rb - test: spec/rubocop/%s_spec.rb + - source: 'rubocop/(.+)\.rb' + test: 'spec/rubocop/%s_spec.rb' # Initializers should map to respective spec - - source: config/initializers/(.+)\.rb - test: spec/initializers/%s_spec.rb + - source: 'config/initializers/(.+)\.rb' + test: 'spec/initializers/%s_spec.rb' # DB structure should map to schema spec - - source: db/structure.sql - test: spec/db/schema_spec.rb + - source: 'db/structure.sql' + test: 'spec/db/schema_spec.rb' # Migration should map to either timestamped or non-timestamped spec - - source: db/(?:post_)?migrate/(?:[0-9]+)_(.+)\.rb - test: spec/migrations/%s_spec.rb - - source: db/(?:post_)?migrate/([0-9]+)_(.+)\.rb - test: spec/migrations/%s_%s_spec.rb + - source: 'db/(?:post_)?migrate/(?:[0-9]+)_(.+)\.rb' + test: 'spec/migrations/%s_spec.rb' + - source: 'db/(?:post_)?migrate/([0-9]+)_(.+)\.rb' + test: 'spec/migrations/%s_%s_spec.rb' # EE/FOSS views should map to respective spec - - source: (ee/)?app/views/(.+)\.haml + - source: '(ee/)?app/views/(.+)\.haml' test: '%sspec/views/%s.haml_spec.rb' # EE/FOSS spec code should map to itself - - source: (ee/)?spec/(.+)_spec\.rb - test: '%sspec/%s_spec.rb' + - source: '(.+)_spec\.rb' + test: '%s_spec.rb' # EE extension spec should map to its FOSS class spec - - source: ee/spec/(.*/)ee/(.+)\.rb - test: spec/%s%s.rb + - source: 'ee/spec/(.*/)ee/(.+)\.rb' + test: 'spec/%s%s.rb' # EE/FOSS factory should map to factories spec - - source: (ee/)?spec/factories/.+\.rb - test: ee/spec/models/factories_spec.rb + - source: '(ee/)?spec/factories/.+\.rb' + test: 'ee/spec/models/factories_spec.rb' # Whats New should map to its respective spec - - source: data/whats_new/\w*.yml - test: spec/lib/release_highlights/validator_spec.rb + - source: 'data/whats_new/\w*.yml' + test: 'spec/lib/release_highlights/validator_spec.rb' # The documentation index page is used in this haml_lint spec - - source: doc/index.md - test: spec/haml_lint/linter/documentation_links_spec.rb + - source: 'doc/index.md' + test: 'spec/haml_lint/linter/documentation_links_spec.rb' - - source: (ee/)?app/workers/.+\.rb - test: spec/workers/every_sidekiq_worker_spec.rb + - source: '(ee/)?app/workers/.+\.rb' + test: 'spec/workers/every_sidekiq_worker_spec.rb' - - source: lib/gitlab/usage_data_counters/known_events/.+\.yml - test: spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb - - source: lib/gitlab/usage_data_counters/known_events/.+\.yml - test: spec/lib/gitlab/usage_data_spec.rb + - source: 'lib/gitlab/usage_data_counters/known_events/.+\.yml' + test: 'spec/lib/gitlab/usage_data_counters/hll_redis_counter_spec.rb' + - source: 'lib/gitlab/usage_data_counters/known_events/.+\.yml' + test: 'spec/lib/gitlab/usage_data_spec.rb' # Mailer previews - - source: (ee/)?app/mailers/previews/.+\.rb - test: spec/mailers/previews_spec.rb - - source: ee/app/mailers/ee/preview/.+\.rb - test: spec/mailers/previews_spec.rb + - source: '(ee/)?app/mailers/(ee/)?previews/.+\.rb' + test: 'spec/mailers/previews_spec.rb' ## GLFM spec and config files for CE and EE should map to respective markdown snapshot specs - - source: glfm_specification/.+ - test: spec/requests/api/markdown_snapshot_spec.rb - - source: glfm_specification/.+ - test: ee/spec/requests/api/markdown_snapshot_spec.rb + - source: 'glfm_specification/.+' + test: 'spec/requests/api/markdown_snapshot_spec.rb' + - source: 'glfm_specification/.+' + test: 'ee/spec/requests/api/markdown_snapshot_spec.rb' # Any change to metrics definition should trigger the specs in the ee/spec/config/metrics/ folder. # # Note: We only have those tests for ee, even though we have non-ee metrics. # # See https://gitlab.com/gitlab-org/quality/engineering-productivity/master-broken-incidents/-/issues/287#note_1192008962 - - source: ee/config/metrics/.*.yml - test: ee/spec/config/metrics/every_metric_definition_spec.rb - - source: ee/lib/ee/gitlab/usage_data_counters/known_events/.*.yml - test: ee/spec/config/metrics/every_metric_definition_spec.rb + - source: 'ee/config/metrics/.*.yml' + test: 'ee/spec/config/metrics/every_metric_definition_spec.rb' + - source: 'ee/lib/ee/gitlab/usage_data_counters/known_events/.*.yml' + test: 'ee/spec/config/metrics/every_metric_definition_spec.rb' # See https://gitlab.com/gitlab-org/quality/engineering-productivity/team/-/issues/146 - - source: config/feature_categories.yml - test: spec/db/docs_spec.rb - - source: config/feature_categories.yml - test: ee/spec/lib/ee/gitlab/database/docs/docs_spec.rb + - source: 'config/feature_categories.yml' + test: 'spec/db/docs_spec.rb' + - source: 'config/feature_categories.yml' + test: 'ee/spec/lib/ee/gitlab/database/docs/docs_spec.rb' # See https://gitlab.com/gitlab-org/quality/engineering-productivity/master-broken-incidents/-/issues/1360 - - source: vendor/project_templates/.* - test: spec/lib/gitlab/project_template_spec.rb + - source: 'vendor/project_templates/.*' + test: 'spec/lib/gitlab/project_template_spec.rb' # See https://gitlab.com/gitlab-org/quality/engineering-productivity/master-broken-incidents/-/issues/1683#note_1385966977 - - source: app/finders/members_finder.rb - test: spec/graphql/types/project_member_relation_enum_spec.rb - - source: app/finders/group_members_finder.rb - test: spec/graphql/types/group_member_relation_enum_spec.rb + - source: 'app/finders/members_finder.rb' + test: 'spec/graphql/types/project_member_relation_enum_spec.rb' + - source: 'app/finders/group_members_finder.rb' + test: 'spec/graphql/types/group_member_relation_enum_spec.rb' |