1 files changed, 40 insertions, 8 deletions
diff --git a/spec/services/projects/unlink_fork_service_spec.rb b/spec/services/projects/unlink_fork_service_spec.rb
index 4f1ab697460..2bba71fef4f 100644
--- a/spec/services/projects/unlink_fork_service_spec.rb
+++ b/spec/services/projects/unlink_fork_service_spec.rb
@@ -1,37 +1,59 @@
 require 'spec_helper'
 
 describe Projects::UnlinkForkService do
-  subject { described_class.new(fork_project, user) }
+  include ProjectForksHelper
 
-  let(:fork_link) { create(:forked_project_link) }
-  let(:fork_project) { fork_link.forked_to_project }
+  subject { described_class.new(forked_project, user) }
+
+  let(:fork_link) { forked_project.forked_project_link }
+  let(:project) { create(:project, :public) }
+  let(:forked_project) { fork_project(project, user) }
   let(:user) { create(:user) }
 
   context 'with opened merge request on the source project' do
-    let(:merge_request) { create(:merge_request, source_project: fork_project, target_project: fork_link.forked_from_project) }
-    let(:mr_close_service) { MergeRequests::CloseService.new(fork_project, user) }
+    let(:merge_request) { create(:merge_request, source_project: forked_project, target_project: fork_link.forked_from_project) }
+    let(:merge_request2) { create(:merge_request, source_project: forked_project, target_project: fork_project(project)) }
+    let(:merge_request_in_fork) { create(:merge_request, source_project: forked_project, target_project: forked_project) }
+
+    let(:mr_close_service) { MergeRequests::CloseService.new(forked_project, user) }
 
     before do
       allow(MergeRequests::CloseService).to receive(:new)
-        .with(fork_project, user)
+        .with(forked_project, user)
         .and_return(mr_close_service)
     end
 
     it 'close all pending merge requests' do
       expect(mr_close_service).to receive(:execute).with(merge_request)
+      expect(mr_close_service).to receive(:execute).with(merge_request2)
 
       subject.execute
     end
+
+    it 'does not close merge requests for the project being unlinked' do
+      expect(mr_close_service).not_to receive(:execute).with(merge_request_in_fork)
+    end
   end
 
   it 'remove fork relation' do
-    expect(fork_project.forked_project_link).to receive(:destroy)
+    expect(forked_project.forked_project_link).to receive(:destroy)
 
     subject.execute
   end
 
+  it 'removes the link to the fork network' do
+    expect(forked_project.fork_network_member).to be_present
+    expect(forked_project.fork_network).to be_present
+
+    subject.execute
+    forked_project.reload
+
+    expect(forked_project.fork_network_member).to be_nil
+    expect(forked_project.reload.fork_network).to be_nil
+  end
+
   it 'refreshes the forks count cache of the source project' do
-    source = fork_project.forked_from_project
+    source = forked_project.forked_from_project
 
     expect(source.forks_count).to eq(1)
 
@@ -39,4 +61,14 @@ describe Projects::UnlinkForkService do
 
     expect(source.forks_count).to be_zero
   end
+
+  context 'when the original project was deleted' do
+    it 'does not fail when the original project is deleted' do
+      source = forked_project.forked_from_project
+      source.destroy
+      forked_project.reload
+
+      expect { subject.execute }.not_to raise_error
+    end
+  end
 end