Merge ecd5705272 into 34e292bea9

.github/workflows/release.yml

@@ -3,6 +3,8 @@ name: Release Tagging
 on:
   push:
     branches: [ "v0.2" ]
+  pull_request:
+    branches: [ "v0.2" ]
 
 jobs:
   release:

src/main.rs

@@ -247,7 +247,7 @@ mod tests {
     ) -> Result<axum::response::Response, std::convert::Infallible> {
         // Create multipart form
         let mut form = MultipartForm::default();
-        let _ = form.add_file("flac", "tests/IAmWe/track01.flac");
+        let _ = form.add_file("flac", "tests/Machine_gun/track01.flac");
 
         // Create request
         let content_type = form.content_type();
@@ -331,7 +331,7 @@ mod tests {
         app: &axum::Router,
     ) -> Result<axum::response::Response, std::convert::Infallible> {
         let mut form = MultipartForm::default();
-        let _ = form.add_file("jpg", "tests/IAmWe/Coverart.jpg");
+        let _ = form.add_file("jpg", "tests/Machine_gun/160809_machinegun.jpg");
 
         // Create request
         let content_type = form.content_type();
@@ -407,7 +407,22 @@ mod tests {
         song_queue_id: &uuid::Uuid,
         user_id: &uuid::Uuid,
     ) -> Result<axum::response::Response, std::convert::Infallible> {
-        let payload = payload_data::create_song(song_queue_id, user_id).await;
+        let payload = serde_json::json!({
+            "title": "Power of Soul",
+            "artist": "Jimmi Hendrix",
+            "album_artist": "Jimmi Hendrix",
+            "album": "Machine Gun",
+            "genre": "Psychadelic Rock",
+            "date": "2016-01-01",
+            "track": 1,
+            "disc": 1,
+            "track_count": 11,
+            "disc_count": 1,
+            "duration": 330,
+            "audio_type": "flac",
+            "user_id": user_id,
+            "song_queue_id": song_queue_id
+        });
 
         let req = axum::http::Request::builder()
             .method(axum::http::Method::POST)
@@ -638,39 +653,17 @@ mod tests {
             serde_json::json!(
             {
                     "song_queue_id": song_queue_id,
-                    "album" : "I",
+                    "album" : "Machine Gun: The FillMore East First Show",
-                    "album_artist" : "Kuoth",
+                    "album_artist" : "Jimi Hendrix",
-                    "artist" : "Kuoth",
+                    "artist" : "Jimi Hendrix",
                     "disc" : 1,
                     "disc_count" : 1,
-                    "duration" : 139,
+                    "duration" : 330,
-                    "genre" : "Alternative Hip-Hop",
+                    "genre" : "Psychadelic Rock",
-                    "title" : "Hypocrite Like The Rest",
+                    "title" : "Power of Soul",
                     "track" : 1,
-                    "track_count" : 9,
+                    "track_count" : 11,
-                    "year" : 2020
+                    "year" : 2016
-            })
-        }
-
-        pub async fn create_song(
-            song_queue_id: &uuid::Uuid,
-            user_id: &uuid::Uuid,
-        ) -> serde_json::Value {
-            serde_json::json!({
-                "title" : "Hypocrite Like The Rest",
-                "artist" : "Kuoth",
-                "album_artist": "Kuoth",
-                "album": "I",
-                "genre" : "Alternative Hip-Hop",
-                "date": "2020-01-01",
-                "track": 1,
-                "disc": 1,
-                "track_count": 9,
-                "disc_count": 1,
-                "duration": 139,
-                "audio_type": "flac",
-                "user_id": user_id,
-                "song_queue_id": song_queue_id
             })
         }
     }

tests/IAmWe/album.json

@@ -1,73 +0,0 @@
-{
-    "album": "I Am We",
-    "album_artist": "Kuoth",
-    "disc_count": 1,
-    "genre": "Alternative Hip-Hop",
-    "year": 2020,
-    "track_count": 9,
-    "tracks": [
-        {
-            "artist": "Kuoth",
-            "disc": 1,
-            "title": "Hypocrite Like the Rest",
-            "duration": 139,
-            "track": 1
-        },
-        {
-            "artist": "Kuoth",
-            "disc": 1,
-            "title": "It's Too Late",
-            "duration": 116,
-            "track": 2
-        },
-        {
-            "artist": "Kuoth",
-            "disc": 1,
-            "title": "Hell Might be Nice",
-            "duration": 229,
-            "track": 3
-        },
-        {
-            "artist": "Kuoth",
-            "disc": 1,
-            "title": "Dark Side of Progress",
-            "duration": 187,
-            "track": 4
-        },
-        {
-            "artist": "Kuoth",
-            "disc": 1,
-            "title": "Distractions",
-            "duration": 141,
-            "track": 5
-        },
-        {
-            "artist": "Kuoth",
-            "disc": 1,
-            "title": "But You Won't Listen",
-            "duration": 184,
-            "track": 6
-        },
-        {
-            "artist": "Kuoth",
-            "disc": 1,
-            "title": "Guidance",
-            "duration": 121,
-            "track": 7
-        },
-        {
-            "artist": "Kuoth",
-            "disc": 1,
-            "title": "M",
-            "duration": 98,
-            "track": 8
-        },
-        {
-            "artist": "Kuoth",
-            "disc": 1,
-            "title": "Social Acceptance",
-            "duration": 169,
-            "track": 9
-        }
-    ]
-}