Add integration tests for version autocomplete

loic-sharma · Aug 29, 2020 · f3d868e · f3d868e
1 parent b3319d1
commit f3d868e
Show file tree

Hide file tree

Showing 3 changed files with 66 additions and 6 deletions.
diff --git a/src/BaGet.Hosting/Controllers/SearchController.cs b/src/BaGet.Hosting/Controllers/SearchController.cs
@@ -54,15 +54,15 @@ public async Task<ActionResult<AutocompleteResponse>> AutocompleteAsync(
             [FromQuery]string packageType = null,
             CancellationToken cancellationToken = default)
         {
-            // Default to autocomplete, just like nuget.org does
+            // If only "id" is provided, find package versions. Otherwise, find package IDs.
             if (versionsQuery != null && autocompleteQuery == null)
             {
                 var request = new VersionsRequest
                 {
                     IncludePrerelease = prerelease,
                     IncludeSemVer2 = semVerLevel == "2.0.0",
+                    PackageId = versionsQuery,
                 };
-                request.PackageId = versionsQuery;
 
                 return await _searchService.ListPackageVersionsAsync(request, cancellationToken);
             }
@@ -74,11 +74,9 @@ public async Task<ActionResult<AutocompleteResponse>> AutocompleteAsync(
                     IncludeSemVer2 = semVerLevel == "2.0.0",
                     PackageType = packageType,
                     Skip = skip,
-                    Take = take
+                    Take = take,
+                    Query = autocompleteQuery,
                 };
-                request.Query = versionsQuery;
-
-                request.Query = autocompleteQuery;
 
                 return await _searchService.AutocompleteAsync(request, cancellationToken);
             }

diff --git a/tests/BaGet.Tests/ApiIntegrationTests.cs b/tests/BaGet.Tests/ApiIntegrationTests.cs
@@ -130,6 +130,44 @@ public async Task AutocompleteReturnsEmpty()
 }", json);
         }
 
+        [Fact]
+        public async Task AutocompleteVersionsReturnsOk()
+        {
+            await _factory.AddPackageAsync(PackageData.Default);
+
+            using var response = await _client.GetAsync("v3/autocomplete?id=DefaultPackage");
+            var content = await response.Content.ReadAsStreamAsync();
+            var json = PrettifyJson(content);
+
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(@"{
+  ""@context"": {
+    ""@vocab"": ""http://schema.nuget.org/schema#""
+  },
+  ""totalHits"": 1,
+  ""data"": [
+    ""1.2.3""
+  ]
+}", json);
+        }
+
+        [Fact]
+        public async Task AutocompleteVersionsReturnsEmpty()
+        {
+            using var response = await _client.GetAsync("v3/autocomplete?id=PackageDoesNotExist");
+            var content = await response.Content.ReadAsStreamAsync();
+            var json = PrettifyJson(content);
+
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Equal(@"{
+  ""@context"": {
+    ""@vocab"": ""http://schema.nuget.org/schema#""
+  },
+  ""totalHits"": 0,
+  ""data"": []
+}", json);
+        }
+
         [Fact]
         public async Task VersionListReturnsOk()
         {

diff --git a/tests/BaGet.Tests/BaGetClientIntegrationTests.cs b/tests/BaGet.Tests/BaGetClientIntegrationTests.cs
@@ -99,6 +99,30 @@ public async Task AutocompleteReturnsEmpty()
             Assert.Empty(results);
         }
 
+        [Fact]
+        public async Task AutocompleteVersions()
+        {
+            await _factory.AddPackageAsync(PackageData.Default);
+
+            var client = _clientFactory.CreateAutocompleteClient();
+            var results = await client.ListPackageVersionsAsync("DefaultPackage");
+
+            var result = Assert.Single(results.Data);
+
+            Assert.Equal(1, results.TotalHits);
+            Assert.Equal("1.2.3", result);
+        }
+
+        [Fact]
+        public async Task AutocompleteVersionsReturnsEmpty()
+        {
+            var client = _clientFactory.CreateAutocompleteClient();
+            var results = await client.ListPackageVersionsAsync("PackageDoesNotExist");
+
+            Assert.Empty(results.Data);
+            Assert.Equal(0, results.TotalHits);
+        }
+
         [Fact]
         public async Task VersionListReturnsResults()
         {