From ae5003a35ef47bbdafc51e3e9d0f27039f9d20a2 Mon Sep 17 00:00:00 2001 From: Filipa Lacerda Date: Mon, 7 Aug 2017 18:51:30 +0100 Subject: [PATCH] Fix html structure Removes test for removed behavior --- app/views/import/gitlab_projects/new.html.haml | 5 ++--- .../projects/import_export/import_file_spec.rb | 11 ----------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/app/views/import/gitlab_projects/new.html.haml b/app/views/import/gitlab_projects/new.html.haml index d99da464ad1..008e8287aa3 100644 --- a/app/views/import/gitlab_projects/new.html.haml +++ b/app/views/import/gitlab_projects/new.html.haml @@ -8,11 +8,10 @@ Import an exported GitLab project %hr -= form_tag import_gitlab_project_path, html: { class: 'new_project' }, multipart: true do += form_tag import_gitlab_project_path, class: 'new_project', multipart: true do .row .form-group.col-xs-12.col-sm-6 - .span - = label_tag :namespace_id, 'Project path', class: 'label-light' + = label_tag :namespace_id, 'Project path', class: 'label-light' .form-group .input-group - if current_user.can_select_namespace? diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb index 83d924382be..24e7843db63 100644 --- a/spec/features/projects/import_export/import_file_spec.rb +++ b/spec/features/projects/import_export/import_file_spec.rb @@ -61,17 +61,6 @@ feature 'Import/Export - project import integration test', js: true do expect(page).to have_content('Project could not be imported') end end - - scenario 'project with no name' do - create(:project, namespace: namespace) - - visit new_project_path - - select2(namespace.id, from: '#project_namespace_id') - - # Check for tooltip disabled import button - expect(find('.import_gitlab_project')['title']).to eq('Please enter a valid project name.') - end end context 'when limited to the default user namespace' do -- GitLab