Fixed up boards filter spec due to CSS classes changing

Also fixed issue with Vue resource encoding + in search term

2 files changed, 8 insertions, 9 deletions

diff --git a/app/assets/javascripts/boards/models/list.js b/app/assets/javascripts/boards/models/list.js
index c2af3bb881c..ad968d2120f 100644
--- a/app/assets/javascripts/boards/models/list.js
+++ b/app/assets/javascripts/boards/models/list.js
@@ -70,7 +70,8 @@ class List {
       const paramSplit = filterParam.split('=');
       const paramKeyNormalized = paramSplit[0].replace('[]', '');
       const isArray = paramSplit[0].indexOf('[]');
-      const value = decodeURIComponent(paramSplit[1]);
+      let value = decodeURIComponent(paramSplit[1]);
+      value = value.replace(/\+/g, ' ');
 
       if (isArray >= 0) {
         if (!data[paramKeyNormalized]) {
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index e11ba10c80c..f7e8b78b54d 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -29,7 +29,7 @@ describe 'Issue Boards', feature: true, js: true do
     end
 
     it 'shows tooltip on add issues button' do
-      button = page.find('.issue-boards-search button', text: 'Add issues')
+      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
@@ -115,9 +115,8 @@ describe 'Issue Boards', feature: true, js: true do
     end
 
     it 'search done list' do
-      page.within('#js-boards-search') do
-        find('.form-control').set(issue8.title)
-      end
+      find('.filtered-search').set(issue8.title)
+      find('.filtered-search').native.send_keys(:enter)
 
       wait_for_vue_resource
 
@@ -127,9 +126,8 @@ describe 'Issue Boards', feature: true, js: true do
     end
 
     it 'search list' do
-      page.within('#js-boards-search') do
-        find('.form-control').set(issue5.title)
-      end
+      find('.filtered-search').set(issue5.title)
+      find('.filtered-search').native.send_keys(:enter)
 
       wait_for_vue_resource
 
@@ -333,7 +331,7 @@ describe 'Issue Boards', feature: true, js: true do
 
           wait_for_vue_resource
 
-          expect(find('.issue-boards-search')).to have_selector('.open')
+          expect(page).to have_css('#js-add-list.open')
         end
 
         it 'creates new list from a new label' do