Commit 8685b353 authored by Illya Klymov's avatar Illya Klymov

Update breadcrumbs for project imports

- Make sure all HAML-based pages use new breadcrumbs path

Changelog: changed
parent dd39fe1a
......@@ -5,6 +5,9 @@
- paginatable = local_assigns.fetch(:paginatable, false)
- provider_title = Gitlab::ImportSources.title(provider)
- header_title _("New project"), new_project_path
- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project')
#import-projects-mount-element{ data: { provider: provider, provider_title: provider_title,
can_select_namespace: current_user.can_select_namespace?.to_s,
ci_cd_only: has_ci_cd_only_params?.to_s,
......
- title = _('Bitbucket Server Import')
- page_title title
- breadcrumb_title title
- header_title _("Projects"), root_path
- page_title _('Bitbucket Server Import')
- header_title _("New project"), new_project_path
- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project')
%h3.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
......
- page_title _('Bitbucket Server import')
- header_title _('Projects'), root_path
%h3.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
......
- page_title _("FogBugz Import")
- header_title _("Projects"), root_path
- header_title _("New project"), new_project_path
- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project')
%h3.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
= sprite_icon('bug', css_class: 'gl-mr-2')
......
- page_title _('User map'), _('FogBugz import')
- header_title _("Projects"), root_path
- header_title _("New project"), new_project_path
- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project')
%h3.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
= sprite_icon('bug', css_class: 'gl-mr-2')
......
- page_title _("FogBugz import")
- header_title _("Projects"), root_path
%h3.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
= sprite_icon('bug', css_class: 'gl-mr-2')
......
- page_title _("Gitea Import")
- header_title _("Projects"), root_path
- header_title _("New project"), new_project_path
- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project')
%h3.page-title
= custom_icon('gitea_logo')
......
- page_title _("Gitea Import")
- header_title _("Projects"), root_path
%h3.page-title
= custom_icon('gitea_logo')
= _('Import Projects from Gitea')
......
- title = _('Authenticate with GitHub')
- page_title title
- breadcrumb_title title
- header_title _("Projects"), root_path
- header_title _("New project"), new_project_path
- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project')
%h2.page-title
%h3.page-title
= title
%p
......
- title = has_ci_cd_only_params? ? _('Connect repositories from GitHub') : _('GitHub import')
- page_title title
- breadcrumb_title title
- header_title _("Projects"), root_path
%h3.page-title.mb-0.gl-display-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
= sprite_icon('github', css_class: 'gl-mr-2')
......
- page_title _("GitLab.com import")
- header_title _("Projects"), root_path
%h3.page-title
= sprite_icon('heart', css_class: 'gl-vertical-align-middle')
= _('Import projects from GitLab.com')
......
- page_title _("GitLab Import")
- header_title _("Projects"), root_path
- header_title _("New project"), new_project_path
- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project')
%h3.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
......
- page_title _("Manifest file import")
- header_title _("Projects"), root_path
- header_title _("New project"), new_project_path
- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project')
%h3.page-title
= _('Manifest file import')
......
- page_title _("Manifest import")
- header_title _("Projects"), root_path
%h3.page-title
= _('Manifest file import')
......
- title = _('Phabricator Server Import')
- page_title title
- breadcrumb_title title
- header_title _("Projects"), root_path
- page_title _('Phabricator Server Import')
- header_title _("New project"), new_project_path
- add_to_breadcrumbs s_('ProjectsNew|Import project'), new_projects_path(anchor: 'import_project')
%h3.page-title.d-flex
.gl-display-flex.gl-align-items-center.gl-justify-content-center
......
......@@ -30,14 +30,14 @@ RSpec.describe 'Import/Export - project import integration test', :js do
it 'user imports an exported project successfully', :sidekiq_might_not_need_inline do
visit new_project_path
click_import_project_tab
click_import_project
click_link 'GitLab export'
fill_in :name, with: 'Test Project Name', visible: true
fill_in :path, with: 'test-project-path', visible: true
attach_file('file', file)
expect { click_on 'Import project' }.to change { Project.count }.by(1)
expect { click_button 'Import project' }.to change { Project.count }.by(1)
project = Project.last
expect(project).not_to be_nil
......@@ -49,11 +49,11 @@ RSpec.describe 'Import/Export - project import integration test', :js do
visit new_project_path
click_import_project_tab
click_import_project
click_link 'GitLab export'
fill_in :name, with: project.name, visible: true
attach_file('file', file)
click_on 'Import project'
click_button 'Import project'
page.within('.flash-container') do
expect(page).to have_content('Project could not be imported')
......@@ -61,7 +61,7 @@ RSpec.describe 'Import/Export - project import integration test', :js do
end
end
def click_import_project_tab
def click_import_project
find('[data-qa-selector="import_project_link"]').click
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment