Commit be50224b authored by David Fernandez's avatar David Fernandez

Merge branch 'issue#325831-make-searchQueryService-paramter-optional' into 'master'

Make NuGet SearchQueryService q parameter optional

See merge request gitlab-org/gitlab!57654
parents e774ff7e a5bcad98
---
title: Make NuGet SearchQueryService q parameter optional
merge_request: 57654
author: Huzaifa Iftikhar @huzaifaiftikhar
type: fixed
...@@ -95,7 +95,7 @@ module API ...@@ -95,7 +95,7 @@ module API
# https://docs.microsoft.com/en-us/nuget/api/search-query-service-resource # https://docs.microsoft.com/en-us/nuget/api/search-query-service-resource
params do params do
requires :q, type: String, desc: 'The search term' optional :q, type: String, desc: 'The search term'
optional :skip, type: Integer, desc: 'The number of results to skip', default: 0, regexp: NON_NEGATIVE_INTEGER_REGEX optional :skip, type: Integer, desc: 'The number of results to skip', default: 0, regexp: NON_NEGATIVE_INTEGER_REGEX
optional :take, type: Integer, desc: 'The number of results to return', default: Kaminari.config.default_per_page, regexp: POSITIVE_INTEGER_REGEX optional :take, type: Integer, desc: 'The number of results to return', default: Kaminari.config.default_per_page, regexp: POSITIVE_INTEGER_REGEX
optional :prerelease, type: ::Grape::API::Boolean, desc: 'Include prerelease versions', default: true optional :prerelease, type: ::Grape::API::Boolean, desc: 'Include prerelease versions', default: true
......
...@@ -69,7 +69,7 @@ RSpec.describe API::NugetGroupPackages do ...@@ -69,7 +69,7 @@ RSpec.describe API::NugetGroupPackages do
let(:take) { 26 } let(:take) { 26 }
let(:skip) { 0 } let(:skip) { 0 }
let(:include_prereleases) { true } let(:include_prereleases) { true }
let(:query_parameters) { { q: search_term, take: take, skip: skip, prerelease: include_prereleases } } let(:query_parameters) { { q: search_term, take: take, skip: skip, prerelease: include_prereleases }.compact }
subject { get api(url), headers: {}} subject { get api(url), headers: {}}
...@@ -145,7 +145,7 @@ RSpec.describe API::NugetGroupPackages do ...@@ -145,7 +145,7 @@ RSpec.describe API::NugetGroupPackages do
let(:take) { 26 } let(:take) { 26 }
let(:skip) { 0 } let(:skip) { 0 }
let(:include_prereleases) { false } let(:include_prereleases) { false }
let(:query_parameters) { { q: search_term, take: take, skip: skip, prerelease: include_prereleases } } let(:query_parameters) { { q: search_term, take: take, skip: skip, prerelease: include_prereleases }.compact }
let(:url) { "/groups/#{group.id}/-/packages/nuget/query?#{query_parameters.to_query}" } let(:url) { "/groups/#{group.id}/-/packages/nuget/query?#{query_parameters.to_query}" }
it_behaves_like 'returning response status', :forbidden it_behaves_like 'returning response status', :forbidden
......
...@@ -225,7 +225,7 @@ RSpec.shared_examples 'handling nuget search requests' do |anonymous_requests_ex ...@@ -225,7 +225,7 @@ RSpec.shared_examples 'handling nuget search requests' do |anonymous_requests_ex
let(:take) { 26 } let(:take) { 26 }
let(:skip) { 0 } let(:skip) { 0 }
let(:include_prereleases) { true } let(:include_prereleases) { true }
let(:query_parameters) { { q: search_term, take: take, skip: skip, prerelease: include_prereleases } } let(:query_parameters) { { q: search_term, take: take, skip: skip, prerelease: include_prereleases }.compact }
subject { get api(url) } subject { get api(url) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment