Merge branch '24685_view_self' into 'master'

Show all labels

See merge request !13303

3 files changed, 21 insertions, 17 deletions

diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index c51b81c1cff..ce458431c55 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -233,7 +233,7 @@ describe 'Issue Boards', js: true do
         wait_for_board_cards(4, 1)
 
         expect(find('.board:nth-child(3)')).to have_content(issue6.title)
-        expect(find('.board:nth-child(3)').all('.card').last).not_to have_content(development.title)
+        expect(find('.board:nth-child(3)').all('.card').last).to have_content(development.title)
       end
 
       it 'issue moves between lists' do
@@ -244,7 +244,7 @@ describe 'Issue Boards', js: true do
         wait_for_board_cards(4, 1)
 
         expect(find('.board:nth-child(2)')).to have_content(issue7.title)
-        expect(find('.board:nth-child(2)').all('.card').first).not_to have_content(planning.title)
+        expect(find('.board:nth-child(2)').all('.card').first).to have_content(planning.title)
       end
 
       it 'issue moves from closed' do
diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index 373cd92793e..8d3d4ff8773 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -257,7 +257,7 @@ describe 'Issue Boards', js: true do
         end
       end
 
-      expect(card).to have_selector('.label', count: 2)
+      expect(card).to have_selector('.label', count: 3)
       expect(card).to have_content(bug.title)
     end
 
@@ -283,7 +283,7 @@ describe 'Issue Boards', js: true do
         end
       end
 
-      expect(card).to have_selector('.label', count: 3)
+      expect(card).to have_selector('.label', count: 4)
       expect(card).to have_content(bug.title)
       expect(card).to have_content(regression.title)
     end
@@ -308,7 +308,7 @@ describe 'Issue Boards', js: true do
         end
       end
 
-      expect(card).not_to have_selector('.label')
+      expect(card).to have_selector('.label', count: 1)
       expect(card).not_to have_content(stretch.title)
     end
   end
diff --git a/spec/javascripts/boards/issue_card_spec.js b/spec/javascripts/boards/issue_card_spec.js
index bd9b4fbfdd3..69cfcbbce5a 100644
--- a/spec/javascripts/boards/issue_card_spec.js
+++ b/spec/javascripts/boards/issue_card_spec.js
@@ -238,12 +238,6 @@ describe('Issue card component', () => {
   });
 
   describe('labels', () => {
-    it('does not render any', () => {
-      expect(
-        component.$el.querySelector('.label'),
-      ).toBeNull();
-    });
-
     describe('exists', () => {
       beforeEach((done) => {
         component.issue.addLabel(label1);
@@ -251,16 +245,21 @@ describe('Issue card component', () => {
         Vue.nextTick(() => done());
       });
 
-      it('does not render list label', () => {
+      it('renders list label', () => {
         expect(
           component.$el.querySelectorAll('.label').length,
-        ).toBe(1);
+        ).toBe(2);
       });
 
       it('renders label', () => {
+        const nodes = [];
+        component.$el.querySelectorAll('.label').forEach((label) => {
+          nodes.push(label.title);
+        });
+
         expect(
-          component.$el.querySelector('.label').textContent,
-        ).toContain(label1.title);
+          nodes.includes(label1.description),
+        ).toBe(true);
       });
 
       it('sets label description as title', () => {
@@ -270,9 +269,14 @@ describe('Issue card component', () => {
       });
 
       it('sets background color of button', () => {
+        const nodes = [];
+        component.$el.querySelectorAll('.label').forEach((label) => {
+          nodes.push(label.style.backgroundColor);
+        });
+
         expect(
-          component.$el.querySelector('.label').style.backgroundColor,
-        ).toContain(label1.color);
+          nodes.includes(label1.color),
+        ).toBe(true);
       });
     });
   });