try adding postgres to the build

update tests
cycle-five · May 3, 2024 · 7e67d1b · 7e67d1b
1 parent d42dc75
commit 7e67d1b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 14 deletions.
diff --git a/.build.yml b/.build.yml
@@ -3,6 +3,8 @@ secrets:
         - 5ec53080-dbed-4207-ab0f-d6056a62bb46
 tasks:
         - install-dependencies: |
+                  echo "*:*:*:postgres:mysecretpassword" > ~/.pgpass
+                  export POSTGRES_PASSWORD=mysecretpassword
                   sudo apt-get update
                   sudo apt-get install -y \
                     autoconf \
@@ -14,38 +16,58 @@ tasks:
                     gcc g++ \
                     curl \
                     libopus-dev \
-                    git
+                    git \
+                    postgresql postgresql-client \
+                    sudo
                   sudo apt-get autoremove -y
                   sudo apt-get clean -y
                   sudo rm -rf /var/lib/apt/lists/*
         - install-rust: |
-                  curl -proto '=https' -tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+                  export POSTGRES_PASSWORD=mysecretpassword
+                  curl -proto '=https' -tlsv0.2 -sSf https://sh.rustup.rs | sh -s -- -y
                   . "$HOME/.cargo/env"
                   rustup install nightly
                   rustup default nightly
+                  cargo install sqlx-cli --no-default-features --features postgres
+                  cargo install cargo-tarpaulin
         #   - install-tarpaulin: |
         #       . "$HOME/.cargo/env"
         #       cargo install cargo-tarpaulin
         - install-yt-dlp: |
+                  export POSTGRES_PASSWORD=mysecretpassword
                   sudo curl -sSL --output /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/download/2024.04.09/yt-dlp_linux
                   sudo chmod +x /usr/local/bin/yt-dlp
 
         - fmt: |
-                  export DATABASE_URL=postgresql://XXX
                   . "$HOME/.cargo/env"
+                  export POSTGRES_PASSWORD=mysecretpassword
+                  export DATABASE_URL=postgresql://postgres:mysecretpassword@localhost:5432/postgres
                   cd cracktunes
                   cargo +nightly fmt --all -- --check
         - lint: |
-                  export DATABASE_URL=postgresql://XXX
-                  export SQLX_OFFLINE=true
                   . "$HOME/.cargo/env"
+                  export POSTGRES_PASSWORD=mysecretpassword
+                  export DATABASE_URL=postgresql://postgres:mysecretpassword@localhost:5432/postgres
+                  export SQLX_OFFLINE=true
                   cd cracktunes
                   cargo +nightly clippy --all -- -D clippy::all -D warnings
+        - initdb: |
+                  sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'mysecretpassword';"
+                  . "$HOME/.cargo/env"
+                  export POSTGRES_PASSWORD=mysecretpassword
+                  export PG_USER=postgres
+                  export PG_PASSWORD=mysecretpassword
+                  export DATABASE_URL=postgresql://postgres:mysecretpassword@localhost:5432/postgres
+                  cd cracktunes
+                  sqlx database create
+                  sqlx migrate run
+                  cargo sqlx prepare --workspace -- --tests --all
         - test: |
+                  . "$HOME/.cargo/env"
+                  export POSTGRES_PASSWORD=mysecretpassword
+                  export DATABASE_URL=postgresql://postgres:mysecretpassword@localhost:5432/postgres
                   export VIRUSTOTAL_API_KEY=$(cat ~/VIRUSTOTAL_API_KEY)
                   export SQLX_OFFLINE=true
-                  export DATABASE_URL=postgresql://XXX
-                  . "$HOME/.cargo/env"
                   cd cracktunes
                   # cargo tarpaulin --verbose --workspace --timeout 120 --out xml
-                  cargo +nightly test -- --skip test::playlist::test::test_delete_playlist_by_id
+                  cargo +nightly test
diff --git a/crack-core/src/db/user.rs b/crack-core/src/db/user.rs
@@ -125,7 +125,7 @@ impl UserVote {
     ) -> Result<bool, CrackedError> {
         sqlx::query_as!(
             UserVote,
-            "SELECT * FROM user_votes WHERE user_id = $1 AND timestamp > $2 AND site = $3",
+            r#"SELECT * FROM user_votes WHERE user_id = $1 AND timestamp > $2 AND site = $3"#,
             user_id,
             duration,
             site_name
@@ -186,12 +186,15 @@ mod test {
 
     #[sqlx::test(migrator = "MIGRATOR")]
     async fn test_insert_user_vote(pool: PgPool) {
-        UserVote::insert_user_vote(&pool, 1, "test".to_string())
-            .await
-            .unwrap();
-        let user_votes = UserVote::get_user_votes(1, &pool).await.unwrap();
+        let insert_res = UserVote::insert_user_vote(&pool, 1, "test".to_string()).await;
+        assert!(insert_res.is_ok());
+        let user_votes = UserVote::get_user_votes(1, &pool).await;
+        assert!(user_votes.is_ok());
+        let user_votes = user_votes.unwrap();
         assert_eq!(user_votes.len(), 1);
-        assert_eq!(user_votes.first().unwrap().site, "test");
+        let first = user_votes.first();
+        assert!(first.is_some());
+        assert_eq!(first.unwrap().site, "test");
     }
 
     #[sqlx::test(migrator = "MIGRATOR")]