summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorKatarzyna Kobierska <kkobierska@gmail.com>2016-08-09 15:43:15 +0200
committerKatarzyna Kobierska <kkobierska@gmail.com>2016-08-30 13:05:40 +0200
commit2e08f1156998e9cd40b5eba5762182b8cb006c57 (patch)
treefab43881da54416498b34b59b111be62369a0536 /spec/models
parentc9c2503c5186a38302ed606f793b52ffa394f52c (diff)
downloadgitlab-ce-2e08f1156998e9cd40b5eba5762182b8cb006c57.tar.gz
Improve code
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/merge_request_spec.rb20
1 files changed, 16 insertions, 4 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 5fea6adf329..17337833596 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -992,7 +992,7 @@ describe MergeRequest, models: true do
target_project: project)
end
- it do
+ it "returns true" do
unlink_project.execute
merge_request.reload
@@ -1007,23 +1007,35 @@ describe MergeRequest, models: true do
let(:user) { create(:user) }
let(:unlink_project) { Projects::UnlinkForkService.new(fork_project, user) }
- context "closed MR" do
+ context "when merge request is closed" do
let(:closed_merge_request) do
create(:closed_merge_request,
source_project: fork_project,
target_project: project)
end
- it "has a fork" do
+ it "returns false if fork exist" do
expect(closed_merge_request.closed_without_fork?).to be_falsey
end
- it "does not have a fork" do
+ it "returns true if fork doesn't exist" do
unlink_project.execute
closed_merge_request.reload
expect(closed_merge_request.closed_without_fork?).to be_truthy
end
end
+
+ context "when merge request is open" do
+ let(:open_merge_request) do
+ create(:merge_request,
+ source_project: fork_project,
+ target_project: project)
+ end
+
+ it "returns false" do
+ expect(open_merge_request.closed_without_fork?).to be_falsey
+ end
+ end
end
end