Add latest changes from gitlab-org/gitlab@master

1 files changed, 22 insertions, 6 deletions

diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb
index b5e5e5a711f..c0f129cefc3 100644
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
@@ -805,22 +805,38 @@ RSpec.describe SearchHelper, feature_category: :global_search do
       allow(self).to receive(:current_user).and_return(:the_current_user)
     end
 
-    where(:confidential, :expected) do
+    where(:input, :expected) do
       '0'       | false
       '1'       | true
       'yes'     | true
       'no'      | false
+      'true'    | true
+      'false'   | false
       true      | true
       false     | false
     end
 
-    let(:params) { { confidential: confidential } }
+    describe 'for confidential' do
+      let(:params) { { confidential: input } }
 
-    with_them do
-      it 'transforms confidentiality param' do
-        expect(::SearchService).to receive(:new).with(:the_current_user, { confidential: expected })
+      with_them do
+        it 'transforms param' do
+          expect(::SearchService).to receive(:new).with(:the_current_user, { confidential: expected })
 
-        subject
+          subject
+        end
+      end
+    end
+
+    describe 'for include_archived' do
+      let(:params) { { include_archived: input } }
+
+      with_them do
+        it 'transforms param' do
+          expect(::SearchService).to receive(:new).with(:the_current_user, { include_archived: expected })
+
+          subject
+        end
       end
     end
   end