grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Address review comments

Browse source
This commit is contained in:
Felix Ableitner 2020-09-21 17:24:42 +02:00
parent 12af0f462f
commit aece5e67b7
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
docker/travis/run-tests.sh → docker/travis/run-tests.bash
View file

2
test.sh
View file

@ -2,4 +2,4 @@
export DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy export DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
diesel migration run diesel migration run
export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy export LEMMY_DATABASE_URL=postgres://lemmy:password@localhost:5432/lemmy
RUST_TEST_THREADS=1 RUST_BACKTRACE=1 cargo test -j8 --no-fail-fast -- --nocapture RUST_TEST_THREADS=1 cargo test --workspace --no-fail-fast

15
tests/integration_test.rs
View file

@ -157,7 +157,8 @@ fn create_http_request() -> HttpRequest {
async fn test_shared_inbox_expired_signature() { async fn test_shared_inbox_expired_signature() {
let request = create_http_request(); let request = create_http_request();
let context = create_context(); let context = create_context();
let user = create_user(&context.pool().get().unwrap(), "shared_inbox_rvgfd"); let connection = &context.pool().get().unwrap();
let user = create_user(connection, "shared_inbox_rvgfd");
let activity = let activity =
create_activity::<CreateType, ActorAndObject<shared_inbox::ValidTypes>>(user.actor_id); create_activity::<CreateType, ActorAndObject<shared_inbox::ValidTypes>>(user.actor_id);
let response = shared_inbox(request, activity, web::Data::new(context)).await; let response = shared_inbox(request, activity, web::Data::new(context)).await;
@ -165,13 +166,15 @@ async fn test_shared_inbox_expired_signature() {
format!("{}", response.err().unwrap()), format!("{}", response.err().unwrap()),
format!("{}", PrepareVerifyError::Expired) format!("{}", PrepareVerifyError::Expired)
); );
User_::delete(connection, user.id).unwrap();
} }
#[actix_rt::test] #[actix_rt::test]
async fn test_user_inbox_expired_signature() { async fn test_user_inbox_expired_signature() {
let request = create_http_request(); let request = create_http_request();
let context = create_context(); let context = create_context();
let user = create_user(&context.pool().get().unwrap(), "user_inbox_cgsax"); let connection = &context.pool().get().unwrap();
let user = create_user(connection, "user_inbox_cgsax");
let activity = let activity =
create_activity::<CreateType, ActorAndObject<user_inbox::ValidTypes>>(user.actor_id); create_activity::<CreateType, ActorAndObject<user_inbox::ValidTypes>>(user.actor_id);
let path = Path::<String> { let path = Path::<String> {
@ -182,13 +185,15 @@ async fn test_user_inbox_expired_signature() {
format!("{}", response.err().unwrap()), format!("{}", response.err().unwrap()),
format!("{}", PrepareVerifyError::Expired) format!("{}", PrepareVerifyError::Expired)
); );
User_::delete(connection, user.id).unwrap();
} }
#[actix_rt::test] #[actix_rt::test]
async fn test_community_inbox_expired_signature() { async fn test_community_inbox_expired_signature() {
let context = create_context(); let context = create_context();
let user = create_user(&context.pool().get().unwrap(), "community_inbox_hrxa"); let connection = &context.pool().get().unwrap();
let community = create_community(&context.pool().get().unwrap(), user.id); let user = create_user(connection, "community_inbox_hrxa");
let community = create_community(connection, user.id);
let request = create_http_request(); let request = create_http_request();
let activity = let activity =
create_activity::<FollowType, ActorAndObject<community_inbox::ValidTypes>>(user.actor_id); create_activity::<FollowType, ActorAndObject<community_inbox::ValidTypes>>(user.actor_id);
@ -198,4 +203,6 @@ async fn test_community_inbox_expired_signature() {
format!("{}", response.err().unwrap()), format!("{}", response.err().unwrap()),
format!("{}", PrepareVerifyError::Expired) format!("{}", PrepareVerifyError::Expired)
); );
User_::delete(connection, user.id).unwrap();
Community::delete(connection, community.id).unwrap();
} }