fixed tests according to wanted versions

jfrog · Aug 1, 2023 · e07b8ca · e07b8ca
1 parent d38280a
commit e07b8ca
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 773 deletions.
diff --git a/build/testdata/yarn/v1/project/package.json b/build/testdata/yarn/v1/project/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "yarn-project",
+  "name": "build-info-go-tests",
   "packageManager": "[email protected]",
   "version": "v1.0.0",
   "description": "test package for yarn v1",

diff --git a/build/testdata/yarn/v2/project/.yarn/releases/yarn-3.1.1.cjs b/build/testdata/yarn/v2/project/.yarn/releases/yarn-3.1.1.cjs
diff --git a/build/testdata/yarn/v2/project/.yarnrc.yml b/build/testdata/yarn/v2/project/.yarnrc.yml
diff --git a/build/testdata/yarn/v2/project/package.json b/build/testdata/yarn/v2/project/package.json
@@ -14,6 +14,5 @@
   },
   "devDependencies": {
     "json": "9.0.6"
-  },
-  "packageManager": "[email protected]"
+  }
 }
diff --git a/build/testdata/yarn/v2/project/yarn.lock b/build/testdata/yarn/v2/project/yarn.lock
@@ -2,7 +2,7 @@
 # Manual changes might be lost - proceed with caution!
 
 __metadata:
-  version: 5
+  version: 6
   cacheKey: 8
 
 "build-info-go-tests@workspace:.":

diff --git a/build/utils/yarn_test.go b/build/utils/yarn_test.go
@@ -109,6 +109,11 @@ func checkGetYarnDependencies(t *testing.T, versionDir string, expectedLocators
 		Dependencies:    map[string]string{"react": "18.2.0", "xml": "1.0.1"},
 		DevDependencies: map[string]string{"json": "9.0.6"},
 	}
+	if versionDir == "v1" {
+		version, err := GetVersion(executablePath, projectSrcPath)
+		assert.NoError(t, err, "error has occurred when verifying project's version")
+		assert.Equal(t, "1.22.19", version, "tests of yarn v1 are not running on v1 project")
+	}
 	dependenciesMap, root, err := GetYarnDependencies(executablePath, projectSrcPath, &pacInfo, &utils.NullLog{})
 
 	// general checks