summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-08-21 10:02:44 +0100
committerPhil Hughes <me@iamphill.com>2016-08-21 10:02:44 +0100
commite158eee9c9becd2f5beb7861f45fcf18d1a3927a (patch)
treeb3771d56999dfffc0053dff1a06ec7cdcaaaa892
parentb06f9211b0c3a90200c030e84ae425778bac6412 (diff)
downloadgitlab-ce-issue-boards-search-done.tar.gz
Adds search box to done list on issue boardsissue-boards-search-done
Closes #21139
-rw-r--r--app/assets/javascripts/boards/models/list.js.es62
-rw-r--r--spec/features/boards/boards_spec.rb10
2 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/models/list.js.es6 b/app/assets/javascripts/boards/models/list.js.es6
index be2b8c568a8..b8470de17e8 100644
--- a/app/assets/javascripts/boards/models/list.js.es6
+++ b/app/assets/javascripts/boards/models/list.js.es6
@@ -59,7 +59,7 @@ class List {
}
canSearch () {
- return this.type === 'backlog';
+ return ['backlog', 'done'].indexOf(this.type) > -1;
}
getIssues (emptyIssues = true) {
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 5d777895542..e3c2ae64f2f 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -206,6 +206,16 @@ describe 'Issue Boards', feature: true, js: true do
end
context 'done' do
+ it 'is searchable' do
+ page.within(find('.board:nth-child(4)')) do
+ find('.form-control').set 'testing'
+
+ wait_for_vue_resource(spinner: false)
+
+ expect(page).to have_selector('.card', count: 0)
+ end
+ end
+
it 'shows list of done issues' do
expect(find('.board:nth-child(4)')).to have_selector('.card', count: 1)
end