diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 18:06:21 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 18:06:21 +0000 |
| commit | d8ccc7a00b7a1ea954263170a2044257424a2cfe (patch) | |
| tree | 0a29cb558aae61795da47c82ce7e87983c5dc4af /spec/lib/gitlab/bitbucket_import | |
| parent | 90a06a20be61bb6d48d77746091492831153e075 (diff) | |
| download | gitlab-ce-d8ccc7a00b7a1ea954263170a2044257424a2cfe.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/bitbucket_import')
| -rw-r--r-- | spec/lib/gitlab/bitbucket_import/importer_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/lib/gitlab/bitbucket_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_import/importer_spec.rb index 7f7a285c453..b0d07c6e0b0 100644 --- a/spec/lib/gitlab/bitbucket_import/importer_spec.rb +++ b/spec/lib/gitlab/bitbucket_import/importer_spec.rb @@ -158,6 +158,7 @@ describe Gitlab::BitbucketImport::Importer do expect { subject.execute }.to change { MergeRequest.count }.by(1) merge_request = MergeRequest.first + expect(merge_request.state).to eq('merged') expect(merge_request.notes.count).to eq(2) expect(merge_request.notes.map(&:discussion_id).uniq.count).to eq(1) |