diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2019-05-08 22:52:23 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2019-05-08 22:52:23 +0000 |
| commit | fa6e00d05dedfac9ec28bf1a4735bffc38a5b4d0 (patch) | |
| tree | 07c2087939b6c6dce33620c57a6989d76547e681 /spec/lib/gitlab/bitbucket_server_import/importer_spec.rb | |
| parent | 204dca4436f5b2c82611a873d05186ec4ff4c17c (diff) | |
| parent | 2f003b58645b3cbc987c240f844b1ff6eb0c026a (diff) | |
| download | gitlab-ce-fa6e00d05dedfac9ec28bf1a4735bffc38a5b4d0.tar.gz | |
Merge branch '11-11-stable-prepare-rc2' into '11-11-stable'
Prepare 11.11.0-rc2 release
See merge request gitlab-org/gitlab-ce!28215
Diffstat (limited to 'spec/lib/gitlab/bitbucket_server_import/importer_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/bitbucket_server_import/importer_spec.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb b/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb index 1e90a2ef27f..cc09804fd53 100644 --- a/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb +++ b/spec/lib/gitlab/bitbucket_server_import/importer_spec.rb @@ -105,6 +105,7 @@ describe Gitlab::BitbucketServerImport::Importer do expect(merge_request.metrics.merged_by).to eq(project.owner) expect(merge_request.metrics.merged_at).to eq(@merge_event.merge_timestamp) expect(merge_request.merge_commit_sha).to eq('12345678') + expect(merge_request.state_id).to eq(3) end it 'imports comments' do |