From 71046cc62919846b52d3724f7277ca14bb3a3a81 Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Thu, 11 Aug 2016 17:56:55 +0800 Subject: Fix mock --- spec/models/merge_request_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/models/merge_request_spec.rb') diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 3270b877c1a..11cfc7cace1 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -463,8 +463,8 @@ describe MergeRequest, models: true do allow(subject).to receive(:diff_head_sha).and_return('123abc') - expect(subject.source_project).to receive(:pipeline). - with('123abc', 'master'). + expect(subject.source_project).to receive(:pipeline_for). + with('master', '123abc'). and_return(pipeline) expect(subject.pipeline).to eq(pipeline) -- cgit v1.2.1 From c9c2503c5186a38302ed606f793b52ffa394f52c Mon Sep 17 00:00:00 2001 From: Katarzyna Kobierska Date: Tue, 26 Jul 2016 13:57:43 +0200 Subject: User can edit closed MR with deleted fork Add test for closed MR without fork Add view test visibility of Reopen and Close buttons Fix controller tests and validation method Fix missing space Remove unused variables from test closed_without_fork? method refactoring Add information about missing fork When closed MR without fork can't edit target branch Tests for closed MR edit view Fix indentation and rebase, refactoring --- spec/models/merge_request_spec.rb | 64 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'spec/models/merge_request_spec.rb') diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index d67f71bbb9c..5fea6adf329 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -962,4 +962,68 @@ describe MergeRequest, models: true do expect(merge_request.conflicts_can_be_resolved_in_ui?).to be_truthy end end + + describe "#fork_missing?" do + let(:project) { create(:project) } + let(:fork_project) { create(:project, forked_from_project: project) } + let(:user) { create(:user) } + let(:unlink_project) { Projects::UnlinkForkService.new(fork_project, user) } + + context "when fork exists" do + let(:merge_request) do + create(:merge_request, + source_project: fork_project, + target_project: project) + end + + it { expect(merge_request.fork_missing?).to be_falsey } + end + + context "when source project is the target project" do + let(:merge_request) { create(:merge_request, source_project: project) } + + it { expect(merge_request.fork_missing?).to be_falsey } + end + + context "when fork does not exist" do + let(:merge_request) do + create(:merge_request, + source_project: fork_project, + target_project: project) + end + + it do + unlink_project.execute + merge_request.reload + + expect(merge_request.fork_missing?).to be_truthy + end + end + end + + describe "#closed_without_fork?" do + let(:project) { create(:project) } + let(:fork_project) { create(:project, forked_from_project: project) } + let(:user) { create(:user) } + let(:unlink_project) { Projects::UnlinkForkService.new(fork_project, user) } + + context "closed MR" do + let(:closed_merge_request) do + create(:closed_merge_request, + source_project: fork_project, + target_project: project) + end + + it "has a fork" do + expect(closed_merge_request.closed_without_fork?).to be_falsey + end + + it "does not have a fork" do + unlink_project.execute + closed_merge_request.reload + + expect(closed_merge_request.closed_without_fork?).to be_truthy + end + end + end end -- cgit v1.2.1 From 2e08f1156998e9cd40b5eba5762182b8cb006c57 Mon Sep 17 00:00:00 2001 From: Katarzyna Kobierska Date: Tue, 9 Aug 2016 15:43:15 +0200 Subject: Improve code --- spec/models/merge_request_spec.rb | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'spec/models/merge_request_spec.rb') 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 -- cgit v1.2.1 From 6b02c82cfe68dc0f19cb3523eed1769a1e6d64b9 Mon Sep 17 00:00:00 2001 From: Katarzyna Kobierska Date: Wed, 10 Aug 2016 15:36:30 +0200 Subject: Improve grammar --- spec/models/merge_request_spec.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'spec/models/merge_request_spec.rb') diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 17337833596..4cbf87ba792 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -969,7 +969,7 @@ describe MergeRequest, models: true do let(:user) { create(:user) } let(:unlink_project) { Projects::UnlinkForkService.new(fork_project, user) } - context "when fork exists" do + context "when the fork exists" do let(:merge_request) do create(:merge_request, source_project: fork_project, @@ -979,13 +979,13 @@ describe MergeRequest, models: true do it { expect(merge_request.fork_missing?).to be_falsey } end - context "when source project is the target project" do + context "when the source project is the same as the target project" do let(:merge_request) { create(:merge_request, source_project: project) } it { expect(merge_request.fork_missing?).to be_falsey } end - context "when fork does not exist" do + context "when the fork does not exist" do let(:merge_request) do create(:merge_request, source_project: fork_project, @@ -1007,18 +1007,18 @@ describe MergeRequest, models: true do let(:user) { create(:user) } let(:unlink_project) { Projects::UnlinkForkService.new(fork_project, user) } - context "when merge request is closed" do + context "when the merge request is closed" do let(:closed_merge_request) do create(:closed_merge_request, source_project: fork_project, target_project: project) end - it "returns false if fork exist" do + it "returns false if the fork exist" do expect(closed_merge_request.closed_without_fork?).to be_falsey end - it "returns true if fork doesn't exist" do + it "returns true if the fork does not exist" do unlink_project.execute closed_merge_request.reload @@ -1026,7 +1026,7 @@ describe MergeRequest, models: true do end end - context "when merge request is open" do + context "when the merge request is open" do let(:open_merge_request) do create(:merge_request, source_project: fork_project, -- cgit v1.2.1 From 2d8d94a788eb0bf3885ee67bda9638556425fa4b Mon Sep 17 00:00:00 2001 From: Katarzyna Kobierska Date: Tue, 30 Aug 2016 13:31:39 +0200 Subject: Change method name --- spec/models/merge_request_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'spec/models/merge_request_spec.rb') diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 4cbf87ba792..901b7bad007 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -963,7 +963,7 @@ describe MergeRequest, models: true do end end - describe "#fork_missing?" do + describe "#forked_source_project_missing?" do let(:project) { create(:project) } let(:fork_project) { create(:project, forked_from_project: project) } let(:user) { create(:user) } @@ -976,13 +976,13 @@ describe MergeRequest, models: true do target_project: project) end - it { expect(merge_request.fork_missing?).to be_falsey } + it { expect(merge_request.forked_source_project_missing?).to be_falsey } end context "when the source project is the same as the target project" do let(:merge_request) { create(:merge_request, source_project: project) } - it { expect(merge_request.fork_missing?).to be_falsey } + it { expect(merge_request.forked_source_project_missing?).to be_falsey } end context "when the fork does not exist" do @@ -996,7 +996,7 @@ describe MergeRequest, models: true do unlink_project.execute merge_request.reload - expect(merge_request.fork_missing?).to be_truthy + expect(merge_request.forked_source_project_missing?).to be_truthy end end end -- cgit v1.2.1