Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 7 deletions

diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 25aa1c1fb7d..e26582d3444 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -251,7 +251,7 @@ describe 'Issue Boards', :js do
         expect(page).to have_selector(selector, text: development.title, count: 1)
       end
 
-      it 'issue moves between lists' do
+      it 'issue moves between lists and does not show the "Development" label since the card is in the "Development" list label' do
         drag(list_from_index: 1, from_index: 1, list_to_index: 2)
 
         wait_for_board_cards(2, 7)
@@ -259,10 +259,10 @@ describe 'Issue Boards', :js 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('.board-card').last).to have_content(development.title)
+        expect(find('.board:nth-child(3)').all('.board-card').last).not_to have_content(development.title)
       end
 
-      it 'issue moves between lists' do
+      it 'issue moves between lists and does not show the "Planning" label since the card is in the "Planning" list label' do
         drag(list_from_index: 2, list_to_index: 1)
 
         wait_for_board_cards(2, 9)
@@ -270,7 +270,7 @@ describe 'Issue Boards', :js 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('.board-card').first).to have_content(planning.title)
+        expect(find('.board:nth-child(2)').all('.board-card').first).not_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 8497eaf102f..2b923df40c5 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -304,7 +304,8 @@ describe 'Issue Boards', :js do
         end
       end
 
-      expect(card).to have_selector('.badge', count: 3)
+      # 'Development' label does not show since the card is in a 'Development' list label
+      expect(card).to have_selector('.badge', count: 2)
       expect(card).to have_content(bug.title)
     end
 
@@ -330,7 +331,8 @@ describe 'Issue Boards', :js do
         end
       end
 
-      expect(card).to have_selector('.badge', count: 4)
+      # 'Development' label does not show since the card is in a 'Development' list label
+      expect(card).to have_selector('.badge', count: 3)
       expect(card).to have_content(bug.title)
       expect(card).to have_content(regression.title)
     end
@@ -357,7 +359,8 @@ describe 'Issue Boards', :js do
         end
       end
 
-      expect(card).to have_selector('.badge', count: 1)
+      # 'Development' label does not show since the card is in a 'Development' list label
+      expect(card).to have_selector('.badge', count: 0)
       expect(card).not_to have_content(stretch.title)
     end