diff options
| author | Nathan Friend <nathan@gitlab.com> | 2019-03-21 15:31:09 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-03-21 15:31:09 +0000 |
| commit | 7e6b57499f838245136e0657069f7559b1eba02f (patch) | |
| tree | 79c320971de9ff6e4e17260035a04b6457413833 /spec/models/environment_status_spec.rb | |
| parent | 1e8cd7f9d9cbb53614f9ba5aee00e67e56a4851e (diff) | |
| download | gitlab-ce-7e6b57499f838245136e0657069f7559b1eba02f.tar.gz | |
Update merge request widget pipeline block
This commit updates the pipeline block that appears on the merge request
page to include information that will be exposed by the API as part of
the post-merge pipeline feature.
Diffstat (limited to 'spec/models/environment_status_spec.rb')
| -rw-r--r-- | spec/models/environment_status_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/environment_status_spec.rb b/spec/models/environment_status_spec.rb index 9da16dea929..2576a9aba06 100644 --- a/spec/models/environment_status_spec.rb +++ b/spec/models/environment_status_spec.rb @@ -64,8 +64,8 @@ describe EnvironmentStatus do end describe '.for_merge_request' do - let(:admin) { create(:admin) } - let(:pipeline) { create(:ci_pipeline, sha: sha) } + let(:admin) { create(:admin) } + let!(:pipeline) { create(:ci_pipeline, sha: sha, merge_requests_as_head_pipeline: [merge_request]) } it 'is based on merge_request.diff_head_sha' do expect(merge_request).to receive(:diff_head_sha) |