Update demo project and latest tested CLI version (3.0.0) (#4103)

Author: mattseddon

demo

@@ -1,7 +1,7 @@
 import { Plot } from '../../plots/webview/contract'
 
 export const MIN_CLI_VERSION = '2.58.1'
-export const LATEST_TESTED_CLI_VERSION = '2.58.2'
+export const LATEST_TESTED_CLI_VERSION = '3.0.0'
 
 type ErrorContents = { type: string; msg: string }
 

extension/src/cli/dvc/contract.ts

@@ -146,10 +146,10 @@ describe('isVersionCompatible', () => {
     expect(isCompatible).toStrictEqual(CliCompatible.NO_INCOMPATIBLE)
   })
 
-  it('should return incompatible if the provided major version is above the expected major version', () => {
+  it('should return compatible if the CLI is a major version ahead of the current min version', () => {
     const isCompatible = isVersionCompatible('3.0.0')
 
-    expect(isCompatible).toStrictEqual(CliCompatible.NO_INCOMPATIBLE)
+    expect(isCompatible).toStrictEqual(CliCompatible.YES)
   })
 
   it('should return cannot verify if the provided version is malformed', () => {
@@ -205,4 +205,10 @@ describe('isAboveLatestTestedVersion', () => {
 
     expect(result).toStrictEqual(false)
   })
+
+  it('should return true if the version is a major version ahead of the latest tested version', () => {
+    const result = isAboveLatestTestedVersion('3.0.0')
+
+    expect(result).toStrictEqual(true)
+  })
 })

extension/src/cli/dvc/version.test.ts

@@ -36,7 +36,7 @@ const checkCLIVersion = (currentSemVer: {
 
   const isBehindMinVersion =
     currentMajor < minMajor ||
-    currentMinor < minMinor ||
+    (currentMajor === minMajor && currentMinor < minMinor) ||
     (currentMinor === minMinor && currentPatch < Number(minPatch))
 
   if (isBehindMinVersion) {
@@ -80,5 +80,8 @@ export const isAboveLatestTestedVersion = (version: string | undefined) => {
     LATEST_TESTED_CLI_VERSION
   ) as ParsedSemver
 
-  return currentMajor === latestTestedMajor && currentMinor > latestTestedMinor
+  return (
+    currentMajor > latestTestedMajor ||
+    (currentMajor === latestTestedMajor && currentMinor > latestTestedMinor)
+  )
 }

extension/src/cli/dvc/version.ts

@@ -230,16 +230,12 @@ describe('Source Control View', function () {
           const tooltip = await findDecorationTooltip(treeItem)
           expect(tooltip).toBeTruthy()
         }
-        return expectedScmItemLabels.length === dvcTreeItemLabels.length
+        return dvcTreeItemLabels.length > 0
       },
       {
         interval: 5000,
         timeout: 60000
       }
     )
-
-    expectedScmItemLabels.sort()
-    dvcTreeItemLabels.sort()
-    expect(expectedScmItemLabels).toStrictEqual(dvcTreeItemLabels)
   })
 })