Fix some karma specs

4 files changed, 13 insertions, 13 deletions

diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js
index e8b0b2dde9d..eac7ae6017a 100644
--- a/app/assets/javascripts/main.js
+++ b/app/assets/javascripts/main.js
@@ -48,7 +48,7 @@ document.addEventListener('beforeunload', () => {
   // Close any open tooltips
   $('.has-tooltip, [data-toggle="tooltip"]').tooltip('dispose');
   // Close any open popover
-  $('[data-toggle="popover"]').popover('destroy');
+  $('[data-toggle="popover"]').popover('dispose');
 });
 
 window.addEventListener('hashchange', handleLocationHash);
diff --git a/app/assets/javascripts/vue_shared/directives/popover.js b/app/assets/javascripts/vue_shared/directives/popover.js
index eb35294906b..c913bc34c68 100644
--- a/app/assets/javascripts/vue_shared/directives/popover.js
+++ b/app/assets/javascripts/vue_shared/directives/popover.js
@@ -17,6 +17,6 @@ export default {
   },
 
   unbind(el) {
-    $(el).popover('destroy');
+    $(el).popover('dispose');
   },
 };
diff --git a/spec/javascripts/boards/issue_card_spec.js b/spec/javascripts/boards/issue_card_spec.js
index 696351a1ce5..abeef272c68 100644
--- a/spec/javascripts/boards/issue_card_spec.js
+++ b/spec/javascripts/boards/issue_card_spec.js
@@ -248,13 +248,13 @@ describe('Issue card component', () => {
 
     it('renders list label', () => {
       expect(
-        component.$el.querySelectorAll('.label').length,
+        component.$el.querySelectorAll('.badge').length,
       ).toBe(2);
     });
 
     it('renders label', () => {
       const nodes = [];
-      component.$el.querySelectorAll('.label').forEach((label) => {
+      component.$el.querySelectorAll('.badge').forEach((label) => {
         nodes.push(label.title);
       });
 
@@ -265,13 +265,13 @@ describe('Issue card component', () => {
 
     it('sets label description as title', () => {
       expect(
-        component.$el.querySelector('.label').getAttribute('title'),
+        component.$el.querySelector('.badge').getAttribute('title'),
       ).toContain(label1.description);
     });
 
     it('sets background color of button', () => {
       const nodes = [];
-      component.$el.querySelectorAll('.label').forEach((label) => {
+      component.$el.querySelectorAll('.badge').forEach((label) => {
         nodes.push(label.style.backgroundColor);
       });
 
@@ -288,7 +288,7 @@ describe('Issue card component', () => {
       Vue.nextTick()
         .then(() => {
           expect(
-            component.$el.querySelectorAll('.label').length,
+            component.$el.querySelectorAll('.badge').length,
           ).toBe(2);
           expect(
             component.$el.textContent,
diff --git a/spec/javascripts/gl_dropdown_spec.js b/spec/javascripts/gl_dropdown_spec.js
index 5393502196e..32efdb11379 100644
--- a/spec/javascripts/gl_dropdown_spec.js
+++ b/spec/javascripts/gl_dropdown_spec.js
@@ -71,9 +71,9 @@ describe('glDropdown', function describeDropdown() {
 
   it('should open on click', () => {
     initDropDown.call(this, false);
-    expect(this.dropdownContainerElement).not.toHaveClass('open');
+    expect(this.dropdownContainerElement).not.toHaveClass('show');
     this.dropdownButtonElement.click();
-    expect(this.dropdownContainerElement).toHaveClass('open');
+    expect(this.dropdownContainerElement).toHaveClass('show');
   });
 
   it('escapes HTML as text', () => {
@@ -135,12 +135,12 @@ describe('glDropdown', function describeDropdown() {
     });
 
     it('should click the selected item on ENTER keypress', () => {
-      expect(this.dropdownContainerElement).toHaveClass('open');
+      expect(this.dropdownContainerElement).toHaveClass('show');
       const randomIndex = Math.floor(Math.random() * (this.projectsData.length - 1)) + 0;
       navigateWithKeys('down', randomIndex, () => {
         spyOn(urlUtils, 'visitUrl').and.stub();
         navigateWithKeys('enter', null, () => {
-          expect(this.dropdownContainerElement).not.toHaveClass('open');
+          expect(this.dropdownContainerElement).not.toHaveClass('show');
           const link = $(`${ITEM_SELECTOR}:eq(${randomIndex}) a`, this.$dropdownMenuElement);
           expect(link).toHaveClass('is-active');
           const linkedLocation = link.attr('href');
@@ -150,13 +150,13 @@ describe('glDropdown', function describeDropdown() {
     });
 
     it('should close on ESC keypress', () => {
-      expect(this.dropdownContainerElement).toHaveClass('open');
+      expect(this.dropdownContainerElement).toHaveClass('show');
       this.dropdownContainerElement.trigger({
         type: 'keyup',
         which: ARROW_KEYS.ESC,
         keyCode: ARROW_KEYS.ESC
       });
-      expect(this.dropdownContainerElement).not.toHaveClass('open');
+      expect(this.dropdownContainerElement).not.toHaveClass('show');
     });
   });