Fix specs37399-simplify-project-page

4 files changed, 7 insertions, 7 deletions

diff --git a/app/assets/javascripts/projects/project_new.js b/app/assets/javascripts/projects/project_new.js
index 922ceee02d9..3ecc0c2a6e5 100644
--- a/app/assets/javascripts/projects/project_new.js
+++ b/app/assets/javascripts/projects/project_new.js
@@ -34,7 +34,7 @@ const bindEvents = () => {
   const $selectedTemplateText = $('.selected-template');
   const $changeTemplateBtn = $('.change-template');
   const $selectedIcon = $('.selected-icon svg');
-  const $templateProjectNameInput = $('#template-project-name');
+  const $templateProjectNameInput = $('#template-project-name #project_path');
 
   if ($newProjectForm.length !== 1) {
     return;
diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml
index a94aa7e3783..a78a8e5d628 100644
--- a/app/views/projects/_new_project_fields.html.haml
+++ b/app/views/projects/_new_project_fields.html.haml
@@ -1,6 +1,6 @@
 - visibility_level = params.dig(:project, :visibility_level) || default_project_visibility
 
-.row
+.row{ id: project_name_id }
   .form-group.project-path.col-sm-6
     = f.label :namespace_id, class: 'label-light' do
       %span
@@ -19,7 +19,7 @@
     = f.label :path, class: 'label-light' do
       %span
         Project name
-    = f.text_field :path, placeholder: "my-awesome-project", id: project_name_id, class: "form-control", tabindex: 2, autofocus: true, required: true
+    = f.text_field :path, placeholder: "my-awesome-project", class: "form-control", tabindex: 2, autofocus: true, required: true
 - if current_user.can_create_group?
   .help-block
     Want to house several dependent projects under the same namespace?
diff --git a/spec/features/projects/new_project_spec.rb b/spec/features/projects/new_project_spec.rb
index fa3e72d9a6d..8e11cb94350 100644
--- a/spec/features/projects/new_project_spec.rb
+++ b/spec/features/projects/new_project_spec.rb
@@ -9,7 +9,7 @@ feature 'New project' do
     sign_in(user)
   end
 
-  it 'shows "New project" page', js: true do
+  it 'shows "New project" page', :js do
     visit new_project_path
 
     expect(page).to have_content('Project path')
@@ -25,7 +25,7 @@ feature 'New project' do
     expect(page).to have_link('GitLab export')
   end
 
-  context 'Visibility level selector', js: true do
+  context 'Visibility level selector', :js do
     Gitlab::VisibilityLevel.options.each do |key, level|
       it "sets selector to #{key}" do
         stub_application_setting(default_project_visibility: level)
@@ -134,7 +134,7 @@ feature 'New project' do
     end
   end
 
-  context 'Import project options', js: true do
+  context 'Import project options', :js do
     before do
       visit new_project_path
       find('#import-project-tab').trigger('click')
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index fc7689ffdd5..3bc7ec3123f 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -12,7 +12,7 @@ feature 'Project' do
       visit new_project_path
     end
 
-    it "allows creation from templates", js: true do
+    it "allows creation from templates", :js do
       find('#create-from-template-tab').trigger('click')
       find("##{template.name}").trigger('click')
       fill_in("project_path", with: template.name)