summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKatarzyna Kobierska <kkobierska@gmail.com>2016-09-02 13:36:25 +0200
committerKatarzyna Kobierska <kkobierska@gmail.com>2016-09-13 14:40:05 +0200
commit09cded29d8b86cafbcfaed57b1d915588195f69f (patch)
tree0923e9bbe2b5de2a45fc95319db6a326cd0f5425 /spec
parent8c77a1fb250cf6d6ca06bedc3b52fc62f1cc4819 (diff)
downloadgitlab-ce-09cded29d8b86cafbcfaed57b1d915588195f69f.tar.gz
Checks if deleting forked project closed all open merge requests
Diffstat (limited to 'spec')
-rw-r--r--spec/controllers/projects_controller_spec.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb
index 95315d86c4d..4f5741f1647 100644
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -192,10 +192,12 @@ describe ProjectsController do
end
it "closes all related merge requests" do
- fork_project.destroy
+ project.merge_requests << merge_request
+ sign_in(admin)
- expect(fork_project.destroyed?).to be_truthy
- expect(merge_request.state).to eq('closed')
+ delete :destroy, namespace_id: fork_project.namespace.path, id: fork_project.path
+
+ expect(merge_request.reload.state).to eq('closed')
end
end
end