From 641febac64fcfa52e642ab3d8e8193d25a5c6cac Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 20 Jul 2016 15:50:21 +0200 Subject: fix JS - now tooltip and flash should show --- app/views/projects/new.html.haml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index c72d0140bb9..5025542f0f9 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -89,9 +89,9 @@ = link_to "#", class: 'btn js-toggle-button import_git' do %i.fa.fa-git %span Repo by URL - %div + %div{ class: 'import_gitlab_project' } - if gitlab_project_import_enabled? - = link_to new_import_gitlab_project_path, class: 'btn import_gitlab_project project-submit' do + = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do %i.fa.fa-gitlab %span GitLab export @@ -130,16 +130,16 @@ $(".modal").hide(); }); - $('.import_gitlab_project').bind('click', function() { - var _href = $("a.import_gitlab_project").attr("href"); - $(".import_gitlab_project").attr("href", _href + '?namespace_id=' + $("#project_namespace_id").val() + '&path=' + $("#project_path").val()); + $('.btn_import_gitlab_project').bind('click', function() { + var _href = $("a.btn_import_gitlab_project").attr("href"); + $(".btn_import_gitlab_project").attr("href", _href + '?namespace_id=' + $("#project_namespace_id").val() + '&path=' + $("#project_path").val()); }); - $('.import_gitlab_project').attr('disabled',true) + $('.btn_import_gitlab_project').attr('disabled',true) $('.import_gitlab_project').attr('title', 'Project path required.'); $('.import_gitlab_project').click(function( event ) { - if($('.import_gitlab_project').attr('disabled')) { + if($('.btn_import_gitlab_project').attr('disabled')) { event.preventDefault(); new Flash("Please enter a path for the project to be imported to."); } @@ -147,11 +147,11 @@ $('#project_path').keyup(function(){ if($(this).val().length !=0) { - $('.import_gitlab_project').attr('disabled', false); + $('.btn_import_gitlab_project').attr('disabled', false); $('.import_gitlab_project').attr('title',''); $(".flash-container").html("") } else { - $('.import_gitlab_project').attr('disabled',true); + $('.btn_import_gitlab_project').attr('disabled',true); $('.import_gitlab_project').attr('title', 'Project path required.'); } }); -- cgit v1.2.1 From 4eb9045ddede6d4b23cb0f9dd9676873c5a21f8c Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 20 Jul 2016 15:57:06 +0200 Subject: added changelog --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 748128f100a..56d0fe75f6f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -140,6 +140,7 @@ v 8.10.0 (unreleased) - Fix MR diff encoding issues exporting GitLab projects - Export and import avatar as part of project import/export - Fix migration corrupting import data for old version upgrades + - Show tooltip on GitLab export link in new project page v 8.9.6 - Fix importing of events under notes for GitLab projects. !5154 -- cgit v1.2.1 From f0603e4cb7cfc043239554857a1143943b50b22f Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 20 Jul 2016 16:09:43 +0200 Subject: added spec, fixed wording --- app/views/projects/new.html.haml | 6 +++--- spec/features/projects/import_export/import_file_spec.rb | 13 +++++++++++++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml index 5025542f0f9..facdfcc9447 100644 --- a/app/views/projects/new.html.haml +++ b/app/views/projects/new.html.haml @@ -136,12 +136,12 @@ }); $('.btn_import_gitlab_project').attr('disabled',true) - $('.import_gitlab_project').attr('title', 'Project path required.'); + $('.import_gitlab_project').attr('title', 'Project path and name required.'); $('.import_gitlab_project').click(function( event ) { if($('.btn_import_gitlab_project').attr('disabled')) { event.preventDefault(); - new Flash("Please enter a path for the project to be imported to."); + new Flash("Please enter path and name for the project to be imported to."); } }); @@ -152,7 +152,7 @@ $(".flash-container").html("") } else { $('.btn_import_gitlab_project').attr('disabled',true); - $('.import_gitlab_project').attr('title', 'Project path required.'); + $('.import_gitlab_project').attr('title', 'Project path and name required.'); } }); diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb index bc3bf53fe9d..40809aa4aba 100644 --- a/spec/features/projects/import_export/import_file_spec.rb +++ b/spec/features/projects/import_export/import_file_spec.rb @@ -59,6 +59,19 @@ feature 'project import', feature: true, js: true do end end + scenario 'project with no name' do + project = create(:project, namespace_id: 2) + + visit new_project_path + + select2('2', from: '#project_namespace_id') + click_link 'GitLab export' + + page.within('.flash-container') do + expect(page).to have_content('Please enter path and name') + end + end + def wiki_exists? wiki = ProjectWiki.new(project) File.exist?(wiki.repository.path_to_repo) && !wiki.repository.empty? -- cgit v1.2.1 From 70023c2179bf5752302078bfa0199b8ed8f73813 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 20 Jul 2016 17:12:18 +0200 Subject: fix spec --- spec/features/projects/import_export/import_file_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb index 40809aa4aba..239e8369d54 100644 --- a/spec/features/projects/import_export/import_file_spec.rb +++ b/spec/features/projects/import_export/import_file_spec.rb @@ -65,7 +65,9 @@ feature 'project import', feature: true, js: true do visit new_project_path select2('2', from: '#project_namespace_id') - click_link 'GitLab export' + + # click on disabled element + find(:link, 'GitLab export').trigger('click') page.within('.flash-container') do expect(page).to have_content('Please enter path and name') -- cgit v1.2.1 From 96572bd006fd257eb037c0fbf9c6094f35d8cd60 Mon Sep 17 00:00:00 2001 From: James Lopez Date: Wed, 20 Jul 2016 17:54:50 +0200 Subject: fix spec - unused var --- spec/features/projects/import_export/import_file_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb index 239e8369d54..2d1e3bbebe5 100644 --- a/spec/features/projects/import_export/import_file_spec.rb +++ b/spec/features/projects/import_export/import_file_spec.rb @@ -60,7 +60,7 @@ feature 'project import', feature: true, js: true do end scenario 'project with no name' do - project = create(:project, namespace_id: 2) + create(:project, namespace_id: 2) visit new_project_path -- cgit v1.2.1