diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-10-23 11:15:34 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-10-23 16:04:13 +0100 |
| commit | d01b817ee223e88e8da4dea9a09833544cb3f71b (patch) | |
| tree | 7f14928fdc300fe29dd3f9f340ff6674dd589fe7 | |
| parent | 6ebbd70fbb3bfbda9745ad16ec1cd26ad41366c5 (diff) | |
| download | gitlab-ce-53013-duplicate-escape-11-4-stable-bp.tar.gz | |
Remove duplicate escape in job sidebar53013-duplicate-escape-11-4-stable-bp
| -rw-r--r-- | app/assets/javascripts/jobs/components/jobs_container.vue | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/53013-duplicate-escape-11-4-stable-bp.yml | 5 | ||||
| -rw-r--r-- | spec/features/projects/jobs_spec.rb | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/javascripts/jobs/components/jobs_container.vue b/app/assets/javascripts/jobs/components/jobs_container.vue index 271b7790d75..6bae7de9f5b 100644 --- a/app/assets/javascripts/jobs/components/jobs_container.vue +++ b/app/assets/javascripts/jobs/components/jobs_container.vue @@ -1,5 +1,4 @@ <script> - import _ from 'underscore'; import CiIcon from '~/vue_shared/components/ci_icon.vue'; import Icon from '~/vue_shared/components/icon.vue'; import tooltip from '~/vue_shared/directives/tooltip'; @@ -27,7 +26,7 @@ return this.jobId === currentJobId; }, tooltipText(job) { - return `${_.escape(job.name)} - ${job.status.tooltip}`; + return `${job.name} - ${job.status.tooltip}`; }, }, }; diff --git a/changelogs/unreleased/53013-duplicate-escape-11-4-stable-bp.yml b/changelogs/unreleased/53013-duplicate-escape-11-4-stable-bp.yml new file mode 100644 index 00000000000..c5ec2322fb5 --- /dev/null +++ b/changelogs/unreleased/53013-duplicate-escape-11-4-stable-bp.yml @@ -0,0 +1,5 @@ +--- +title: Remove duplicate escape in job sidebar +merge_request: +author: +type: fixed diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index a3a301504ff..24bb0816402 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -151,9 +151,8 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do end it 'renders escaped tooltip name' do - page.within('aside.right-sidebar') do - expect(find('.active.build-job a')['data-original-title']).to eq('<img src=x onerror=alert(document.domain)> - passed') - end + page.find('.active.build-job a').hover + expect(page).to have_content('<img src=x onerror=alert(document.domain)> - passed') end end |