diff --git a/app/assets/javascripts/projects/new_v2/components/app.vue b/app/assets/javascripts/projects/new_v2/components/app.vue index de5114309f1a6f29e3274009afc29751c98ec408..d198166a733058c433f4e6317b0dbe3581f6e112 100644 --- a/app/assets/javascripts/projects/new_v2/components/app.vue +++ b/app/assets/javascripts/projects/new_v2/components/app.vue @@ -1,11 +1,13 @@ + + diff --git a/app/assets/javascripts/projects/new_v2/index.js b/app/assets/javascripts/projects/new_v2/index.js index 92db791b3b6dbc4676c55ea3df743a3e08bec0bd..8552f8346d6cfe06b5950516fdc6aed463d3f496 100644 --- a/app/assets/javascripts/projects/new_v2/index.js +++ b/app/assets/javascripts/projects/new_v2/index.js @@ -26,6 +26,7 @@ export function initNewProjectForm() { namespaceId, userNamespaceId, trackLabel, + newProjectGuidelines, } = el.dataset; const props = { @@ -41,6 +42,7 @@ export function initNewProjectForm() { namespaceId, userNamespaceId, trackLabel, + newProjectGuidelines, }; const provide = { diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 5526f4e8fe831e4a718a7b040eb7c1103eab86db..f13b8bd1f836d44bbc9ebf7a361bb28858248309 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -44543,9 +44543,18 @@ msgstr "" msgid "ProjectMaintenance|You will receive an email notification when the process is complete. To remove old versions from the repository, run housekeeping." msgstr "" +msgid "ProjectNew|Push project from command line" +msgstr "" + msgid "ProjectNew|What do you want to create?" msgstr "" +msgid "ProjectNew|What does this command do?" +msgstr "" + +msgid "ProjectNew|You can also create a project from the command line" +msgstr "" + msgid "ProjectOverview|Create new fork" msgstr "" diff --git a/spec/frontend/projects/new_v2/components/app_spec.js b/spec/frontend/projects/new_v2/components/app_spec.js index b53adfdab4608d57a56f7e8ca884d5f59c614edc..99300f8f30021835bb65470656f3e98e8181d3ef 100644 --- a/spec/frontend/projects/new_v2/components/app_spec.js +++ b/spec/frontend/projects/new_v2/components/app_spec.js @@ -1,5 +1,6 @@ import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import App from '~/projects/new_v2/components/app.vue'; +import CommandLine from '~/projects/new_v2/components/command_line.vue'; import MultiStepFormTemplate from '~/vue_shared/components/multi_step_form_template.vue'; describe('New project creation app', () => { @@ -17,6 +18,7 @@ describe('New project creation app', () => { }; const findMultyStepForm = () => wrapper.findComponent(MultiStepFormTemplate); + const findCommandLine = () => wrapper.findComponent(CommandLine); it('renders a form', () => { createComponent(); @@ -38,4 +40,18 @@ describe('New project creation app', () => { expect(wrapper.findByTestId('group-selector').exists()).toBe(false); }); }); + + describe('with command line', () => { + it('renders for a personal namespace', () => { + createComponent(); + + expect(findCommandLine().exists()).toBe(true); + }); + + it('does not renders for a group namespace', () => { + createComponent({ namespaceId: '13' }); + + expect(findCommandLine().exists()).toBe(false); + }); + }); });