Resolve "Create new project: Re-add project name field"

7 files changed, 51 insertions, 9 deletions

diff --git a/spec/features/explore/new_menu_spec.rb b/spec/features/explore/new_menu_spec.rb
index 0a88988ea09..11f05b6d220 100644
--- a/spec/features/explore/new_menu_spec.rb
+++ b/spec/features/explore/new_menu_spec.rb
@@ -20,7 +20,7 @@ describe 'Top Plus Menu', :js do
 
       click_topmenuitem("New project")
 
-      expect(page).to have_content('Project path')
+      expect(page).to have_content('Project URL')
       expect(page).to have_content('Project name')
     end
 
@@ -92,7 +92,7 @@ describe 'Top Plus Menu', :js do
         find('.header-new-group-project a').click
       end
 
-      expect(page).to have_content('Project path')
+      expect(page).to have_content('Project URL')
       expect(page).to have_content('Project name')
     end
   end
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index 2936482a1f7..6cd5810325f 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -20,6 +20,7 @@ describe 'Import/Export - project import integration test', :js do
   context 'when selecting the namespace' do
     let(:user) { create(:admin) }
     let!(:namespace) { user.namespace }
+    let(:project_name) { 'Test Project Name' + SecureRandom.hex }
     let(:project_path) { 'test-project-path' + SecureRandom.hex }
 
     context 'prefilled the path' do
@@ -27,12 +28,13 @@ describe 'Import/Export - project import integration test', :js do
         visit new_project_path
 
         select2(namespace.id, from: '#project_namespace_id')
+        fill_in :project_name, with: project_name, visible: true
         fill_in :project_path, with: project_path, visible: true
         click_import_project_tab
         click_link 'GitLab export'
 
         expect(page).to have_content('Import an exported GitLab project')
-        expect(URI.parse(current_url).query).to eq("namespace_id=#{namespace.id}&path=#{project_path}")
+        expect(URI.parse(current_url).query).to eq("namespace_id=#{namespace.id}&name=#{ERB::Util.url_encode(project_name)}&path=#{project_path}")
 
         attach_file('file', file)
         click_on 'Import project'
@@ -56,6 +58,7 @@ describe 'Import/Export - project import integration test', :js do
         click_import_project_tab
         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)
 
@@ -74,7 +77,8 @@ describe 'Import/Export - project import integration test', :js do
     visit new_project_path
 
     select2(user.namespace.id, from: '#project_namespace_id')
-    fill_in :project_path, with: project.name, visible: true
+    fill_in :project_name, with: project.name, visible: true
+    fill_in :project_path, with: project.path, visible: true
     click_import_project_tab
     click_link 'GitLab export'
     attach_file('file', file)
diff --git a/spec/features/projects/new_project_spec.rb b/spec/features/projects/new_project_spec.rb
index bbe08ff83ff..0acd5059385 100644
--- a/spec/features/projects/new_project_spec.rb
+++ b/spec/features/projects/new_project_spec.rb
@@ -12,8 +12,9 @@ describe 'New project' do
   it 'shows "New project" page', :js do
     visit new_project_path
 
-    expect(page).to have_content('Project path')
     expect(page).to have_content('Project name')
+    expect(page).to have_content('Project URL')
+    expect(page).to have_content('Project slug')
 
     find('#import-project-tab').click
 
@@ -187,7 +188,7 @@ describe 'New project' do
         collision_project = create(:project, name: 'test-name-collision', namespace: user.namespace)
 
         fill_in 'project_import_url', with: collision_project.http_url_to_repo
-        fill_in 'project_path', with: collision_project.path
+        fill_in 'project_name', with: collision_project.name
 
         click_on 'Create project'
 
diff --git a/spec/features/projects/user_creates_project_spec.rb b/spec/features/projects/user_creates_project_spec.rb
index 83d18996f4e..8d7e2883b2a 100644
--- a/spec/features/projects/user_creates_project_spec.rb
+++ b/spec/features/projects/user_creates_project_spec.rb
@@ -11,7 +11,7 @@ describe 'User creates a project', :js do
   it 'creates a new project' do
     visit(new_project_path)
 
-    fill_in(:project_path, with: 'Empty')
+    fill_in(:project_name, with: 'Empty')
 
     page.within('#content-body') do
       click_button('Create project')
@@ -37,6 +37,7 @@ describe 'User creates a project', :js do
     it 'creates a new project' do
       visit(new_project_path)
 
+      fill_in :project_name, with: 'A Subgroup Project'
       fill_in :project_path, with: 'a-subgroup-project'
 
       page.find('.js-select-namespace').click
@@ -46,7 +47,7 @@ describe 'User creates a project', :js do
         click_button('Create project')
       end
 
-      expect(page).to have_content("Project 'a-subgroup-project' was successfully created")
+      expect(page).to have_content("Project 'A Subgroup Project' was successfully created")
 
       project = Project.last
 
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index 22e3a99072f..8e310f38a8c 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -16,7 +16,7 @@ describe 'Project' do
     it "allows creation from templates", :js do
       find('#create-from-template-tab').click
       find("label[for=#{template.name}]").click
-      fill_in("project_path", with: template.name)
+      fill_in("project_name", with: template.name)
 
       page.within '#content-body' do
         click_button "Create project"
diff --git a/spec/javascripts/lib/utils/text_utility_spec.js b/spec/javascripts/lib/utils/text_utility_spec.js
index d60485b1308..ac3270baef5 100644
--- a/spec/javascripts/lib/utils/text_utility_spec.js
+++ b/spec/javascripts/lib/utils/text_utility_spec.js
@@ -63,6 +63,12 @@ describe('text_utility', () => {
     });
   });
 
+  describe('slugifyWithHyphens', () => {
+    it('should replaces whitespaces with hyphens and convert to lower case', () => {
+      expect(textUtils.slugifyWithHyphens('My Input String')).toEqual('my-input-string');
+    });
+  });
+
   describe('stripHtml', () => {
     it('replaces html tag with the default replacement', () => {
       expect(textUtils.stripHtml('This is a text with <p>html</p>.')).toEqual(
diff --git a/spec/javascripts/projects/project_new_spec.js b/spec/javascripts/projects/project_new_spec.js
index 84515d2bf97..dace834a3c8 100644
--- a/spec/javascripts/projects/project_new_spec.js
+++ b/spec/javascripts/projects/project_new_spec.js
@@ -4,12 +4,14 @@ import projectNew from '~/projects/project_new';
 describe('New Project', () => {
   let $projectImportUrl;
   let $projectPath;
+  let $projectName;
 
   beforeEach(() => {
     setFixtures(`
       <div class='toggle-import-form'>
         <div class='import-url-data'>
           <input id="project_import_url" />
+          <input id="project_name" />
           <input id="project_path" />
         </div>
       </div>
@@ -17,6 +19,7 @@ describe('New Project', () => {
 
     $projectImportUrl = $('#project_import_url');
     $projectPath = $('#project_path');
+    $projectName = $('#project_name');
   });
 
   describe('deriveProjectPathFromUrl', () => {
@@ -129,4 +132,31 @@ describe('New Project', () => {
       });
     });
   });
+
+  describe('deriveSlugFromProjectName', () => {
+    beforeEach(() => {
+      projectNew.bindEvents();
+      $projectName.val('').keyup();
+    });
+
+    it('converts project name to lower case and dash-limited slug', () => {
+      const dummyProjectName = 'My Awesome Project';
+
+      $projectName.val(dummyProjectName);
+
+      projectNew.onProjectNameChange($projectName, $projectPath);
+
+      expect($projectPath.val()).toEqual('my-awesome-project');
+    });
+
+    it('does not add additional dashes in the slug if the project name already contains dashes', () => {
+      const dummyProjectName = 'My-Dash-Delimited Awesome Project';
+
+      $projectName.val(dummyProjectName);
+
+      projectNew.onProjectNameChange($projectName, $projectPath);
+
+      expect($projectPath.val()).toEqual('my-dash-delimited-awesome-project');
+    });
+  });
 });