Fix broken specs

5 files changed, 10 insertions, 22 deletions

diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue
index fb41b7c6ab4..c13bbcee863 100644
--- a/app/assets/javascripts/clusters/components/application_row.vue
+++ b/app/assets/javascripts/clusters/components/application_row.vue
@@ -1,4 +1,5 @@
 <script>
+  /* eslint-disable vue/require-default-prop */
   import { s__, sprintf } from '../../locale';
   import eventHub from '../event_hub';
   import loadingButton from '../../vue_shared/components/loading_button.vue';
@@ -30,7 +31,6 @@
       titleLink: {
         type: String,
         required: false,
-        default: null,
       },
       description: {
         type: String,
@@ -39,22 +39,18 @@
       status: {
         type: String,
         required: false,
-        default: null,
       },
       statusReason: {
         type: String,
         required: false,
-        default: null,
       },
       requestStatus: {
         type: String,
         required: false,
-        default: '',
       },
       requestReason: {
         type: String,
         required: false,
-        default: null,
       },
     },
     computed: {
@@ -62,7 +58,7 @@
         return `js-cluster-application-row-${this.id}`;
       },
       installButtonLoading() {
-        return this.status ||
+        return !this.status ||
           this.status === APPLICATION_SCHEDULED ||
           this.status === APPLICATION_INSTALLING ||
           this.requestStatus === REQUEST_LOADING;
@@ -180,7 +176,7 @@
               {{ statusReason }}
             </li>
             <li
-              v-if="requestReaso"
+              v-if="requestReason"
               class="js-cluster-application-request-error-message"
             >
               {{ requestReason }}
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 146ef5e450b..759cdd1ded9 100644
--- a/app/assets/javascripts/projects_dropdown/components/projects_list_item.vue
+++ b/app/assets/javascripts/projects_dropdown/components/projects_list_item.vue
@@ -1,4 +1,5 @@
 <script>
+  /* eslint-disable vue/require-default-prop, vue/require-prop-types */
   import identicon from '../../vue_shared/components/identicon.vue';
 
   export default {
@@ -9,7 +10,6 @@
       matcher: {
         type: String,
         required: false,
-        default: '',
       },
       projectId: {
         type: Number,
@@ -28,7 +28,6 @@
         required: true,
       },
       avatarUrl: {
-        type: [String, Object],
         required: true,
         validator(value) {
           return value === null || typeof value === 'string';
@@ -40,7 +39,7 @@
         return this.avatarUrl !== null;
       },
       highlightedProjectName() {
-        if (this.matcher !== '') {
+        if (this.matcher) {
           const matcherRegEx = new RegExp(this.matcher, 'gi');
           const matches = this.projectName.match(matcherRegEx);
 
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
index 6a6a8cdd05d..7226076a8fc 100644
--- a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue
@@ -1,4 +1,5 @@
 <script>
+  /* eslint-disable vue/require-default-prop */
   import { __ } from '../../../locale';
   import eventHub from '../../event_hub';
   import loadingButton from '../../../vue_shared/components/loading_button.vue';
@@ -16,12 +17,10 @@
       subscribed: {
         type: Boolean,
         required: false,
-        default: false,
       },
       id: {
         type: Number,
         required: false,
-        default: 0,
       },
     },
     computed: {
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
index 1b1eb5b5764..109a302a172 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue
@@ -1,4 +1,5 @@
 <script>
+  /* eslint-disable vue/require-default-prop */
   import pipelineStage from '../../pipelines/components/stage.vue';
   import ciIcon from '../../vue_shared/components/ci_icon.vue';
   import icon from '../../vue_shared/components/icon.vue';
@@ -20,12 +21,10 @@
       hasCi: {
         type: Boolean,
         required: false,
-        default: false,
       },
       ciStatus: {
         type: String,
         required: false,
-        default: '',
       },
     },
     computed: {
@@ -33,7 +32,7 @@
         return this.pipeline && Object.keys(this.pipeline).length > 0;
       },
       hasCIError() {
-        return this.hasCi && this.ciStatus !== '';
+        return this.hasCi && !this.ciStatus;
       },
       status() {
         return this.pipeline.details &&
diff --git a/app/assets/javascripts/vue_shared/components/loading_button.vue b/app/assets/javascripts/vue_shared/components/loading_button.vue
index 31caa25b723..ff8c0f7c1d2 100644
--- a/app/assets/javascripts/vue_shared/components/loading_button.vue
+++ b/app/assets/javascripts/vue_shared/components/loading_button.vue
@@ -1,4 +1,5 @@
 <script>
+  /* eslint-disable vue/require-default-prop */
 
   /* This is a re-usable vue component for rendering a button
     that will probably be sending off ajax requests and need
@@ -37,7 +38,6 @@
       label: {
         type: String,
         required: false,
-        default: '',
       },
       containerClass: {
         type: String,
@@ -45,11 +45,6 @@
         default: 'btn btn-align-content',
       },
     },
-    computed: {
-      hasLabel() {
-        return this.label !== '';
-      },
-    },
     methods: {
       onClick(e) {
         this.$emit('click', e);
@@ -77,7 +72,7 @@
     </transition>
     <transition name="fade">
       <span
-        v-if="hasLabel"
+        v-if="label"
         class="js-loading-button-label"
       >
         {{ label }}