summaryrefslogtreecommitdiff
path: root/spec/models/merge_request_spec.rb
diff options
context:
space:
mode:
authorKatarzyna Kobierska <kkobierska@gmail.com>2016-08-10 15:36:30 +0200
committerKatarzyna Kobierska <kkobierska@gmail.com>2016-08-30 13:05:40 +0200
commit6b02c82cfe68dc0f19cb3523eed1769a1e6d64b9 (patch)
tree4e9ce0cb0ffe56dcb9b991f9f967d08b559b4915 /spec/models/merge_request_spec.rb
parent2e08f1156998e9cd40b5eba5762182b8cb006c57 (diff)
downloadgitlab-ce-6b02c82cfe68dc0f19cb3523eed1769a1e6d64b9.tar.gz
Improve grammar
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r--spec/models/merge_request_spec.rb14
1 files changed, 7 insertions, 7 deletions
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,