summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-01-09 11:09:17 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-01-09 11:09:17 +0000
commit3d528e2334faa83cfaf3421e7431c7d2fbb22a4f (patch)
treea1a34d8c2be25484608ef1c113a854452a1025a2
parent3ea65baeefaa8505e3998261e3e1bb99a5cc6c01 (diff)
downloadgitlab-ce-3d528e2334faa83cfaf3421e7431c7d2fbb22a4f.tar.gz
Fix broken tests for project list and header
-rw-r--r--app/assets/javascripts/jobs/components/header.vue2
-rw-r--r--app/assets/javascripts/projects_dropdown/components/projects_list_item.vue2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/jobs/components/header.vue b/app/assets/javascripts/jobs/components/header.vue
index 73d2d68c8bc..9e3f659db5f 100644
--- a/app/assets/javascripts/jobs/components/header.vue
+++ b/app/assets/javascripts/jobs/components/header.vue
@@ -31,7 +31,7 @@
return !this.isLoading && Object.keys(this.job).length;
},
jobStarted() {
- return this.job.started !== undefined;
+ return this.job.started;
},
},
watch: {
diff --git a/app/assets/javascripts/projects_dropdown/components/projects_list_item.vue b/app/assets/javascripts/projects_dropdown/components/projects_list_item.vue
index 783fa5678de..146ef5e450b 100644
--- a/app/assets/javascripts/projects_dropdown/components/projects_list_item.vue
+++ b/app/assets/javascripts/projects_dropdown/components/projects_list_item.vue
@@ -28,7 +28,7 @@
required: true,
},
avatarUrl: {
- type: String,
+ type: [String, Object],
required: true,
validator(value) {
return value === null || typeof value === 'string';