1 files changed, 38 insertions, 0 deletions
diff --git a/spec/helpers/namespaces_helper_spec.rb b/spec/helpers/namespaces_helper_spec.rb
index 343e140f5fb..234690e742b 100644
--- a/spec/helpers/namespaces_helper_spec.rb
+++ b/spec/helpers/namespaces_helper_spec.rb
@@ -31,6 +31,44 @@ describe NamespacesHelper do
       expect(options).to include(user.name)
     end
 
+    it 'avoids duplicate groups when extra_group is used' do
+      allow(helper).to receive(:current_user).and_return(admin)
+
+      options = helper.namespaces_options(user_group.id, display_path: true, extra_group: build(:group, name: admin_group.name))
+
+      expect(options.scan("data-name=\"#{admin_group.name}\"").count).to eq(1)
+      expect(options).to include(admin_group.name)
+    end
+
+    it 'selects existing group' do
+      allow(helper).to receive(:current_user).and_return(admin)
+
+      options = helper.namespaces_options(:extra_group, display_path: true, extra_group: user_group)
+
+      expect(options).to include("selected=\"selected\" value=\"#{user_group.id}\"")
+      expect(options).to include(admin_group.name)
+    end
+
+    it 'selects the new group by default' do
+      allow(helper).to receive(:current_user).and_return(user)
+
+      options = helper.namespaces_options(:extra_group, display_path: true, extra_group: build(:group, name: 'new-group'))
+
+      expect(options).to include(user_group.name)
+      expect(options).not_to include(admin_group.name)
+      expect(options).to include("selected=\"selected\" value=\"-1\"")
+    end
+
+    it 'falls back to current user selection' do
+      allow(helper).to receive(:current_user).and_return(user)
+
+      options = helper.namespaces_options(:extra_group, display_path: true, extra_group: build(:group, name: admin_group.name))
+
+      expect(options).to include(user_group.name)
+      expect(options).not_to include(admin_group.name)
+      expect(options).to include("selected=\"selected\" value=\"#{user.namespace.id}\"")
+    end
+
     it 'returns only groups if groups_only option is true' do
       allow(helper).to receive(:current_user).and_return(user)