Merge pull request #1228 from cyqsimon/upload-refactor

Minor refactor on upload code

1 files changed, 36 insertions, 36 deletions

diff --git a/tests/readme.rs b/tests/readme.rs
index 7faea7b..c8138b4 100644
--- a/tests/readme.rs
+++ b/tests/readme.rs
@@ -8,6 +8,42 @@ use std::fs::{remove_file, File};
 use std::io::Write;
 use std::path::PathBuf;
 
+fn write_readme_contents(path: PathBuf, filename: &str) -> PathBuf {
+    let readme_path = path.join(filename);
+    let mut readme_file = File::create(&readme_path).unwrap();
+    readme_file
+        .write_all(format!("Contents of {filename}").as_bytes())
+        .expect("Couldn't write readme");
+    readme_path
+}
+
+fn assert_readme_contents(parsed_dom: &Document, filename: &str) {
+    assert!(parsed_dom.find(Attr("id", "readme")).next().is_some());
+    assert!(parsed_dom
+        .find(Attr("id", "readme-filename"))
+        .next()
+        .is_some());
+    assert!(
+        parsed_dom
+            .find(Attr("id", "readme-filename"))
+            .next()
+            .unwrap()
+            .text()
+            == filename
+    );
+    assert!(parsed_dom
+        .find(Attr("id", "readme-contents"))
+        .next()
+        .is_some());
+    assert!(parsed_dom
+        .find(Attr("id", "readme-contents"))
+        .next()
+        .unwrap()
+        .text()
+        .trim()
+        .contains(&format!("Contents of {filename}")));
+}
+
 /// Do not show readme contents by default
 #[rstest]
 fn no_readme_contents(server: TestServer) -> Result<(), Error> {
@@ -89,39 +125,3 @@ fn show_nested_readme_contents(
     }
     Ok(())
 }
-
-fn write_readme_contents(path: PathBuf, filename: &str) -> PathBuf {
-    let readme_path = path.join(filename);
-    let mut readme_file = File::create(&readme_path).unwrap();
-    readme_file
-        .write_all(format!("Contents of {filename}").as_bytes())
-        .expect("Couldn't write readme");
-    readme_path
-}
-
-fn assert_readme_contents(parsed_dom: &Document, filename: &str) {
-    assert!(parsed_dom.find(Attr("id", "readme")).next().is_some());
-    assert!(parsed_dom
-        .find(Attr("id", "readme-filename"))
-        .next()
-        .is_some());
-    assert!(
-        parsed_dom
-            .find(Attr("id", "readme-filename"))
-            .next()
-            .unwrap()
-            .text()
-            == filename
-    );
-    assert!(parsed_dom
-        .find(Attr("id", "readme-contents"))
-        .next()
-        .is_some());
-    assert!(parsed_dom
-        .find(Attr("id", "readme-contents"))
-        .next()
-        .unwrap()
-        .text()
-        .trim()
-        .contains(&format!("Contents of {filename}")));
-}