diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 13:26:31 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-13 13:26:31 +0000 |
commit | b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch) | |
tree | 5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /spec/models/merge_request_spec.rb | |
parent | 25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff) | |
download | gitlab-ce-b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/models/merge_request_spec.rb')
-rw-r--r-- | spec/models/merge_request_spec.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 11234982dd4..fde1b096c76 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -195,7 +195,6 @@ describe MergeRequest do with_them do it "validates source_branch" do subject = build(:merge_request, source_branch: branch_name, target_branch: 'master') - subject.valid? expect(subject.errors.added?(:source_branch)).to eq(!valid) @@ -203,7 +202,6 @@ describe MergeRequest do it "validates target_branch" do subject = build(:merge_request, source_branch: 'master', target_branch: branch_name) - subject.valid? expect(subject.errors.added?(:target_branch)).to eq(!valid) |