+
### Rate limits for common User, Project, and Group API endpoints
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 54b6dec1ff1..3ce4f06045e 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -3095,9 +3095,6 @@ msgstr ""
msgid "Active project access tokens"
msgstr ""
-msgid "Active tab: %{tab}"
-msgstr ""
-
msgid "Activity"
msgstr ""
@@ -5810,6 +5807,9 @@ msgstr ""
msgid "An error occurred fetching the public deploy keys. Please try again."
msgstr ""
+msgid "An error occurred loading the projects. Please refresh the page to try again."
+msgstr ""
+
msgid "An error occurred previewing the blob"
msgstr ""
@@ -28133,12 +28133,18 @@ msgstr ""
msgid "InProductMarketing|%{upper_start}Free 30-day trial%{upper_end} %{lower_start}GitLab Ultimate%{lower_end}"
msgstr ""
+msgid "InProductMarketing|%{upper_start}Free 60-day trial%{upper_end} %{lower_start}GitLab Ultimate & GitLab Duo Enterprise%{lower_end} %{last_start}Sign up for a free trial of the most comprehensive AI-powered DevSecOps Platform%{last_end}"
+msgstr ""
+
msgid "InProductMarketing|Accelerate your digital transformation"
msgstr ""
msgid "InProductMarketing|Blog"
msgstr ""
+msgid "InProductMarketing|Boost efficiency and collaboration"
+msgstr ""
+
msgid "InProductMarketing|Build in security"
msgstr ""
@@ -28148,6 +28154,9 @@ msgstr ""
msgid "InProductMarketing|Deliver software faster"
msgstr ""
+msgid "InProductMarketing|End-to-end security and compliance"
+msgstr ""
+
msgid "InProductMarketing|Ensure compliance"
msgstr ""
@@ -28157,6 +28166,9 @@ msgstr ""
msgid "InProductMarketing|Free guest users"
msgstr ""
+msgid "InProductMarketing|GitLab Duo Enterprise: AI across the software development lifecycle"
+msgstr ""
+
msgid "InProductMarketing|If you don't want to receive marketing emails directly from GitLab, %{marketing_preference_link}."
msgstr ""
@@ -28175,6 +28187,12 @@ msgstr ""
msgid "InProductMarketing|No credit card required."
msgstr ""
+msgid "InProductMarketing|One platform for Dev, Sec, and Ops teams"
+msgstr ""
+
+msgid "InProductMarketing|Ship secure software faster"
+msgstr ""
+
msgid "InProductMarketing|Start a Self-Managed trial"
msgstr ""
diff --git a/qa/Gemfile b/qa/Gemfile
index 810380958e3..8791f8d396a 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -24,7 +24,7 @@ gem 'rainbow', '~> 3.1.1'
gem 'rspec-parameterized', '~> 1.0.2'
gem 'octokit', '~> 9.1.0', require: false
gem "faraday-retry", "~> 2.2", ">= 2.2.1"
-gem 'zeitwerk', '~> 2.6', '>= 2.6.17'
+gem 'zeitwerk', '~> 2.6', '>= 2.6.18'
gem 'influxdb-client', '~> 3.1'
gem 'terminal-table', '~> 3.0.2', require: false
gem 'slack-notifier', '~> 2.4', require: false
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index 14f8ba8300a..852d7dd29b9 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -358,7 +358,7 @@ GEM
wisper (2.0.1)
xpath (3.2.0)
nokogiri (~> 1.8)
- zeitwerk (2.6.17)
+ zeitwerk (2.6.18)
PLATFORMS
ruby
@@ -400,7 +400,7 @@ DEPENDENCIES
slack-notifier (~> 2.4)
terminal-table (~> 3.0.2)
warning (~> 1.4)
- zeitwerk (~> 2.6, >= 2.6.17)
+ zeitwerk (~> 2.6, >= 2.6.18)
BUNDLED WITH
2.5.11
diff --git a/spec/features/dashboard/projects_spec.rb b/spec/features/dashboard/projects_spec.rb
index 0af3199fd32..c5758e5d743 100644
--- a/spec/features/dashboard/projects_spec.rb
+++ b/spec/features/dashboard/projects_spec.rb
@@ -21,7 +21,7 @@ RSpec.describe 'Dashboard Projects', :js, feature_category: :groups_and_projects
visit dashboard_projects_path
expect(page).to have_content('Projects')
- expect(page).to have_content('Active tab: Contributed')
+ expect(page).to have_selector('a[aria-selected="true"]', text: 'Contributed')
end
end
diff --git a/spec/frontend/fixtures/projects.rb b/spec/frontend/fixtures/projects.rb
index 195ce9b6d31..115f939f39d 100644
--- a/spec/frontend/fixtures/projects.rb
+++ b/spec/frontend/fixtures/projects.rb
@@ -6,15 +6,12 @@ RSpec.describe 'Projects (JavaScript fixtures)', type: :controller, feature_cate
include ApiHelpers
include JavaScriptFixturesHelpers
- runners_token = 'runnerstoken:intabulasreferre'
-
let(:namespace) { create(:namespace, name: 'frontend-fixtures') }
let(:project) do
create(
:project,
namespace: namespace,
path: 'builds-project',
- runners_token: runners_token,
avatar: fixture_file_upload('spec/fixtures/dk.png', 'image/png')
)
end
@@ -28,15 +25,6 @@ RSpec.describe 'Projects (JavaScript fixtures)', type: :controller, feature_cate
)
end
- let(:project_variable_populated) do
- create(
- :project,
- namespace: namespace,
- path: 'builds-project2',
- runners_token: runners_token
- )
- end
-
let(:user) { project.first_owner }
render_views
@@ -70,28 +58,6 @@ RSpec.describe 'Projects (JavaScript fixtures)', type: :controller, feature_cate
end
end
- describe GraphQL::Query, type: :request do
- include GraphqlHelpers
-
- context 'for access token projects query' do
- before do
- project_variable_populated.add_maintainer(user)
- end
-
- base_input_path = 'access_tokens/graphql/queries/'
- base_output_path = 'graphql/projects/access_tokens/'
- query_name = 'get_projects.query.graphql'
-
- it "#{base_output_path}#{query_name}.json" do
- query = get_graphql_query_as_string("#{base_input_path}#{query_name}")
-
- post_graphql(query, current_user: user, variables: { search: '', first: 2 })
-
- expect_graphql_errors_to_be_empty
- end
- end
- end
-
describe 'Storage', feature_category: :consumables_cost_management do
describe GraphQL::Query, type: :request do
include GraphqlHelpers
@@ -152,3 +118,68 @@ RSpec.describe API::Projects, '(JavaScript fixtures)', type: :request, feature_c
expect(response).to have_gitlab_http_status(:bad_request)
end
end
+
+RSpec.describe GraphQL::Query, type: :request, feature_category: :groups_and_projects do
+ include JavaScriptFixturesHelpers
+ include GraphqlHelpers
+
+ runners_token = 'runnerstoken:intabulasreferre'
+
+ let_it_be(:project_variable_populated) do
+ create(
+ :project,
+ runners_token: runners_token
+ )
+ end
+
+ let_it_be(:project) { create(:project) }
+ let_it_be(:project2) { create(:project) }
+
+ let_it_be(:user) { create(:user) }
+
+ before do
+ sign_in(user)
+ end
+
+ context 'for access token projects query' do
+ before_all do
+ project_variable_populated.add_maintainer(user)
+ end
+
+ base_input_path = 'access_tokens/graphql/queries/'
+ base_output_path = 'graphql/projects/access_tokens/'
+ query_name = 'get_projects.query.graphql'
+
+ it "#{base_output_path}#{query_name}.json" do
+ query = get_graphql_query_as_string("#{base_input_path}#{query_name}")
+
+ post_graphql(query, current_user: user, variables: { search: '', first: 2 })
+
+ expect_graphql_errors_to_be_empty
+ end
+ end
+
+ context 'for your work -> projects -> contributed' do
+ before_all do
+ project.add_maintainer(user)
+ project2.add_maintainer(user)
+ end
+
+ before do
+ create(:push_event, project: project, author: user)
+ create(:push_event, project: project2, author: user)
+ end
+
+ base_input_path = 'projects/your_work/graphql/queries/'
+ base_output_path = 'graphql/projects/your_work/'
+ query_name = 'contributed_projects.query.graphql'
+
+ it "#{base_output_path}#{query_name}.json" do
+ query = get_graphql_query_as_string("#{base_input_path}#{query_name}")
+
+ post_graphql(query, current_user: user)
+
+ expect_graphql_errors_to_be_empty
+ end
+ end
+end
diff --git a/spec/frontend/organizations/shared/components/projects_view_spec.js b/spec/frontend/organizations/shared/components/projects_view_spec.js
index fe8d0042c6b..5be5b9a3321 100644
--- a/spec/frontend/organizations/shared/components/projects_view_spec.js
+++ b/spec/frontend/organizations/shared/components/projects_view_spec.js
@@ -7,12 +7,9 @@ import { SORT_DIRECTION_ASC, SORT_ITEM_NAME } from '~/organizations/shared/const
import NewProjectButton from '~/organizations/shared/components/new_project_button.vue';
import GroupsAndProjectsEmptyState from '~/organizations/shared/components/groups_and_projects_empty_state.vue';
import projectsQuery from '~/organizations/shared/graphql/queries/projects.query.graphql';
-import {
- renderDeleteSuccessToast,
- deleteParams,
- formatProjects,
-} from 'ee_else_ce/organizations/shared/utils';
+import { renderDeleteSuccessToast, deleteParams } from 'ee_else_ce/organizations/shared/utils';
import ProjectsList from '~/vue_shared/components/projects_list/projects_list.vue';
+import { formatGraphQLProjects } from '~/vue_shared/components/projects_list/utils';
import { ACTION_DELETE } from '~/vue_shared/components/list_actions/constants';
import { TIMESTAMP_TYPE_CREATED_AT } from '~/vue_shared/components/resource_lists/constants';
import { createAlert } from '~/alert';
@@ -185,7 +182,7 @@ describe('ProjectsView', () => {
await waitForPromises();
expect(findProjectsList().props()).toMatchObject({
- projects: formatProjects(nodes),
+ projects: formatGraphQLProjects(nodes),
showProjectIcon: true,
listItemClass: defaultPropsData.listItemClass,
timestampType: TIMESTAMP_TYPE_CREATED_AT,
@@ -330,7 +327,7 @@ describe('ProjectsView', () => {
});
describe('Deleting project', () => {
- const MOCK_PROJECT = formatProjects(nodes)[0];
+ const MOCK_PROJECT = formatGraphQLProjects(nodes)[0];
describe('when API call is successful', () => {
beforeEach(async () => {
diff --git a/spec/frontend/organizations/shared/utils_spec.js b/spec/frontend/organizations/shared/utils_spec.js
index 8dd18b31300..fc2613a6e79 100644
--- a/spec/frontend/organizations/shared/utils_spec.js
+++ b/spec/frontend/organizations/shared/utils_spec.js
@@ -1,7 +1,6 @@
import organizationGroupsGraphQlResponse from 'test_fixtures/graphql/organizations/groups.query.graphql.json';
import organizationProjectsGraphQlResponse from 'test_fixtures/graphql/organizations/projects.query.graphql.json';
import {
- formatProjects,
formatGroups,
onPageChange,
deleteParams,
@@ -11,6 +10,7 @@ import {
import { SORT_CREATED_AT, SORT_UPDATED_AT, SORT_NAME } from '~/organizations/shared/constants';
import { ACTION_EDIT, ACTION_DELETE } from '~/vue_shared/components/list_actions/constants';
import { getIdFromGraphQLId } from '~/graphql_shared/utils';
+import { formatGraphQLProjects } from '~/vue_shared/components/projects_list/utils';
import toast from '~/vue_shared/plugins/global_toast';
import {
TIMESTAMP_TYPE_CREATED_AT,
@@ -35,47 +35,6 @@ const {
},
} = organizationProjectsGraphQlResponse;
-describe('formatProjects', () => {
- it('correctly formats the projects', () => {
- const [firstMockProject] = organizationProjects;
- const formattedProjects = formatProjects(organizationProjects);
- const [firstFormattedProject] = formattedProjects;
-
- expect(firstFormattedProject).toMatchObject({
- id: getIdFromGraphQLId(firstMockProject.id),
- name: firstMockProject.nameWithNamespace,
- mergeRequestsAccessLevel: firstMockProject.mergeRequestsAccessLevel.stringValue,
- issuesAccessLevel: firstMockProject.issuesAccessLevel.stringValue,
- forkingAccessLevel: firstMockProject.forkingAccessLevel.stringValue,
- accessLevel: {
- integerValue: 50,
- },
- availableActions: [ACTION_EDIT, ACTION_DELETE],
- actionLoadingStates: {
- [ACTION_DELETE]: false,
- },
- });
-
- expect(formattedProjects.length).toBe(organizationProjects.length);
- });
-
- describe('when project does not have delete permissions', () => {
- const nonDeletableFormattedProject = formatProjects(organizationProjects)[1];
-
- it('does not include delete action in `availableActions`', () => {
- expect(nonDeletableFormattedProject.availableActions).toEqual([]);
- });
- });
-
- describe('when project does not have edit permissions', () => {
- const nonEditableFormattedProject = formatProjects(organizationProjects)[1];
-
- it('does not include edit action in `availableActions`', () => {
- expect(nonEditableFormattedProject.availableActions).toEqual([]);
- });
- });
-});
-
describe('formatGroups', () => {
it('correctly formats the groups with edit and delete permissions', () => {
const [firstMockGroup] = organizationGroups;
@@ -150,7 +109,7 @@ describe('onPageChange', () => {
});
describe('renderDeleteSuccessToast', () => {
- const [MOCK_PROJECT] = formatProjects(organizationProjects);
+ const [MOCK_PROJECT] = formatGraphQLProjects(organizationProjects);
const MOCK_TYPE = 'Project';
it('calls toast correctly', () => {
diff --git a/spec/frontend/projects/your_work/components/app_spec.js b/spec/frontend/projects/your_work/components/app_spec.js
index 91934cfacea..19293559834 100644
--- a/spec/frontend/projects/your_work/components/app_spec.js
+++ b/spec/frontend/projects/your_work/components/app_spec.js
@@ -3,7 +3,9 @@ import VueRouter from 'vue-router';
import { GlTabs } from '@gitlab/ui';
import { mountExtended } from 'helpers/vue_test_utils_helper';
import YourWorkProjectsApp from '~/projects/your_work/components/app.vue';
+import TabView from '~/projects/your_work/components/tab_view.vue';
import { createRouter } from '~/projects/your_work';
+import { stubComponent } from 'helpers/stub_component';
import {
ROOT_ROUTE_NAME,
DASHBOARD_ROUTE_NAME,
@@ -31,13 +33,16 @@ describe('YourWorkProjectsApp', () => {
wrapper = mountExtended(YourWorkProjectsApp, {
router,
+ stubs: {
+ TabView: stubComponent(TabView),
+ },
});
};
const findPageTitle = () => wrapper.find('h1');
const findGlTabs = () => wrapper.findComponent(GlTabs);
const findAllTabTitles = () => wrapper.findAllByTestId('projects-dashboard-tab-title');
- const findActiveTab = () => wrapper.find('.tab-pane.active');
+ const findActiveTab = () => wrapper.findByRole('tab', { selected: true });
afterEach(() => {
router = null;
@@ -81,6 +86,12 @@ describe('YourWorkProjectsApp', () => {
it('initializes to the correct tab', () => {
expect(findActiveTab().text()).toContain(expectedTab.text);
});
+
+ if (expectedTab.query) {
+ it('renders `TabView` component and passes `tab` prop', () => {
+ expect(wrapper.findComponent(TabView).props('tab')).toMatchObject(expectedTab);
+ });
+ }
});
describe('onTabUpdate', () => {
diff --git a/spec/frontend/projects/your_work/components/tab_view_spec.js b/spec/frontend/projects/your_work/components/tab_view_spec.js
new file mode 100644
index 00000000000..ea0159eb340
--- /dev/null
+++ b/spec/frontend/projects/your_work/components/tab_view_spec.js
@@ -0,0 +1,83 @@
+import Vue from 'vue';
+import { GlLoadingIcon } from '@gitlab/ui';
+import VueApollo from 'vue-apollo';
+import contributedProjectsGraphQlResponse from 'test_fixtures/graphql/projects/your_work/contributed_projects.query.graphql.json';
+import { mountExtended } from 'helpers/vue_test_utils_helper';
+import TabView from '~/projects/your_work/components/tab_view.vue';
+import ProjectsList from '~/vue_shared/components/projects_list/projects_list.vue';
+import contributedProjectsQuery from '~/projects/your_work/graphql/queries/contributed_projects.query.graphql';
+import { formatGraphQLProjects } from '~/vue_shared/components/projects_list/utils';
+import { createAlert } from '~/alert';
+import { CONTRIBUTED_TAB } from 'ee_else_ce/projects/your_work/constants';
+import createMockApollo from 'helpers/mock_apollo_helper';
+import waitForPromises from 'helpers/wait_for_promises';
+
+jest.mock('~/alert');
+
+Vue.use(VueApollo);
+
+describe('TabView', () => {
+ let wrapper;
+ let mockApollo;
+
+ const createComponent = ({ handler, propsData }) => {
+ mockApollo = createMockApollo([handler]);
+
+ wrapper = mountExtended(TabView, {
+ apolloProvider: mockApollo,
+ propsData,
+ });
+ };
+
+ afterEach(() => {
+ mockApollo = null;
+ });
+
+ describe.each`
+ tab | handler | expectedProjects
+ ${CONTRIBUTED_TAB} | ${[contributedProjectsQuery, jest.fn().mockResolvedValue(contributedProjectsGraphQlResponse)]} | ${contributedProjectsGraphQlResponse.data.currentUser.contributedProjects.nodes}
+ `('onMount when route name is $tab.value', ({ tab, handler, expectedProjects }) => {
+ describe('when GraphQL request is loading', () => {
+ beforeEach(() => {
+ createComponent({ handler, propsData: { tab } });
+ });
+
+ it('shows loading icon', () => {
+ expect(wrapper.findComponent(GlLoadingIcon).exists()).toBe(true);
+ });
+ });
+
+ describe('when GraphQL request is successful', () => {
+ beforeEach(async () => {
+ createComponent({ handler, propsData: { tab } });
+ await waitForPromises();
+ });
+
+ it('passes projects to `ProjectsList` component', () => {
+ expect(wrapper.findComponent(ProjectsList).props('projects')).toEqual(
+ formatGraphQLProjects(expectedProjects),
+ );
+ });
+ });
+
+ describe('when GraphQL request is not successful', () => {
+ const error = new Error();
+
+ beforeEach(async () => {
+ createComponent({
+ handler: [handler[0], jest.fn().mockRejectedValue(error)],
+ propsData: { tab },
+ });
+ await waitForPromises();
+ });
+
+ it('displays error alert', () => {
+ expect(createAlert).toHaveBeenCalledWith({
+ message: 'An error occurred loading the projects. Please refresh the page to try again.',
+ error,
+ captureError: true,
+ });
+ });
+ });
+ });
+});
diff --git a/spec/frontend/vue_shared/components/projects_list/utils_spec.js b/spec/frontend/vue_shared/components/projects_list/utils_spec.js
new file mode 100644
index 00000000000..906157e54d8
--- /dev/null
+++ b/spec/frontend/vue_shared/components/projects_list/utils_spec.js
@@ -0,0 +1,53 @@
+import projectsGraphQLResponse from 'test_fixtures/graphql/organizations/projects.query.graphql.json';
+import { formatGraphQLProjects } from '~/vue_shared/components/projects_list/utils';
+import { getIdFromGraphQLId } from '~/graphql_shared/utils';
+import { ACTION_EDIT, ACTION_DELETE } from '~/vue_shared/components/list_actions/constants';
+
+const {
+ data: {
+ organization: {
+ projects: { nodes: projects },
+ },
+ },
+} = projectsGraphQLResponse;
+
+describe('formatGraphQLProjects', () => {
+ it('correctly formats the projects', () => {
+ const [firstMockProject] = projects;
+ const formattedProjects = formatGraphQLProjects(projects);
+ const [firstFormattedProject] = formattedProjects;
+
+ expect(firstFormattedProject).toMatchObject({
+ id: getIdFromGraphQLId(firstMockProject.id),
+ name: firstMockProject.nameWithNamespace,
+ mergeRequestsAccessLevel: firstMockProject.mergeRequestsAccessLevel.stringValue,
+ issuesAccessLevel: firstMockProject.issuesAccessLevel.stringValue,
+ forkingAccessLevel: firstMockProject.forkingAccessLevel.stringValue,
+ accessLevel: {
+ integerValue: 50,
+ },
+ availableActions: [ACTION_EDIT, ACTION_DELETE],
+ actionLoadingStates: {
+ [ACTION_DELETE]: false,
+ },
+ });
+
+ expect(formattedProjects.length).toBe(projects.length);
+ });
+
+ describe('when project does not have delete permissions', () => {
+ const nonDeletableFormattedProject = formatGraphQLProjects(projects)[1];
+
+ it('does not include delete action in `availableActions`', () => {
+ expect(nonDeletableFormattedProject.availableActions).toEqual([]);
+ });
+ });
+
+ describe('when project does not have edit permissions', () => {
+ const nonEditableFormattedProject = formatGraphQLProjects(projects)[1];
+
+ it('does not include edit action in `availableActions`', () => {
+ expect(nonEditableFormattedProject.availableActions).toEqual([]);
+ });
+ });
+});
diff --git a/spec/frontend/work_items/components/work_item_detail_modal_spec.js b/spec/frontend/work_items/components/work_item_detail_modal_spec.js
index d2a8e2fe396..15e64898a62 100644
--- a/spec/frontend/work_items/components/work_item_detail_modal_spec.js
+++ b/spec/frontend/work_items/components/work_item_detail_modal_spec.js
@@ -4,7 +4,6 @@ import Vue, { nextTick } from 'vue';
import VueApollo from 'vue-apollo';
import waitForPromises from 'helpers/wait_for_promises';
import createMockApollo from 'helpers/mock_apollo_helper';
-import { stubComponent } from 'helpers/stub_component';
import WorkItemDetailModal from '~/work_items/components/work_item_detail_modal.vue';
import deleteWorkItemMutation from '~/work_items/graphql/delete_work_item.mutation.graphql';
import WorkItemDetail from '~/work_items/components/work_item_detail.vue';
@@ -47,10 +46,13 @@ describe('WorkItemDetailModal component', () => {
},
provide: {
fullPath: 'group/project',
+ reportAbusePath: 'report/abuse',
+ groupPath: '',
+ hasSubepicsFeature: false,
},
stubs: {
GlModal,
- WorkItemDetail: stubComponent(WorkItemDetail),
+ WorkItemDetail,
},
});
};
diff --git a/spec/frontend/work_items/components/work_item_prefetch_spec.js b/spec/frontend/work_items/components/work_item_prefetch_spec.js
index 444b237234a..05ffc6b1310 100644
--- a/spec/frontend/work_items/components/work_item_prefetch_spec.js
+++ b/spec/frontend/work_items/components/work_item_prefetch_spec.js
@@ -34,15 +34,13 @@ describe('WorkItemPrefetch component', () => {
},
scopedSlots: {
default: `
-
-
- Hover item
-
-
+
+ Hover item
+
`,
},
});