From 2e497d84380907ad61225d358024ac1805da85e1 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 25 Aug 2014 12:19:52 +0300 Subject: Prevent project stars duplication when fork project Signed-off-by: Dmitriy Zaporozhets --- spec/services/fork_service_spec.rb | 57 ----------------------------- spec/services/projects/fork_service_spec.rb | 52 ++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 57 deletions(-) delete mode 100644 spec/services/fork_service_spec.rb create mode 100644 spec/services/projects/fork_service_spec.rb (limited to 'spec/services') diff --git a/spec/services/fork_service_spec.rb b/spec/services/fork_service_spec.rb deleted file mode 100644 index b6573095dbd..00000000000 --- a/spec/services/fork_service_spec.rb +++ /dev/null @@ -1,57 +0,0 @@ -require 'spec_helper' - -describe Projects::ForkService do - describe :fork_by_user do - before do - @from_namespace = create(:namespace) - @from_user = create(:user, namespace: @from_namespace ) - @from_project = create(:project, creator_id: @from_user.id, namespace: @from_namespace) - @to_namespace = create(:namespace) - @to_user = create(:user, namespace: @to_namespace) - end - - context 'fork project' do - - it "successfully creates project in the user namespace" do - @to_project = fork_project(@from_project, @to_user) - - @to_project.owner.should == @to_user - @to_project.namespace.should == @to_user.namespace - end - end - - context 'fork project failure' do - - it "fails due to transaction failure" do - # make the mock gitlab-shell fail - @to_project = fork_project(@from_project, @to_user, false) - - @to_project.errors.should_not be_empty - @to_project.errors[:base].should include("Fork transaction failed.") - end - - end - - context 'project already exists' do - - it "should fail due to validation, not transaction failure" do - @existing_project = create(:project, creator_id: @to_user.id, name: @from_project.name, namespace: @to_namespace) - @to_project = fork_project(@from_project, @to_user) - - @existing_project.persisted?.should be_true - @to_project.errors[:base].should include("Invalid fork destination") - @to_project.errors[:base].should_not include("Fork transaction failed.") - end - - end - end - - def fork_project(from_project, user, fork_success = true) - context = Projects::ForkService.new(from_project, user) - shell = double("gitlab_shell") - shell.stub(fork_repository: fork_success) - context.stub(gitlab_shell: shell) - context.execute - end - -end diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb new file mode 100644 index 00000000000..0edc3a8e807 --- /dev/null +++ b/spec/services/projects/fork_service_spec.rb @@ -0,0 +1,52 @@ +require 'spec_helper' + +describe Projects::ForkService do + describe :fork_by_user do + before do + @from_namespace = create(:namespace) + @from_user = create(:user, namespace: @from_namespace ) + @from_project = create(:project, creator_id: @from_user.id, + namespace: @from_namespace, star_count: 107, + description: 'wow such project') + @to_namespace = create(:namespace) + @to_user = create(:user, namespace: @to_namespace) + end + + context 'fork project' do + describe "successfully creates project in the user namespace" do + let(:to_project) { fork_project(@from_project, @to_user) } + + it { to_project.owner.should == @to_user } + it { to_project.namespace.should == @to_user.namespace } + it { to_project.star_count.should be_zero } + it { to_project.description.should == @from_project.description } + end + end + + context 'fork project failure' do + it "fails due to transaction failure" do + @to_project = fork_project(@from_project, @to_user, false) + @to_project.errors.should_not be_empty + @to_project.errors[:base].should include("Fork transaction failed.") + end + end + + context 'project already exists' do + it "should fail due to validation, not transaction failure" do + @existing_project = create(:project, creator_id: @to_user.id, name: @from_project.name, namespace: @to_namespace) + @to_project = fork_project(@from_project, @to_user) + @existing_project.persisted?.should be_true + @to_project.errors[:base].should include("Invalid fork destination") + @to_project.errors[:base].should_not include("Fork transaction failed.") + end + end + end + + def fork_project(from_project, user, fork_success = true) + context = Projects::ForkService.new(from_project, user) + shell = double("gitlab_shell") + shell.stub(fork_repository: fork_success) + context.stub(gitlab_shell: shell) + context.execute + end +end -- cgit v1.2.1