zelo72
/
flodgatt
mirror of https://github.com/mastodon/flodgatt
1
0
Fork 0
Code Issues Releases Wiki Activity

Update tests

This commit is contained in:
Daniel Sockwell 2020-03-11 18:27:08 -04:00
parent 35ab488b11
commit 32fc17a89a
5 changed files with 81 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/parse_client_request/sse.rs
View File

@ -74,7 +74,7 @@ pub fn extract_user_or_reject(pg_pool: PgPool) -> BoxedFilter<(User,)> {
#[cfg(test)]
mod test {
use super::*;
use crate::parse_client_request::user::{Filter, OauthScope, PostgresPool};
use crate::parse_client_request::user::{Blocks, Filter, OauthScope, PgPool};
macro_rules! test_public_endpoint {
($name:ident {
@ -83,7 +83,7 @@ mod test {
}) => {
#[test]
fn $name() {
let mock_pg_pool = PostgresPool::new();
let mock_pg_pool = PgPool::new();
let user = warp::test::request()
.path($path)
.filter(&extract_user_or_reject(mock_pg_pool))
@ -101,7 +101,7 @@ mod test {
#[test]
fn $name() {
let path = format!("{}?access_token=TEST_USER", $path);
let mock_pg_pool = PostgresPool::new();
let mock_pg_pool = PgPool::new();
$(let path = format!("{}&{}", path, $query);)*
let user = warp::test::request()
.path(&path)
@ -127,7 +127,7 @@ mod test {
fn $name() {
let path = format!("{}?access_token=INVALID", $path);
$(let path = format!("{}&{}", path, $query);)*
let mock_pg_pool = PostgresPool::new();
let mock_pg_pool = PgPool::new();
warp::test::request()
.path(&path)
.filter(&extract_user_or_reject(mock_pg_pool))
@ -146,7 +146,7 @@ mod test {
let path = $path;
$(let path = format!("{}?{}", path, $query);)*
let mock_pg_pool = PostgresPool::new();
let mock_pg_pool = PgPool::new();
warp::test::request()
.path(&path)
.header("Authorization", "Bearer: INVALID")
@ -165,7 +165,7 @@ mod test {
fn $name() {
let path = $path;
$(let path = format!("{}?{}", path, $query);)*
let mock_pg_pool = PostgresPool::new();
let mock_pg_pool = PgPool::new();
warp::test::request()
.path(&path)
.filter(&extract_user_or_reject(mock_pg_pool))
@ -180,7 +180,7 @@ mod test {
target_timeline: "public:media".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -189,6 +189,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -198,7 +199,7 @@ mod test {
target_timeline: "public:media".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -207,6 +208,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -216,7 +218,7 @@ mod test {
target_timeline: "public:local".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -225,6 +227,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -234,7 +237,7 @@ mod test {
target_timeline: "public:local:media".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -243,6 +246,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -252,7 +256,7 @@ mod test {
target_timeline: "public:local:media".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -261,6 +265,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -270,7 +275,7 @@ mod test {
target_timeline: "hashtag:a".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -279,6 +284,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -288,7 +294,7 @@ mod test {
target_timeline: "hashtag:local:a".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -297,6 +303,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -316,6 +323,7 @@ mod test {
lists: false,
},
logged_in: true,
blocks: Blocks::default(),
filter: Filter::NoFilter,
},
});
@ -334,6 +342,7 @@ mod test {
lists: false,
},
logged_in: true,
blocks: Blocks::default(),
filter: Filter::Notification,
},
});
@ -352,6 +361,7 @@ mod test {
lists: false,
},
logged_in: true,
blocks: Blocks::default(),
filter: Filter::NoFilter,
},
});
@ -372,6 +382,7 @@ mod test {
lists: false,
},
logged_in: true,
blocks: Blocks::default(),
filter: Filter::NoFilter,
},
});
@ -448,7 +459,7 @@ mod test {
#[test]
#[should_panic(expected = "NotFound")]
fn nonexistant_endpoint() {
let mock_pg_pool = PostgresPool::new();
let mock_pg_pool = PgPool::new();
warp::test::request()
.path("/api/v1/streaming/DOES_NOT_EXIST")
.filter(&extract_user_or_reject(mock_pg_pool))

54
src/parse_client_request/user/mock_postgres.rs
View File

@ -1,37 +1,39 @@
//! Mock Postgres connection (for use in unit testing)
use super::{OauthScope, User};
#[derive(Clone)]
pub struct PostgresPool;
impl PostgresPool {
pub struct PgPool;
impl PgPool {
pub fn new() -> Self {
Self
}
}
pub fn query_for_user_data(
access_token: &str,
_pg_pool: PostgresPool,
) -> (i64, String, Option<Vec<String>>, Vec<String>) {
let (user_id, email, lang, scopes) = if access_token == "TEST_USER" {
(
1,
"user@example.com".to_string(),
None,
vec![
"read".to_string(),
"write".to_string(),
"follow".to_string(),
],
)
} else {
(-1, "".to_string(), None, Vec::new())
};
(user_id, email, lang, scopes)
pub fn select_user(access_token: &str, _pg_pool: PgPool) -> Result<User, warp::reject::Rejection> {
let mut user = User::default();
if access_token == "TEST_USER" {
user.id = 1;
user.logged_in = true;
user.access_token = "TEST_USER".to_string();
user.email = "user@example.com".to_string();
user.scopes = OauthScope::from(vec![
"read".to_string(),
"write".to_string(),
"follow".to_string(),
]);
} else if access_token == "INVALID" {
return Err(warp::reject::custom("Error: Invalid access token"));
}
Ok(user)
}
pub fn query_list_owner(list_id: i64, _pg_pool: PostgresPool) -> Option<i64> {
match list_id {
1 => Some(1),
_ => None,
}
pub fn select_user_blocks(_id: i64, _pg_pool: PgPool) -> Vec<i64> {
Vec::new()
}
pub fn select_domain_blocks(_pg_pool: PgPool) -> Vec<String> {
Vec::new()
}
pub fn user_owns_list(user_id: i64, list_id: i64, _pg_pool: PgPool) -> bool {
user_id == list_id
}

4
src/parse_client_request/user/mod.rs
View File

@ -5,7 +5,7 @@ mod mock_postgres;
use mock_postgres as postgres;
#[cfg(not(test))]
mod postgres;
pub use self::postgres::PostgresPool as PgPool;
pub use self::postgres::PgPool;
use super::query::Query;
use warp::reject::Rejection;
@ -18,7 +18,7 @@ pub enum Filter {
}
impl Default for Filter {
fn default() -> Self {
Filter::NoFilter
Filter::Language
}
}

12
src/parse_client_request/user/postgres.rs
View File

@ -8,8 +8,8 @@ use r2d2_postgres::PostgresConnectionManager;
use warp::reject::Rejection;
#[derive(Clone)]
pub struct PostgresPool(pub r2d2::Pool<PostgresConnectionManager<postgres::NoTls>>);
impl PostgresPool {
pub struct PgPool(pub r2d2::Pool<PostgresConnectionManager<postgres::NoTls>>);
impl PgPool {
pub fn new(pg_cfg: config::PostgresConfig) -> Self {
let mut cfg = postgres::Config::new();
cfg.user(&pg_cfg.user)
@ -33,7 +33,7 @@ impl PostgresPool {
///
/// This does _not_ set the timeline, filter, or blocks fields. Use the various `User`
/// methods to do so. In general, this function shouldn't be needed outside `User`.
pub fn select_user(access_token: &str, pg_pool: PostgresPool) -> Result<User, Rejection> {
pub fn select_user(access_token: &str, pg_pool: PgPool) -> Result<User, Rejection> {
let mut conn = pg_pool.0.get().unwrap();
let query_result = conn
.query(
@ -91,7 +91,7 @@ pub fn query_for_user_data(access_token: &str) -> (i64, Option<Vec<String>>, Vec
///
/// **NOTE**: because we check this when the user connects, it will not include any blocks
/// the user adds until they refresh/reconnect.
pub fn select_user_blocks(user_id: i64, pg_pool: PostgresPool) -> Vec<i64> {
pub fn select_user_blocks(user_id: i64, pg_pool: PgPool) -> Vec<i64> {
pg_pool
.0
.get()
@ -117,7 +117,7 @@ UNION SELECT target_account_id
/// **NOTE**: because we check this when the user connects, it will not include any blocks
/// the user adds until they refresh/reconnect. Additionally, we are querying it once per
/// user, even though it is constant for all users (at any given time).
pub fn select_domain_blocks(pg_pool: PostgresPool) -> Vec<String> {
pub fn select_domain_blocks(pg_pool: PgPool) -> Vec<String> {
pg_pool
.0
.get()
@ -130,7 +130,7 @@ pub fn select_domain_blocks(pg_pool: PostgresPool) -> Vec<String> {
}
/// Test whether a user owns a list
pub fn user_owns_list(user_id: i64, list_id: i64, pg_pool: PostgresPool) -> bool {
pub fn user_owns_list(user_id: i64, list_id: i64, pg_pool: PgPool) -> bool {
let mut conn = pg_pool.0.get().unwrap();
// For the Postgres query, `id` = list number; `account_id` = user.id
let rows = &conn

31
src/parse_client_request/ws.rs
View File

@ -43,7 +43,7 @@ pub fn extract_user_or_reject(pg_pool: PgPool) -> BoxedFilter<(User,)> {
#[cfg(test)]
mod test {
use super::*;
use crate::parse_client_request::user::{Filter, OauthScope};
use crate::parse_client_request::user::{Blocks, Filter, OauthScope};
macro_rules! test_public_endpoint {
($name:ident {
@ -52,7 +52,7 @@ mod test {
}) => {
#[test]
fn $name() {
let mock_pg_pool = PostgresPool::new();
let mock_pg_pool = PgPool::new();
let user = warp::test::request()
.path($path)
.header("connection", "upgrade")
@ -72,7 +72,7 @@ mod test {
}) => {
#[test]
fn $name() {
let mock_pg_pool = PostgresPool::new();
let mock_pg_pool = PgPool::new();
let path = format!("{}&access_token=TEST_USER", $path);
let user = warp::test::request()
.path(&path)
@ -96,7 +96,7 @@ mod test {
fn $name() {
let path = format!("{}&access_token=INVALID", $path);
let mock_pg_pool = PostgresPool::new();
let mock_pg_pool = PgPool::new();
warp::test::request()
.path(&path)
.filter(&extract_user_or_reject(mock_pg_pool))
@ -112,7 +112,7 @@ mod test {
#[should_panic(expected = "Error: Missing access token")]
fn $name() {
let path = $path;
let mock_pg_pool = PostgresPool::new();
let mock_pg_pool = PgPool::new();
warp::test::request()
.path(&path)
.filter(&extract_user_or_reject(mock_pg_pool))
@ -127,7 +127,7 @@ mod test {
target_timeline: "public:media".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -136,6 +136,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -145,7 +146,7 @@ mod test {
target_timeline: "public:local".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -154,6 +155,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -163,7 +165,7 @@ mod test {
target_timeline: "public:local:media".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -172,6 +174,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -181,7 +184,7 @@ mod test {
target_timeline: "hashtag:a".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -190,6 +193,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -199,7 +203,7 @@ mod test {
target_timeline: "hashtag:local:a".to_string(),
id: -1,
email: "".to_string(),
access_token: "no access token".to_string(),
access_token: "".to_string(),
langs: None,
scopes: OauthScope {
all: false,
@ -208,6 +212,7 @@ mod test {
lists: false,
},
logged_in: false,
blocks: Blocks::default(),
filter: Filter::Language,
},
});
@ -227,6 +232,7 @@ mod test {
lists: false,
},
logged_in: true,
blocks: Blocks::default(),
filter: Filter::NoFilter,
},
});
@ -245,6 +251,7 @@ mod test {
lists: false,
},
logged_in: true,
blocks: Blocks::default(),
filter: Filter::Notification,
},
});
@ -263,6 +270,7 @@ mod test {
lists: false,
},
logged_in: true,
blocks: Blocks::default(),
filter: Filter::NoFilter,
},
});
@ -281,6 +289,7 @@ mod test {
lists: false,
},
logged_in: true,
blocks: Blocks::default(),
filter: Filter::NoFilter,
},
});
@ -325,7 +334,7 @@ mod test {
#[test]
#[should_panic(expected = "NotFound")]
fn nonexistant_endpoint() {
let mock_pg_pool = PostgresPool::new();
let mock_pg_pool = PgPool::new();
warp::test::request()
.path("/api/v1/streaming/DOES_NOT_EXIST")
.header("connection", "upgrade")