Add latest changes from gitlab-org/gitlab@master

5 files changed, 5 insertions, 130 deletions

diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index e36378bd34e..eb8c1826dfd 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -24,33 +24,11 @@ RSpec.describe 'Issue Boards', :js do
   context 'no lists' do
     before do
       visit project_board_path(project, board)
-      wait_for_requests
-      expect(page).to have_selector('.board', count: 3)
-    end
-
-    it 'shows blank state' do
-      expect(page).to have_content('Welcome to your Issue Board!')
-    end
-
-    it 'shows tooltip on add issues button' do
-      button = page.find('.filter-dropdown-container button', text: 'Add issues')
-
-      expect(button[:"data-original-title"]).to eq("Please add a list to your board first")
-    end
-
-    it 'hides the blank state when clicking nevermind button' do
-      page.within(find('.board-blank-state')) do
-        click_button("Nevermind, I'll use my own")
-      end
-      expect(page).to have_selector('.board', count: 2)
     end
 
     it 'creates default lists' do
       lists = ['Open', 'To Do', 'Doing', 'Closed']
 
-      page.within(find('.board-blank-state')) do
-        click_button('Add default lists')
-      end
       wait_for_requests
 
       expect(page).to have_selector('.board', count: 4)
diff --git a/spec/frontend/boards/board_blank_state_spec.js b/spec/frontend/boards/board_blank_state_spec.js
deleted file mode 100644
index 3ffdda52f58..00000000000
--- a/spec/frontend/boards/board_blank_state_spec.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import Vue from 'vue';
-import boardsStore from '~/boards/stores/boards_store';
-import BoardBlankState from '~/boards/components/board_blank_state.vue';
-
-describe('Boards blank state', () => {
-  let vm;
-  let fail = false;
-
-  beforeEach(done => {
-    const Comp = Vue.extend(BoardBlankState);
-
-    boardsStore.create();
-
-    jest.spyOn(boardsStore, 'addList').mockImplementation();
-    jest.spyOn(boardsStore, 'removeList').mockImplementation();
-    jest.spyOn(boardsStore, 'generateDefaultLists').mockImplementation(
-      () =>
-        new Promise((resolve, reject) => {
-          if (fail) {
-            reject();
-          } else {
-            resolve({
-              data: [
-                {
-                  id: 1,
-                  title: 'To Do',
-                  label: { id: 1 },
-                },
-                {
-                  id: 2,
-                  title: 'Doing',
-                  label: { id: 2 },
-                },
-              ],
-            });
-          }
-        }),
-    );
-
-    vm = new Comp();
-
-    setImmediate(() => {
-      vm.$mount();
-      done();
-    });
-  });
-
-  it('renders pre-defined labels', () => {
-    expect(vm.$el.querySelectorAll('.board-blank-state-list li').length).toBe(2);
-
-    expect(vm.$el.querySelectorAll('.board-blank-state-list li')[0].textContent.trim()).toEqual(
-      'To Do',
-    );
-
-    expect(vm.$el.querySelectorAll('.board-blank-state-list li')[1].textContent.trim()).toEqual(
-      'Doing',
-    );
-  });
-
-  it('clears blank state', done => {
-    vm.$el.querySelector('.btn-default').click();
-
-    setImmediate(() => {
-      expect(boardsStore.welcomeIsHidden()).toBeTruthy();
-
-      done();
-    });
-  });
-
-  it('creates pre-defined labels', done => {
-    vm.$el.querySelector('.btn-success').click();
-
-    setImmediate(() => {
-      expect(boardsStore.addList).toHaveBeenCalledTimes(2);
-      expect(boardsStore.addList).toHaveBeenCalledWith(expect.objectContaining({ title: 'To Do' }));
-
-      expect(boardsStore.addList).toHaveBeenCalledWith(expect.objectContaining({ title: 'Doing' }));
-
-      done();
-    });
-  });
-
-  it('resets the store if request fails', done => {
-    fail = true;
-
-    vm.$el.querySelector('.btn-success').click();
-
-    setImmediate(() => {
-      expect(boardsStore.welcomeIsHidden()).toBeFalsy();
-      expect(boardsStore.removeList).toHaveBeenCalledWith(undefined, 'label');
-
-      done();
-    });
-  });
-});
diff --git a/spec/frontend/boards/boards_store_spec.js b/spec/frontend/boards/boards_store_spec.js
index 7fac30c5616..e7c1cf79fdc 100644
--- a/spec/frontend/boards/boards_store_spec.js
+++ b/spec/frontend/boards/boards_store_spec.js
@@ -745,14 +745,6 @@ describe('boardsStore', () => {
         expect(boardsStore.shouldAddBlankState()).toBe(true);
       });
 
-      it('adds the blank state', () => {
-        boardsStore.addBlankState();
-
-        const list = boardsStore.findList('type', 'blank', 'blank');
-
-        expect(list).toBeDefined();
-      });
-
       it('removes list from state', () => {
         boardsStore.addList(listObj);
 
diff --git a/spec/services/search_service_spec.rb b/spec/services/search_service_spec.rb
index f6bb7acee57..fc613a6224a 100644
--- a/spec/services/search_service_spec.rb
+++ b/spec/services/search_service_spec.rb
@@ -444,7 +444,7 @@ RSpec.describe SearchService do
         context 'with :with_api_entity_associations' do
           let(:unredacted_results) { ar_relation(MergeRequest.with_api_entity_associations, readable, unreadable) }
 
-          it_behaves_like "redaction limits N+1 queries", limit: 7
+          it_behaves_like "redaction limits N+1 queries", limit: 8
         end
       end
 
@@ -481,7 +481,7 @@ RSpec.describe SearchService do
         end
 
         context 'with :with_api_entity_associations' do
-          it_behaves_like "redaction limits N+1 queries", limit: 12
+          it_behaves_like "redaction limits N+1 queries", limit: 13
         end
       end
 
@@ -496,7 +496,7 @@ RSpec.describe SearchService do
         end
 
         context 'with :with_api_entity_associations' do
-          it_behaves_like "redaction limits N+1 queries", limit: 3
+          it_behaves_like "redaction limits N+1 queries", limit: 4
         end
       end
 
diff --git a/spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb b/spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
index 113252a6ab5..84910d0dfe4 100644
--- a/spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
+++ b/spec/support/shared_examples/boards/multiple_issue_boards_shared_examples.rb
@@ -85,7 +85,7 @@ RSpec.shared_examples 'multiple issue boards' do
 
       wait_for_requests
 
-      expect(page).to have_selector('.board', count: 3)
+      expect(page).to have_selector('.board', count: 5)
 
       in_boards_switcher_dropdown do
         click_link board.name
@@ -93,7 +93,7 @@ RSpec.shared_examples 'multiple issue boards' do
 
       wait_for_requests
 
-      expect(page).to have_selector('.board', count: 2)
+      expect(page).to have_selector('.board', count: 4)
     end
 
     it 'maintains sidebar state over board switch' do