Commit 678d7e6b authored by Robert Speicher's avatar Robert Speicher

Merge branch '30289-allow-users-to-import-github-projects-to-subgroups' into 'master'

Allow users to import GitHub projects to subgroups

Closes #30289 and #30148

See merge request !10344
parents 6ff5e7f7 9bac3bfc
...@@ -11,7 +11,7 @@ class Import::BaseController < ApplicationController ...@@ -11,7 +11,7 @@ class Import::BaseController < ApplicationController
namespace.add_owner(current_user) namespace.add_owner(current_user)
namespace namespace
rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid rescue ActiveRecord::RecordNotUnique, ActiveRecord::RecordInvalid
Namespace.find_by_path_or_name(name) Namespace.find_by_full_path(name)
end end
end end
end end
---
title: Allow users to import GitHub projects to subgroups
merge_request:
author:
...@@ -228,5 +228,19 @@ shared_examples 'a GitHub-ish import controller: POST create' do ...@@ -228,5 +228,19 @@ shared_examples 'a GitHub-ish import controller: POST create' do
post :create, { new_name: test_name, format: :js } post :create, { new_name: test_name, format: :js }
end end
end end
context 'user has chosen a nested namespace and name for the project' do
let(:parent_namespace) { create(:namespace, name: 'foo', owner: user) }
let(:nested_namespace) { create(:namespace, name: 'bar', parent: parent_namespace, owner: user) }
let(:test_name) { 'test_name' }
it 'takes the selected namespace and name' do
expect(Gitlab::GithubImport::ProjectCreator).
to receive(:new).with(provider_repo, test_name, nested_namespace, user, access_params, type: provider).
and_return(double(execute: true))
post :create, { target_namespace: nested_namespace.full_path, new_name: test_name, format: :js }
end
end
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment