diff options
author | Mike Greiling <mike@pixelcog.com> | 2018-12-06 00:36:18 +0300 |
---|---|---|
committer | Mike Greiling <mike@pixelcog.com> | 2018-12-06 00:36:18 +0300 |
commit | ec2c268b5ea51a11ded3dc87b034cca81b5090c4 (patch) | |
tree | 0290b47bf62b5387f129eba689e69b25af9b73b7 /spec/javascripts | |
parent | cfe484795d4ddb8c7b3247802547e3da74c64cf2 (diff) | |
parent | a611eab9422b3e9038aa7649f77f0dcc3da0f2d0 (diff) |
Merge branch '54336-include-tags-into-pipeline-detail-view' into 'master'
Resolve "Include tags into pipeline detail view"
Closes #54336
See merge request gitlab-org/gitlab-ce!23364
Diffstat (limited to 'spec/javascripts')
-rw-r--r-- | spec/javascripts/pipelines/pipeline_url_spec.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/javascripts/pipelines/pipeline_url_spec.js b/spec/javascripts/pipelines/pipeline_url_spec.js index d6c44f4c976..ea917b36526 100644 --- a/spec/javascripts/pipelines/pipeline_url_spec.js +++ b/spec/javascripts/pipelines/pipeline_url_spec.js @@ -90,7 +90,7 @@ describe('Pipeline Url Component', () => { expect(component.$el.querySelector('.js-pipeline-url-api').textContent).toContain('API'); }); - it('should render latest, yaml invalid and stuck flags when provided', () => { + it('should render latest, yaml invalid, merge request, and stuck flags when provided', () => { const component = new PipelineUrlComponent({ propsData: { pipeline: { @@ -100,6 +100,7 @@ describe('Pipeline Url Component', () => { latest: true, yaml_errors: true, stuck: true, + merge_request: true, }, }, autoDevopsHelpPath: 'foo', @@ -111,6 +112,10 @@ describe('Pipeline Url Component', () => { 'yaml invalid', ); + expect(component.$el.querySelector('.js-pipeline-url-mergerequest').textContent).toContain( + 'merge request', + ); + expect(component.$el.querySelector('.js-pipeline-url-stuck').textContent).toContain('stuck'); }); |