Move plugin tests to using testing framework

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

tests/integration.rs

@@ -19,7 +19,6 @@ mod integration_tests {
         sync::{Arc, Mutex},
         time::Duration,
     };
-    use tempfile::tempdir;
     use tokio::{net::TcpStream, task, time::sleep};
     use tracing::log;
 
@@ -235,257 +234,6 @@ mod integration_tests {
         Ok(())
     }
 
-    /// Builds app in `dir` and verifies the build succeeded. Expects manifest
-    /// in `spin.toml` inside `dir`.
-    async fn do_test_build_command(dir: impl AsRef<Path>) -> Result<()> {
-        let dir = dir.as_ref();
-        let manifest_file = dir.join("spin.toml");
-        let manifest = spin_manifest::manifest_from_file(&manifest_file)?;
-
-        let sources = manifest
-            .components
-            .iter()
-            .map(|(id, component)| {
-                let v2::ComponentSource::Local(file) = &component.source else {
-                    panic!(
-                        "{}.{}: source is not a file reference",
-                        manifest.application.name, id
-                    )
-                };
-                (id, dir.join(file))
-            })
-            .collect::<HashMap<_, _>>();
-
-        // Delete build output so that later it can be assumed: if the output
-        // exists, it is because `spin build` succeeded.
-        for source in sources.values() {
-            if source.exists() {
-                std::fs::remove_file(source)?
-            }
-        }
-
-        run(
-            vec![
-                spin_binary().as_str(),
-                "build",
-                "--file",
-                manifest_file.to_str().unwrap(),
-            ],
-            None,
-            None,
-        )?;
-
-        let mut missing_sources_count = 0;
-        for (component_id, source) in sources.iter() {
-            if source.exists() {
-                std::fs::remove_file(source)?;
-            } else {
-                missing_sources_count += 1;
-                println!(
-                    "{}.{} source file was not generated by build",
-                    manifest.application.name, component_id
-                );
-            }
-        }
-        assert_eq!(missing_sources_count, 0);
-
-        Ok(())
-    }
-
-    #[test]
-    fn spin_up_gives_help_on_new_app() -> Result<()> {
-        let temp_dir = tempdir()?;
-        let dir = temp_dir.path();
-        let manifest_file = dir.join("spin.toml");
-
-        // We still don't see full help if there are no components.
-        let toml_text = r#"spin_version = "1"
-name = "unbuilt"
-trigger = { type = "http" }
-version = "0.1.0"
-[[component]]
-id = "unbuilt"
-source = "fake.wasm"
-[component.trigger]
-route = "/..."
-"#;
-
-        std::fs::write(&manifest_file, toml_text)?;
-        std::fs::write(dir.join("fake.wasm"), "")?;
-
-        let binary = spin_binary();
-        let up_help_args = vec![
-            &binary,
-            "up",
-            "--file",
-            manifest_file.to_str().unwrap(),
-            "--help",
-        ];
-
-        let output = run(up_help_args, None, None)?;
-
-        let stdout = String::from_utf8_lossy(&output.stdout);
-        assert!(stdout.contains("--quiet"));
-        assert!(stdout.contains("--listen"));
-
-        Ok(())
-    }
-
-    // TODO: Test on Windows
-    #[cfg(not(target_os = "windows"))]
-    #[test]
-    fn test_spin_plugin_install_command() -> Result<()> {
-        // Create a temporary directory for plugin source and manifests
-        let temp_dir = tempdir()?;
-        let dir = temp_dir.path();
-        let installed_plugins_dir = dir.join("tmp");
-
-        // Ensure that spin installs the plugins into the temporary directory
-        let mut env_map: HashMap<&str, &str> = HashMap::new();
-        env_map.insert(
-            "TEST_PLUGINS_DIRECTORY",
-            installed_plugins_dir.to_str().unwrap(),
-        );
-
-        let path_to_test_dir = std::env::current_dir()?;
-        let file_url = format!(
-            "file:{}/tests/plugin/example.tar.gz",
-            path_to_test_dir.to_str().unwrap()
-        );
-        let mut plugin_manifest_json = serde_json::json!(
-        {
-            "name": "example",
-            "description": "A description of the plugin.",
-            "homepage": "www.example.com",
-            "version": "0.2.0",
-            "spinCompatibility": ">=0.5",
-            "license": "MIT",
-            "packages": [
-                {
-                    "os": "linux",
-                    "arch": "amd64",
-                    "url": file_url,
-                    "sha256": "f7a5a8c16a94fe934007f777a1bf532ef7e42b02133e31abf7523177b220a1ce"
-                },
-                {
-                    "os": "macos",
-                    "arch": "aarch64",
-                    "url": file_url,
-                    "sha256": "f7a5a8c16a94fe934007f777a1bf532ef7e42b02133e31abf7523177b220a1ce"
-                },
-                {
-                    "os": "macos",
-                    "arch": "amd64",
-                    "url": file_url,
-                    "sha256": "f7a5a8c16a94fe934007f777a1bf532ef7e42b02133e31abf7523177b220a1ce"
-                }
-            ]
-        });
-        let manifest_file_path = dir.join("example-plugin-manifest.json");
-        std::fs::write(
-            &manifest_file_path,
-            serde_json::to_string(&plugin_manifest_json).unwrap(),
-        )?;
-
-        // Install plugin
-        let binary = spin_binary();
-        let install_args = vec![
-            &binary,
-            "plugins",
-            "install",
-            "--file",
-            manifest_file_path.to_str().unwrap(),
-            "--yes",
-        ];
-        run(install_args, None, Some(env_map.clone()))?;
-
-        // Execute example plugin which writes "This is an example Spin plugin!" to a specified file
-        let binary = spin_binary();
-        let execute_args = vec![&binary, "example"];
-        let output = run(execute_args, None, Some(env_map.clone()))?;
-
-        // Verify plugin successfully wrote to output file
-        assert!(std::str::from_utf8(&output.stdout)?
-            .trim()
-            .contains("This is an example Spin plugin!"));
-
-        // Upgrade plugin to newer version
-        *plugin_manifest_json.get_mut("version").unwrap() = serde_json::json!("0.2.1");
-        std::fs::write(
-            dir.join("example-plugin-manifest.json"),
-            serde_json::to_string(&plugin_manifest_json).unwrap(),
-        )?;
-        let binary = spin_binary();
-        let upgrade_args = vec![
-            &binary,
-            "plugins",
-            "upgrade",
-            "example",
-            "--file",
-            manifest_file_path
-                .to_str()
-                .ok_or_else(|| anyhow::anyhow!("Cannot convert PathBuf to str"))?,
-            "--yes",
-        ];
-        run(upgrade_args, None, Some(env_map))?;
-
-        // Check plugin version
-        let installed_manifest = installed_plugins_dir
-            .join("spin")
-            .join("plugins")
-            .join("manifests")
-            .join("example.json");
-        let manifest = std::fs::read_to_string(installed_manifest)?;
-        assert!(manifest.contains("0.2.1"));
-
-        // Uninstall plugin
-        let binary = spin_binary();
-        let uninstall_args = vec![&binary, "plugins", "uninstall", "example"];
-        run(uninstall_args, None, None)?;
-        Ok(())
-    }
-
-    // TODO: Test on Windows
-    #[cfg(not(target_os = "windows"))]
-    #[test]
-    fn test_cloud_plugin_install() -> Result<()> {
-        // Create a temporary directory for plugin source and manifests
-        let temp_dir = tempdir()?;
-        let dir = temp_dir.path();
-        let installed_plugins_dir = dir.join("tmp");
-
-        // Ensure that spin installs the plugins into the temporary directory
-        let mut env_map: HashMap<&str, &str> = HashMap::new();
-        env_map.insert(
-            "TEST_PLUGINS_DIRECTORY",
-            installed_plugins_dir.to_str().unwrap(),
-        );
-
-        // `spin login --help` should cause the `cloud` plugin to be installed
-        let spin_binary = spin_binary();
-        let args = vec![&spin_binary, "login", "--help"];
-
-        // Execute example plugin which writes "This is an example Spin plugin!" to a specified file
-        let output = run(args, None, Some(env_map.clone()))?;
-
-        // Ensure plugin is installed
-        assert!(std::str::from_utf8(&output.stdout)?
-            .trim()
-            .contains("The `cloud` plugin is required. Installing now."));
-
-        // Ensure login help info is displayed
-        assert!(std::str::from_utf8(&output.stdout)?
-            .trim()
-            .contains("Log into Fermyon Cloud"));
-
-        Ok(())
-    }
-
-    #[tokio::test]
-    async fn test_build_command() -> Result<()> {
-        do_test_build_command("tests/build/simple").await
-    }
-
     #[tokio::test]
     async fn test_outbound_post() -> Result<()> {
         let listener = tokio::net::TcpListener::bind((Ipv4Addr::new(127, 0, 0, 1), 0)).await?;
@@ -739,6 +487,11 @@ route = "/..."
         Ok(())
     }
 
+    #[tokio::test]
+    async fn test_build_command() -> Result<()> {
+        do_test_build_command("tests/build/simple").await
+    }
+
     /// Build an app whose component `workdir` is a subdirectory.
     #[tokio::test]
     #[cfg(not(tarpaulin))]
@@ -752,4 +505,61 @@ route = "/..."
     async fn test_build_command_sibling_workdir() -> Result<()> {
         do_test_build_command("tests/build/sibling").await
     }
+
+    /// Builds app in `dir` and verifies the build succeeded. Expects manifest
+    /// in `spin.toml` inside `dir`.
+    async fn do_test_build_command(dir: impl AsRef<Path>) -> Result<()> {
+        let dir = dir.as_ref();
+        let manifest_file = dir.join("spin.toml");
+        let manifest = spin_manifest::manifest_from_file(&manifest_file)?;
+
+        let sources = manifest
+            .components
+            .iter()
+            .map(|(id, component)| {
+                let v2::ComponentSource::Local(file) = &component.source else {
+                    panic!(
+                        "{}.{}: source is not a file reference",
+                        manifest.application.name, id
+                    )
+                };
+                (id, dir.join(file))
+            })
+            .collect::<HashMap<_, _>>();
+
+        // Delete build output so that later it can be assumed: if the output
+        // exists, it is because `spin build` succeeded.
+        for source in sources.values() {
+            if source.exists() {
+                std::fs::remove_file(source)?
+            }
+        }
+
+        run(
+            vec![
+                spin_binary().as_str(),
+                "build",
+                "--file",
+                manifest_file.to_str().unwrap(),
+            ],
+            None,
+            None,
+        )?;
+
+        let mut missing_sources_count = 0;
+        for (component_id, source) in sources.iter() {
+            if source.exists() {
+                std::fs::remove_file(source)?;
+            } else {
+                missing_sources_count += 1;
+                println!(
+                    "{}.{} source file was not generated by build",
+                    manifest.application.name, component_id
+                );
+            }
+        }
+        assert_eq!(missing_sources_count, 0);
+
+        Ok(())
+    }
 }