test: registry-mock

.github/workflows/ci.yml

@@ -44,6 +44,16 @@ jobs:
           run_install: false
           standalone: true
 
+      - name: Cache pnpm
+        uses: actions/cache@v3
+        with:
+          key: ci-pnpm-${{ matrix.os }}
+          path: |
+            ${{ env.PNPM_HOME }}/store/v3
+            ${{ env.HOME }}/.local/share/pnpm/store/v3
+        timeout-minutes: 1
+        continue-on-error: true
+
       - name: Clippy
         run: cargo clippy --locked -- -D warnings
 
@@ -52,18 +62,28 @@ jobs:
           RUSTDOCFLAGS: '-D warnings'
         run: cargo doc
 
+      - name: Install just
+        uses: taiki-e/install-action@just
+
+      - name: Install dependencies
+        run: just install
+
       - name: Install cargo-nextest
         uses: taiki-e/install-action@cargo-nextest
 
       - name: Test
         shell: bash
         run: |
+          just registry-mock launch
+
           # removing env vars is a temporary workaround for unit tests in pacquet relying on external environment
           # this should be removed in the future
           unset PNPM_HOME
           unset XDG_DATA_HOME
 
-          cargo nextest run
+          just test
+
+          just registry-mock end
 
   typos:
     name: Spell Check

Cargo.toml

@@ -26,7 +26,11 @@ pacquet-executor         = { path = "crates/executor" }
 pacquet-diagnostics      = { path = "crates/diagnostics" }
 pacquet-store-dir        = { path = "crates/store-dir" }
 
+# Tasks
+pacquet-registry-mock = { path = "tasks/registry-mock" }
+
 # Dependencies
+advisory-lock      = { version = "0.3.0" }
 async-recursion    = { version = "1.0.5" }
 clap               = { version = "4", features = ["derive", "string"] }
 command-extra      = { version = "1.0.0" }
@@ -45,6 +49,7 @@ junction           = { version = "1.0.0" }
 reqwest            = { version = "0.11", default-features = false, features = ["json", "native-tls-vendored"] }
 node-semver        = { version = "2.1.0" }
 pipe-trait         = { version = "0.4.0" }
+portpicker         = { version = "0.1.1" }
 rayon              = { version = "1.8.0" }
 serde              = { version = "1.0.188", features = ["derive"] }
 serde_ini          = { version = "0.2.0" }
@@ -54,6 +59,7 @@ sha2               = { version = "0.10.8" }
 split-first-char   = { version = "0.0.0" }
 ssri               = { version = "9.0.0" }
 strum              = { version = "0.25.0", features = ["derive"] }
+sysinfo            = { version = "0.29.10" }
 tar                = { version = "0.4.40" }
 text-block-macros  = { version = "0.1.1" }
 tracing            = { version = "0.1.37" }

README.md

@@ -22,6 +22,19 @@ Experimental package manager for node.js written in rust.
 TRACE=pacquet_tarball just cli add fastify
 ```
 
+## Testing
+
+```sh
+# Install necessary dependencies
+just install
+
+# Start a mocked registry server (optional)
+just registry-mock launch
+
+# Run test
+just test
+```
+
 ## Benchmarking
 
 ### Install between multiple revisions

crates/cli/tests/_utils.rs

@@ -1,33 +1,8 @@
-use assert_cmd::prelude::*;
-use command_extra::CommandExtra;
 use pacquet_store_dir::{PackageFileInfo, PackageFilesIndex};
-use pacquet_testing_utils::bin::CommandTempCwd;
 use pipe_trait::Pipe;
-use std::{
-    collections::BTreeMap,
-    ffi::OsStr,
-    fs::File,
-    path::{Path, PathBuf},
-};
-use tempfile::TempDir;
+use std::{collections::BTreeMap, fs::File, path::Path};
 use walkdir::{DirEntry, WalkDir};
 
-pub fn exec_pacquet_in_temp_cwd<Args>(create_npmrc: bool, args: Args) -> (TempDir, PathBuf)
-where
-    Args: IntoIterator,
-    Args::Item: AsRef<OsStr>,
-{
-    let env = CommandTempCwd::init();
-    let (command, root, workspace) = if create_npmrc {
-        let env = env.add_default_npmrc();
-        (env.pacquet, env.root, env.workspace)
-    } else {
-        (env.pacquet, env.root, env.workspace)
-    };
-    command.with_args(args).assert().success();
-    (root, workspace)
-}
-
 pub fn index_file_contents(
     store_dir: &Path,
 ) -> BTreeMap<String, BTreeMap<String, PackageFileInfo>> {

crates/cli/tests/add.rs

@@ -1,14 +1,29 @@
-pub mod _utils;
-pub use _utils::*;
-
+use assert_cmd::prelude::*;
+use command_extra::CommandExtra;
 use pacquet_package_manifest::{DependencyGroup, PackageManifest};
-use pacquet_testing_utils::fs::{get_all_folders, get_filenames_in_folder};
+use pacquet_testing_utils::{
+    bin::{AddMockedRegistry, CommandTempCwd},
+    fs::{get_all_folders, get_filenames_in_folder},
+};
 use pretty_assertions::assert_eq;
-use std::{env, fs};
+use std::{env, ffi::OsStr, fs, path::PathBuf};
+use tempfile::TempDir;
+
+fn exec_pacquet_in_temp_cwd<Args>(args: Args) -> (TempDir, PathBuf, AddMockedRegistry)
+where
+    Args: IntoIterator,
+    Args::Item: AsRef<OsStr>,
+{
+    let CommandTempCwd { pacquet, root, workspace, npmrc_info, .. } =
+        CommandTempCwd::init().add_mocked_registry();
+    pacquet.with_args(args).assert().success();
+    (root, workspace, npmrc_info)
+}
 
 #[test]
 fn should_install_all_dependencies() {
-    let (root, workspace) = exec_pacquet_in_temp_cwd(true, ["add", "is-even"]);
+    let (root, workspace, anchor) =
+        exec_pacquet_in_temp_cwd(["add", "@pnpm.e2e/hello-world-js-bin-parent"]);
 
     eprintln!("Directory list");
     insta::assert_debug_snapshot!(get_all_folders(&workspace));
@@ -23,25 +38,29 @@ fn should_install_all_dependencies() {
     eprintln!("Ensure virtual store dir ({virtual_store_dir:?}) exists");
     assert!(virtual_store_dir.exists());
 
-    eprintln!("Ensure that is-buffer does not have any dependencies");
-    let is_buffer_path = virtual_store_dir.join("is-buffer@1.1.6/node_modules");
-    assert_eq!(get_filenames_in_folder(&is_buffer_path), vec!["is-buffer"]);
-
-    eprintln!("Ensure that is-even have correct dependencies");
-    let is_even_path = virtual_store_dir.join("is-even@1.0.0/node_modules");
-    assert_eq!(get_filenames_in_folder(&is_even_path), vec!["is-even", "is-odd"]);
+    eprintln!("Ensure that @pnpm.e2e/hello-world-js-bin has no other dependencies than itself");
+    let path = virtual_store_dir.join("@pnpm.e2e+hello-world-js-bin@1.0.0/node_modules");
+    assert_eq!(get_filenames_in_folder(&path), ["@pnpm.e2e"]);
+    assert_eq!(get_filenames_in_folder(&path.join("@pnpm.e2e")), ["hello-world-js-bin"]);
 
-    eprintln!("Ensure that is-number does not have any dependencies");
-    let is_number_path = virtual_store_dir.join("is-number@3.0.0/node_modules");
-    assert_eq!(get_filenames_in_folder(&is_number_path), vec!["is-number", "kind-of"]);
+    eprintln!("Ensure that @pnpm.e2e/hello-world-js-bin-parent has correct dependencies");
+    let path = virtual_store_dir.join("@pnpm.e2e+hello-world-js-bin-parent@1.0.0/node_modules");
+    assert_eq!(get_filenames_in_folder(&path), ["@pnpm.e2e"]);
+    assert_eq!(
+        get_filenames_in_folder(&path.join("@pnpm.e2e")),
+        ["hello-world-js-bin", "hello-world-js-bin-parent"],
+    );
 
-    drop(root); // cleanup
+    drop((root, anchor)); // cleanup
 }
 
 #[test]
 #[cfg(unix)]
 pub fn should_symlink_correctly() {
-    let (root, workspace) = exec_pacquet_in_temp_cwd(true, ["add", "is-odd"]);
+    use pipe_trait::Pipe;
+
+    let (root, workspace, anchor) =
+        exec_pacquet_in_temp_cwd(["add", "@pnpm.e2e/hello-world-js-bin-parent"]);
 
     eprintln!("Directory list");
     insta::assert_debug_snapshot!(get_all_folders(&workspace));
@@ -58,38 +77,60 @@ pub fn should_symlink_correctly() {
 
     eprintln!("Make sure the symlinks are correct");
     assert_eq!(
-        fs::read_link(virtual_store_dir.join("is-odd@3.0.1/node_modules/is-number")).unwrap(),
-        fs::canonicalize(virtual_store_dir.join("is-number@6.0.0/node_modules/is-number")).unwrap(),
+        virtual_store_dir
+            .join("@pnpm.e2e+hello-world-js-bin-parent@1.0.0")
+            .join("node_modules")
+            .join("@pnpm.e2e")
+            .join("hello-world-js-bin")
+            .pipe(fs::read_link)
+            .expect("read link"),
+        virtual_store_dir
+            .join("@pnpm.e2e+hello-world-js-bin@1.0.0")
+            .join("node_modules")
+            .join("@pnpm.e2e")
+            .join("hello-world-js-bin")
+            .pipe(fs::canonicalize)
+            .expect("canonicalize link target"),
     );
 
-    drop(root); // cleanup
+    drop((root, anchor)); // cleanup
 }
 
 #[test]
 fn should_add_to_package_json() {
-    let (root, dir) = exec_pacquet_in_temp_cwd(true, ["add", "is-odd"]);
+    let (root, dir, anchor) = exec_pacquet_in_temp_cwd(["add", "@pnpm.e2e/hello-world-js-bin"]);
     let file = PackageManifest::from_path(dir.join("package.json")).unwrap();
-    eprintln!("Ensure is-odd is added to package.json#dependencies");
-    assert!(file.dependencies([DependencyGroup::Prod]).any(|(k, _)| k == "is-odd"));
-    drop(root); // cleanup
+    eprintln!("Ensure @pnpm.e2e/hello-world-js-bin is added to package.json#dependencies");
+    assert!(file
+        .dependencies([DependencyGroup::Prod])
+        .any(|(k, _)| k == "@pnpm.e2e/hello-world-js-bin"));
+    drop((root, anchor)); // cleanup
 }
 
 #[test]
 fn should_add_dev_dependency() {
-    let (root, dir) = exec_pacquet_in_temp_cwd(true, ["add", "is-odd", "--save-dev"]);
+    let (root, dir, anchor) =
+        exec_pacquet_in_temp_cwd(["add", "@pnpm.e2e/hello-world-js-bin", "--save-dev"]);
     let file = PackageManifest::from_path(dir.join("package.json")).unwrap();
-    eprintln!("Ensure is-odd is added to package.json#devDependencies");
-    assert!(file.dependencies([DependencyGroup::Dev]).any(|(k, _)| k == "is-odd"));
-    drop(root); // cleanup
+    eprintln!("Ensure @pnpm.e2e/hello-world-js-bin is added to package.json#devDependencies");
+    assert!(file
+        .dependencies([DependencyGroup::Dev])
+        .any(|(k, _)| k == "@pnpm.e2e/hello-world-js-bin"));
+    drop((root, anchor)); // cleanup
 }
 
 #[test]
 fn should_add_peer_dependency() {
-    let (root, dir) = exec_pacquet_in_temp_cwd(true, ["add", "is-odd", "--save-peer"]);
+    let (root, dir, anchor) =
+        exec_pacquet_in_temp_cwd(["add", "@pnpm.e2e/hello-world-js-bin", "--save-peer"]);
     let file = PackageManifest::from_path(dir.join("package.json")).unwrap();
-    eprintln!("Ensure is-odd is added to package.json#devDependencies");
-    assert!(file.dependencies([DependencyGroup::Dev]).any(|(k, _)| k == "is-odd"));
-    eprintln!("Ensure is-odd is added to package.json#peerDependencies");
-    assert!(file.dependencies([DependencyGroup::Peer]).any(|(k, _)| k == "is-odd"));
-    drop(root); // cleanup
+    eprintln!("Ensure @pnpm.e2e/hello-world-js-bin is added to package.json#devDependencies");
+    assert!(file
+        .dependencies([DependencyGroup::Dev])
+        .any(|(k, _)| k == "@pnpm.e2e/hello-world-js-bin"));
+    eprintln!("Ensure @pnpm.e2e/hello-world-js-bin is added to package.json#peerDependencies");
+    assert!(file
+        .dependencies([DependencyGroup::Peer])
+        .any(|(k, _)| k == "@pnpm.e2e/hello-world-js-bin"));
+    drop((root, anchor)); // cleanup
 }