Add tests.
This commit is contained in:
parent
737f322e41
commit
d92e4ccc6e
|
@ -55,24 +55,109 @@ describe Import::BitbucketController do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "POST create" do
|
describe "POST create" do
|
||||||
before do
|
let(:bitbucket_username) { user.username }
|
||||||
@repo = {
|
|
||||||
slug: 'vim',
|
let(:bitbucket_user) {
|
||||||
owner: "john"
|
{
|
||||||
|
user: {
|
||||||
|
username: bitbucket_username
|
||||||
|
}
|
||||||
}.with_indifferent_access
|
}.with_indifferent_access
|
||||||
|
}
|
||||||
|
|
||||||
|
let(:bitbucket_repo) {
|
||||||
|
{
|
||||||
|
slug: "vim",
|
||||||
|
owner: bitbucket_username
|
||||||
|
}.with_indifferent_access
|
||||||
|
}
|
||||||
|
|
||||||
|
before do
|
||||||
|
allow(Gitlab::BitbucketImport::KeyAdder).
|
||||||
|
to receive(:new).with(bitbucket_repo, user).
|
||||||
|
and_return(double(execute: true))
|
||||||
|
|
||||||
|
controller.stub_chain(:client, :user).and_return(bitbucket_user)
|
||||||
|
controller.stub_chain(:client, :project).and_return(bitbucket_repo)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "takes already existing namespace" do
|
context "when the repository owner is the Bitbucket user" do
|
||||||
namespace = create(:namespace, name: "john", owner: user)
|
context "when the Bitbucket user and GitLab user's usernames match" do
|
||||||
expect(Gitlab::BitbucketImport::KeyAdder).
|
it "takes the current user's namespace" do
|
||||||
to receive(:new).with(@repo, user).
|
|
||||||
and_return(double(execute: true))
|
|
||||||
expect(Gitlab::BitbucketImport::ProjectCreator).
|
expect(Gitlab::BitbucketImport::ProjectCreator).
|
||||||
to receive(:new).with(@repo, namespace, user).
|
to receive(:new).with(bitbucket_repo, user.namespace, user).
|
||||||
|
and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when the Bitbucket user and GitLab user's usernames don't match" do
|
||||||
|
let(:bitbucket_username) { "someone_else" }
|
||||||
|
|
||||||
|
it "takes the current user's namespace" do
|
||||||
|
expect(Gitlab::BitbucketImport::ProjectCreator).
|
||||||
|
to receive(:new).with(bitbucket_repo, user.namespace, user).
|
||||||
and_return(double(execute: true))
|
and_return(double(execute: true))
|
||||||
controller.stub_chain(:client, :project).and_return(@repo)
|
|
||||||
|
|
||||||
post :create, format: :js
|
post :create, format: :js
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context "when the repository owner is not the Bitbucket user" do
|
||||||
|
let(:other_username) { "someone_else" }
|
||||||
|
|
||||||
|
before do
|
||||||
|
bitbucket_repo["owner"] = other_username
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when a namespace with the Bitbucket user's username already exists" do
|
||||||
|
let!(:existing_namespace) { create(:namespace, name: other_username, owner: user) }
|
||||||
|
|
||||||
|
context "when the namespace is owned by the GitLab user" do
|
||||||
|
it "takes the existing namespace" do
|
||||||
|
expect(Gitlab::BitbucketImport::ProjectCreator).
|
||||||
|
to receive(:new).with(bitbucket_repo, existing_namespace, user).
|
||||||
|
and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when the namespace is not owned by the GitLab user" do
|
||||||
|
before do
|
||||||
|
existing_namespace.owner = create(:user)
|
||||||
|
existing_namespace.save
|
||||||
|
end
|
||||||
|
|
||||||
|
it "doesn't create a project" do
|
||||||
|
expect(Gitlab::BitbucketImport::ProjectCreator).
|
||||||
|
not_to receive(:new)
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when a namespace with the Bitbucket user's username doesn't exist" do
|
||||||
|
it "creates the namespace" do
|
||||||
|
expect(Gitlab::BitbucketImport::ProjectCreator).
|
||||||
|
to receive(:new).and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
|
||||||
|
expect(Namespace.where(name: other_username).first).not_to be_nil
|
||||||
|
end
|
||||||
|
|
||||||
|
it "takes the new namespace" do
|
||||||
|
expect(Gitlab::BitbucketImport::ProjectCreator).
|
||||||
|
to receive(:new).with(bitbucket_repo, an_instance_of(Group), user).
|
||||||
|
and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
|
@ -56,18 +56,98 @@ describe Import::GithubController do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "POST create" do
|
describe "POST create" do
|
||||||
|
let(:github_username) { user.username }
|
||||||
|
|
||||||
|
let(:github_user) {
|
||||||
|
OpenStruct.new(login: github_username)
|
||||||
|
}
|
||||||
|
|
||||||
|
let(:github_repo) {
|
||||||
|
OpenStruct.new(name: 'vim', full_name: "#{github_username}/vim", owner: OpenStruct.new(login: github_username))
|
||||||
|
}
|
||||||
|
|
||||||
before do
|
before do
|
||||||
@repo = OpenStruct.new(login: 'vim', full_name: 'asd/vim', owner: OpenStruct.new(login: "john"))
|
controller.stub_chain(:client, :user).and_return(github_user)
|
||||||
|
controller.stub_chain(:client, :repo).and_return(github_repo)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "takes already existing namespace" do
|
context "when the repository owner is the GitHub user" do
|
||||||
namespace = create(:namespace, name: "john", owner: user)
|
context "when the GitHub user and GitLab user's usernames match" do
|
||||||
|
it "takes the current user's namespace" do
|
||||||
expect(Gitlab::GithubImport::ProjectCreator).
|
expect(Gitlab::GithubImport::ProjectCreator).
|
||||||
to receive(:new).with(@repo, namespace, user).
|
to receive(:new).with(github_repo, user.namespace, user).
|
||||||
|
and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when the GitHub user and GitLab user's usernames don't match" do
|
||||||
|
let(:github_username) { "someone_else" }
|
||||||
|
|
||||||
|
it "takes the current user's namespace" do
|
||||||
|
expect(Gitlab::GithubImport::ProjectCreator).
|
||||||
|
to receive(:new).with(github_repo, user.namespace, user).
|
||||||
and_return(double(execute: true))
|
and_return(double(execute: true))
|
||||||
controller.stub_chain(:client, :repo).and_return(@repo)
|
|
||||||
|
|
||||||
post :create, format: :js
|
post :create, format: :js
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context "when the repository owner is not the GitHub user" do
|
||||||
|
let(:other_username) { "someone_else" }
|
||||||
|
|
||||||
|
before do
|
||||||
|
github_repo.owner = OpenStruct.new(login: other_username)
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when a namespace with the GitHub user's username already exists" do
|
||||||
|
let!(:existing_namespace) { create(:namespace, name: other_username, owner: user) }
|
||||||
|
|
||||||
|
context "when the namespace is owned by the GitLab user" do
|
||||||
|
it "takes the existing namespace" do
|
||||||
|
expect(Gitlab::GithubImport::ProjectCreator).
|
||||||
|
to receive(:new).with(github_repo, existing_namespace, user).
|
||||||
|
and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when the namespace is not owned by the GitLab user" do
|
||||||
|
before do
|
||||||
|
existing_namespace.owner = create(:user)
|
||||||
|
existing_namespace.save
|
||||||
|
end
|
||||||
|
|
||||||
|
it "doesn't create a project" do
|
||||||
|
expect(Gitlab::GithubImport::ProjectCreator).
|
||||||
|
not_to receive(:new)
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when a namespace with the GitHub user's username doesn't exist" do
|
||||||
|
it "creates the namespace" do
|
||||||
|
expect(Gitlab::GithubImport::ProjectCreator).
|
||||||
|
to receive(:new).and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
|
||||||
|
expect(Namespace.where(name: other_username).first).not_to be_nil
|
||||||
|
end
|
||||||
|
|
||||||
|
it "takes the new namespace" do
|
||||||
|
expect(Gitlab::GithubImport::ProjectCreator).
|
||||||
|
to receive(:new).with(github_repo, an_instance_of(Group), user).
|
||||||
|
and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
|
@ -48,23 +48,105 @@ describe Import::GitlabController do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "POST create" do
|
describe "POST create" do
|
||||||
before do
|
let(:gitlab_username) { user.username }
|
||||||
@repo = {
|
|
||||||
path: 'vim',
|
let(:gitlab_user) {
|
||||||
path_with_namespace: 'asd/vim',
|
{
|
||||||
owner: {name: "john"},
|
username: gitlab_username
|
||||||
namespace: {path: "john"}
|
|
||||||
}.with_indifferent_access
|
}.with_indifferent_access
|
||||||
|
}
|
||||||
|
|
||||||
|
let(:gitlab_repo) {
|
||||||
|
{
|
||||||
|
path: 'vim',
|
||||||
|
path_with_namespace: "#{gitlab_username}/vim",
|
||||||
|
owner: { name: gitlab_username },
|
||||||
|
namespace: { path: gitlab_username }
|
||||||
|
}.with_indifferent_access
|
||||||
|
}
|
||||||
|
|
||||||
|
before do
|
||||||
|
controller.stub_chain(:client, :user).and_return(gitlab_user)
|
||||||
|
controller.stub_chain(:client, :project).and_return(gitlab_repo)
|
||||||
end
|
end
|
||||||
|
|
||||||
it "takes already existing namespace" do
|
context "when the repository owner is the GitLab.com user" do
|
||||||
namespace = create(:namespace, name: "john", owner: user)
|
context "when the GitLab.com user and GitLab server user's usernames match" do
|
||||||
|
it "takes the current user's namespace" do
|
||||||
expect(Gitlab::GitlabImport::ProjectCreator).
|
expect(Gitlab::GitlabImport::ProjectCreator).
|
||||||
to receive(:new).with(@repo, namespace, user).
|
to receive(:new).with(gitlab_repo, user.namespace, user).
|
||||||
|
and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when the GitLab.com user and GitLab server user's usernames don't match" do
|
||||||
|
let(:gitlab_username) { "someone_else" }
|
||||||
|
|
||||||
|
it "takes the current user's namespace" do
|
||||||
|
expect(Gitlab::GitlabImport::ProjectCreator).
|
||||||
|
to receive(:new).with(gitlab_repo, user.namespace, user).
|
||||||
and_return(double(execute: true))
|
and_return(double(execute: true))
|
||||||
controller.stub_chain(:client, :project).and_return(@repo)
|
|
||||||
|
|
||||||
post :create, format: :js
|
post :create, format: :js
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context "when the repository owner is not the GitLab.com user" do
|
||||||
|
let(:other_username) { "someone_else" }
|
||||||
|
|
||||||
|
before do
|
||||||
|
gitlab_repo["namespace"]["path"] = other_username
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when a namespace with the GitLab.com user's username already exists" do
|
||||||
|
let!(:existing_namespace) { create(:namespace, name: other_username, owner: user) }
|
||||||
|
|
||||||
|
context "when the namespace is owned by the GitLab server user" do
|
||||||
|
it "takes the existing namespace" do
|
||||||
|
expect(Gitlab::GitlabImport::ProjectCreator).
|
||||||
|
to receive(:new).with(gitlab_repo, existing_namespace, user).
|
||||||
|
and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when the namespace is not owned by the GitLab server user" do
|
||||||
|
before do
|
||||||
|
existing_namespace.owner = create(:user)
|
||||||
|
existing_namespace.save
|
||||||
|
end
|
||||||
|
|
||||||
|
it "doesn't create a project" do
|
||||||
|
expect(Gitlab::GitlabImport::ProjectCreator).
|
||||||
|
not_to receive(:new)
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "when a namespace with the GitLab.com user's username doesn't exist" do
|
||||||
|
it "creates the namespace" do
|
||||||
|
expect(Gitlab::GitlabImport::ProjectCreator).
|
||||||
|
to receive(:new).and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
|
||||||
|
expect(Namespace.where(name: other_username).first).not_to be_nil
|
||||||
|
end
|
||||||
|
|
||||||
|
it "takes the new namespace" do
|
||||||
|
expect(Gitlab::GitlabImport::ProjectCreator).
|
||||||
|
to receive(:new).with(gitlab_repo, an_instance_of(Group), user).
|
||||||
|
and_return(double(execute: true))
|
||||||
|
|
||||||
|
post :create, format: :js
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
Loading…
Reference in New Issue