diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-14 10:15:49 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-14 10:15:49 +0000 |
commit | 5e829934f95bcae25f5c09583b6febe6e2e646b6 (patch) | |
tree | 48b65e3a3125f23594d9d7bdf728f71aa7e224d5 /spec/requests | |
parent | e7595c10bc14cd32c456b9c6a94e227d41d6d09a (diff) | |
parent | b0b4ae1875529cd7ca786bd5eccd49be9a40a038 (diff) | |
download | gitlab-ce-5e829934f95bcae25f5c09583b6febe6e2e646b6.tar.gz |
Merge branch '42934-search-api-fix' into 'master'
Add information about projects when searching in wiki_blobs, blobs, commits scopes
Closes #42934
See merge request gitlab-org/gitlab-ce!17095
Diffstat (limited to 'spec/requests')
-rw-r--r-- | spec/requests/api/search_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/search_spec.rb b/spec/requests/api/search_spec.rb index ddda5752f0c..9052a18c60b 100644 --- a/spec/requests/api/search_spec.rb +++ b/spec/requests/api/search_spec.rb @@ -295,7 +295,7 @@ describe API::Search do get api("/projects/#{repo_project.id}/-/search", user), scope: 'commits', search: '498214de67004b1da3d820901307bed2a68a8ef6' end - it_behaves_like 'response is correct', schema: 'public_api/v4/commits' + it_behaves_like 'response is correct', schema: 'public_api/v4/commits_details' end context 'for commits scope with project path as id' do @@ -303,7 +303,7 @@ describe API::Search do get api("/projects/#{CGI.escape(repo_project.full_path)}/-/search", user), scope: 'commits', search: '498214de67004b1da3d820901307bed2a68a8ef6' end - it_behaves_like 'response is correct', schema: 'public_api/v4/commits' + it_behaves_like 'response is correct', schema: 'public_api/v4/commits_details' end context 'for blobs scope' do |