pali112
/
ollama
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tests

This commit is contained in:
Eva Ho 2025-11-19 15:57:19 -05:00
parent 32393f11d7
commit 5aee34db9f
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/ui/app/src/utils/mergeModels.test.ts
View File

@ -14,8 +14,8 @@ describe("Model merging logic", () => {
const merged = mergeModels(localModels); const merged = mergeModels(localModels);
// First verify cloud models are first and in FEATURED_MODELS order // First verify cloud models are first and in FEATURED_MODELS order
const cloudModels = FEATURED_MODELS.filter((m: string) => const cloudModels = FEATURED_MODELS.filter(
m.endsWith("cloud"), (m: string) => m.endsWith("cloud") || m === "gemini-3-pro-preview",
); );
for (let i = 0; i < cloudModels.length; i++) { for (let i = 0; i < cloudModels.length; i++) {
expect(merged[i].model).toBe(cloudModels[i]); expect(merged[i].model).toBe(cloudModels[i]);
@ -24,7 +24,7 @@ describe("Model merging logic", () => {
// Then verify non-cloud featured models are next and in FEATURED_MODELS order // Then verify non-cloud featured models are next and in FEATURED_MODELS order
const nonCloudFeatured = FEATURED_MODELS.filter( const nonCloudFeatured = FEATURED_MODELS.filter(
(m: string) => !m.endsWith("cloud"), (m: string) => !m.endsWith("cloud") && m !== "gemini-3-pro-preview",
); );
for (let i = 0; i < nonCloudFeatured.length; i++) { for (let i = 0; i < nonCloudFeatured.length; i++) {
const model = merged[i + cloudModels.length]; const model = merged[i + cloudModels.length];
@ -54,9 +54,9 @@ describe("Model merging logic", () => {
const cloudModels = merged.filter((m) => m.isCloud()); const cloudModels = merged.filter((m) => m.isCloud());
expect(cloudModels.length).toBe(0); expect(cloudModels.length).toBe(0);
// Should have non-cloud featured models // Should have non-cloud featured models (excluding gemini-3-pro-preview which is treated as cloud)
const nonCloudFeatured = FEATURED_MODELS.filter( const nonCloudFeatured = FEATURED_MODELS.filter(
(m) => !m.endsWith("cloud"), (m) => !m.endsWith("cloud") && m !== "gemini-3-pro-preview",
); );
for (let i = 0; i < nonCloudFeatured.length; i++) { for (let i = 0; i < nonCloudFeatured.length; i++) {
const model = merged[i]; const model = merged[i];
@ -74,7 +74,9 @@ describe("Model merging logic", () => {
const merged = mergeModels([]); const merged = mergeModels([]);
// First verify cloud models are first and in FEATURED_MODELS order // First verify cloud models are first and in FEATURED_MODELS order
const cloudModels = FEATURED_MODELS.filter((m) => m.endsWith("cloud")); const cloudModels = FEATURED_MODELS.filter(
(m) => m.endsWith("cloud") || m === "gemini-3-pro-preview",
);
for (let i = 0; i < cloudModels.length; i++) { for (let i = 0; i < cloudModels.length; i++) {
expect(merged[i].model).toBe(cloudModels[i]); expect(merged[i].model).toBe(cloudModels[i]);
expect(merged[i].isCloud()).toBe(true); expect(merged[i].isCloud()).toBe(true);
@ -82,7 +84,7 @@ describe("Model merging logic", () => {
// Then verify non-cloud featured models are next and in FEATURED_MODELS order // Then verify non-cloud featured models are next and in FEATURED_MODELS order
const nonCloudFeatured = FEATURED_MODELS.filter( const nonCloudFeatured = FEATURED_MODELS.filter(
(m) => !m.endsWith("cloud"), (m) => !m.endsWith("cloud") && m !== "gemini-3-pro-preview",
); );
for (let i = 0; i < nonCloudFeatured.length; i++) { for (let i = 0; i < nonCloudFeatured.length; i++) {
const model = merged[i + cloudModels.length]; const model = merged[i + cloudModels.length];
@ -104,7 +106,9 @@ describe("Model merging logic", () => {
const merged = mergeModels(localModels); const merged = mergeModels(localModels);
// First verify cloud models are first and in FEATURED_MODELS order // First verify cloud models are first and in FEATURED_MODELS order
const cloudModels = FEATURED_MODELS.filter((m) => m.endsWith("cloud")); const cloudModels = FEATURED_MODELS.filter(
(m) => m.endsWith("cloud") || m === "gemini-3-pro-preview",
);
for (let i = 0; i < cloudModels.length; i++) { for (let i = 0; i < cloudModels.length; i++) {
expect(merged[i].model).toBe(cloudModels[i]); expect(merged[i].model).toBe(cloudModels[i]);
expect(merged[i].isCloud()).toBe(true); expect(merged[i].isCloud()).toBe(true);
@ -112,7 +116,7 @@ describe("Model merging logic", () => {
// Then verify non-cloud featured models are next and in FEATURED_MODELS order // Then verify non-cloud featured models are next and in FEATURED_MODELS order
const nonCloudFeatured = FEATURED_MODELS.filter( const nonCloudFeatured = FEATURED_MODELS.filter(
(m) => !m.endsWith("cloud"), (m) => !m.endsWith("cloud") && m !== "gemini-3-pro-preview",
); );
for (let i = 0; i < nonCloudFeatured.length; i++) { for (let i = 0; i < nonCloudFeatured.length; i++) {
const model = merged[i + cloudModels.length]; const model = merged[i + cloudModels.length];