Resolve "Create new group: Rename form fields and update UI"

4 files changed, 38 insertions, 16 deletions

diff --git a/spec/features/admin/admin_groups_spec.rb b/spec/features/admin/admin_groups_spec.rb
index 96dfde2e08c..735ca60f7da 100644
--- a/spec/features/admin/admin_groups_spec.rb
+++ b/spec/features/admin/admin_groups_spec.rb
@@ -53,13 +53,33 @@ describe 'Admin Groups' do
       expect_selected_visibility(internal)
     end
 
-    it 'when entered in group path, it auto filled the group name', :js do
+    it 'when entered in group name, it auto filled the group path', :js do
       visit admin_groups_path
       click_link "New group"
-      group_path = 'gitlab'
+      group_name = 'gitlab'
+      fill_in 'group_name', with: group_name
+      path_field = find('input#group_path')
+      expect(path_field.value).to eq group_name
+    end
+
+    it 'auto populates the group path with the group name', :js do
+      visit admin_groups_path
+      click_link "New group"
+      group_name = 'my gitlab project'
+      fill_in 'group_name', with: group_name
+      path_field = find('input#group_path')
+      expect(path_field.value).to eq 'my-gitlab-project'
+    end
+
+    it 'when entering in group path, group name does not change anymore', :js do
+      visit admin_groups_path
+      click_link "New group"
+      group_path = 'my-gitlab-project'
+      group_name = 'My modified gitlab project'
       fill_in 'group_path', with: group_path
-      name_field = find('input#group_name')
-      expect(name_field.value).to eq group_path
+      fill_in 'group_name', with: group_name
+      path_field = find('input#group_path')
+      expect(path_field.value).to eq 'my-gitlab-project'
     end
   end
 
diff --git a/spec/features/dashboard/group_spec.rb b/spec/features/dashboard/group_spec.rb
index e57fcde8b2c..259f220c68b 100644
--- a/spec/features/dashboard/group_spec.rb
+++ b/spec/features/dashboard/group_spec.rb
@@ -14,15 +14,15 @@ RSpec.describe 'Dashboard Group' do
   it 'creates new group', :js do
     visit dashboard_groups_path
     find('.btn-success').click
-    new_path = 'Samurai'
+    new_name = 'Samurai'
     new_description = 'Tokugawa Shogunate'
 
-    fill_in 'group_path', with: new_path
+    fill_in 'group_name', with: new_name
     fill_in 'group_description', with: new_description
     click_button 'Create group'
 
-    expect(current_path).to eq group_path(Group.find_by(name: new_path))
-    expect(page).to have_content(new_path)
+    expect(current_path).to eq group_path(Group.find_by(name: new_name))
+    expect(page).to have_content(new_name)
     expect(page).to have_content(new_description)
   end
 end
diff --git a/spec/features/explore/new_menu_spec.rb b/spec/features/explore/new_menu_spec.rb
index 11f05b6d220..259f22139ef 100644
--- a/spec/features/explore/new_menu_spec.rb
+++ b/spec/features/explore/new_menu_spec.rb
@@ -29,7 +29,7 @@ describe 'Top Plus Menu', :js do
 
       click_topmenuitem("New group")
 
-      expect(page).to have_content('Group path')
+      expect(page).to have_content('Group URL')
       expect(page).to have_content('Group name')
     end
 
@@ -79,7 +79,7 @@ describe 'Top Plus Menu', :js do
 
       click_topmenuitem("New subgroup")
 
-      expect(page).to have_content('Group path')
+      expect(page).to have_content('Group URL')
       expect(page).to have_content('Group name')
     end
 
diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb
index 63aa26cf5fd..4d04b8043ec 100644
--- a/spec/features/groups_spec.rb
+++ b/spec/features/groups_spec.rb
@@ -7,7 +7,7 @@ describe 'Group' do
 
   matcher :have_namespace_error_message do
     match do |page|
-      page.has_content?("Path can contain only letters, digits, '_', '-' and '.'. Cannot start with '-' or end in '.', '.git' or '.atom'.")
+      page.has_content?("Group URL can contain only letters, digits, '_', '-' and '.'. Cannot start with '-' or end in '.', '.git' or '.atom'.")
     end
   end
 
@@ -18,7 +18,7 @@ describe 'Group' do
 
     describe 'with space in group path' do
       it 'renders new group form with validation errors' do
-        fill_in 'Group path', with: 'space group'
+        fill_in 'Group URL', with: 'space group'
         click_button 'Create group'
 
         expect(current_path).to eq(groups_path)
@@ -28,7 +28,7 @@ describe 'Group' do
 
     describe 'with .atom at end of group path' do
       it 'renders new group form with validation errors' do
-        fill_in 'Group path', with: 'atom_group.atom'
+        fill_in 'Group URL', with: 'atom_group.atom'
         click_button 'Create group'
 
         expect(current_path).to eq(groups_path)
@@ -38,7 +38,7 @@ describe 'Group' do
 
     describe 'with .git at end of group path' do
       it 'renders new group form with validation errors' do
-        fill_in 'Group path', with: 'git_group.git'
+        fill_in 'Group URL', with: 'git_group.git'
         click_button 'Create group'
 
         expect(current_path).to eq(groups_path)
@@ -94,7 +94,8 @@ describe 'Group' do
       end
 
       it 'creates a nested group' do
-        fill_in 'Group path', with: 'bar'
+        fill_in 'Group name', with: 'bar'
+        fill_in 'Group URL', with: 'bar'
         click_button 'Create group'
 
         expect(current_path).to eq(group_path('foo/bar'))
@@ -112,7 +113,8 @@ describe 'Group' do
 
         visit new_group_path(group, parent_id: group.id)
 
-        fill_in 'Group path', with: 'bar'
+        fill_in 'Group name', with: 'bar'
+        fill_in 'Group URL', with: 'bar'
         click_button 'Create group'
 
         expect(current_path).to eq(group_path('foo/bar'))