diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 15:07:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 15:07:33 +0300 |
| commit | 6b75320f525f841454f1ab162d141d3610f2e77b (patch) | |
| tree | 4971c27759e4fbc18b85e71800c3b9c12346317e /spec/lib/gitlab/import | |
| parent | 4226aca420920c1844e8eade4798a2dff188a6fc (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/import')
| -rw-r--r-- | spec/lib/gitlab/import/merge_request_creator_spec.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/lib/gitlab/import/merge_request_creator_spec.rb b/spec/lib/gitlab/import/merge_request_creator_spec.rb index 7c73e9b39f7..ff2c3032dbf 100644 --- a/spec/lib/gitlab/import/merge_request_creator_spec.rb +++ b/spec/lib/gitlab/import/merge_request_creator_spec.rb @@ -21,8 +21,11 @@ describe Gitlab::Import::MergeRequestCreator do subject.execute(attributes) - expect(merge_request.reload.merge_request_diffs.count).to eq(1) - expect(merge_request.reload.merge_request_diffs.first.commits.count).to eq(commits_count) + merge_request.reload + + expect(merge_request.merge_request_diffs.count).to eq(1) + expect(merge_request.merge_request_diffs.first.commits.count).to eq(commits_count) + expect(merge_request.latest_merge_request_diff_id).to eq(merge_request.merge_request_diffs.first.id) end end |