Add latest changes from gitlab-org/gitlab@master

4 files changed, 5 insertions, 5 deletions

diff --git a/spec/frontend/batch_comments/components/draft_note_spec.js b/spec/frontend/batch_comments/components/draft_note_spec.js
index ccca4a2c3e9..d7796f38680 100644
--- a/spec/frontend/batch_comments/components/draft_note_spec.js
+++ b/spec/frontend/batch_comments/components/draft_note_spec.js
@@ -115,7 +115,7 @@ describe('Batch comments draft note component', () => {
       await nextTick();
       const publishNowButton = findSubmitReviewButton();
 
-      expect(publishNowButton.attributes().disabled).toBeTruthy();
+      expect(publishNowButton.attributes().disabled).toBe('true');
     });
   });
 
diff --git a/spec/frontend/diffs/components/commit_item_spec.js b/spec/frontend/diffs/components/commit_item_spec.js
index e52c5abbc7b..286e94ae7fd 100644
--- a/spec/frontend/diffs/components/commit_item_spec.js
+++ b/spec/frontend/diffs/components/commit_item_spec.js
@@ -111,8 +111,8 @@ describe('diffs/components/commit_item', () => {
       const descElement = getDescElement();
       const descExpandElement = getDescExpandElement();
 
-      expect(descElement.exists()).toBeFalsy();
-      expect(descExpandElement.exists()).toBeFalsy();
+      expect(descElement.exists()).toBe(false);
+      expect(descExpandElement.exists()).toBe(false);
     });
   });
 
diff --git a/spec/frontend/ide/components/shared/tokened_input_spec.js b/spec/frontend/ide/components/shared/tokened_input_spec.js
index a37c08af0a1..2efef9918b1 100644
--- a/spec/frontend/ide/components/shared/tokened_input_spec.js
+++ b/spec/frontend/ide/components/shared/tokened_input_spec.js
@@ -50,7 +50,7 @@ describe('IDE shared/TokenedInput', () => {
   });
 
   it('renders input', () => {
-    expect(vm.$refs.input).toBeTruthy();
+    expect(vm.$refs.input).toBeInstanceOf(HTMLInputElement);
     expect(vm.$refs.input).toHaveValue(TEST_VALUE);
   });
 
diff --git a/spec/frontend/pipeline_editor/components/commit/commit_form_spec.js b/spec/frontend/pipeline_editor/components/commit/commit_form_spec.js
index bec6c2a8d0c..0ee6da9d329 100644
--- a/spec/frontend/pipeline_editor/components/commit/commit_form_spec.js
+++ b/spec/frontend/pipeline_editor/components/commit/commit_form_spec.js
@@ -152,7 +152,7 @@ describe('Pipeline Editor | Commit Form', () => {
     });
 
     it('emits "scrolled-to-commit-form"', () => {
-      expect(wrapper.emitted()['scrolled-to-commit-form']).toBeTruthy();
+      expect(wrapper.emitted()['scrolled-to-commit-form']).toHaveLength(1);
     });
   });
 });