summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/jobs/components/job_container_item.vue11
-rw-r--r--changelogs/unreleased/53013-duplicate-escape.yml5
-rw-r--r--spec/features/projects/jobs_spec.rb5
3 files changed, 12 insertions, 9 deletions
diff --git a/app/assets/javascripts/jobs/components/job_container_item.vue b/app/assets/javascripts/jobs/components/job_container_item.vue
index 81cc0823792..6486b25c8a7 100644
--- a/app/assets/javascripts/jobs/components/job_container_item.vue
+++ b/app/assets/javascripts/jobs/components/job_container_item.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';
@@ -9,11 +8,9 @@ export default {
CiIcon,
Icon,
},
-
directives: {
tooltip,
},
-
props: {
job: {
type: Object,
@@ -24,10 +21,9 @@ export default {
required: true,
},
},
-
computed: {
tooltipText() {
- return `${_.escape(this.job.name)} - ${this.job.status.tooltip}`;
+ return `${this.job.name} - ${this.job.status.tooltip}`;
},
},
};
@@ -36,7 +32,10 @@ export default {
<template>
<div
class="build-job"
- :class="{ retried: job.retried, active: isActive }"
+ :class="{
+ retried: job.retried,
+ active: isActive
+ }"
>
<a
v-tooltip
diff --git a/changelogs/unreleased/53013-duplicate-escape.yml b/changelogs/unreleased/53013-duplicate-escape.yml
new file mode 100644
index 00000000000..c5ec2322fb5
--- /dev/null
+++ b/changelogs/unreleased/53013-duplicate-escape.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 1ea8a640e17..c3902ecdd17 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('&lt;img src=x onerror=alert(document.domain)&gt; - passed')
- end
+ page.find('.active.build-job a').hover
+ expect(page).to have_content('<img src=x onerror=alert(document.domain)> - passed')
end
end