Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding tests, and fixing missing error code. #619

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/api/orgs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mod secrets;

use crate::error::HttpSnafu;
use crate::Octocrab;
use http::Uri;
use http::{StatusCode, Uri};
use snafu::ResultExt;

pub use self::events::ListOrgEventsBuilder;
Expand Down Expand Up @@ -87,9 +87,12 @@ impl<'octo> OrgHandler<'octo> {
.context(HttpSnafu)?;

let response = self.crab._get(uri).await?;
let status = response.status();

Ok(status == 204 || status == 301)
match response.status() {
StatusCode::NO_CONTENT => Ok(true),
StatusCode::NOT_FOUND => Ok(false),
_ => Err(crate::map_github_error(response).await.unwrap_err()),
}
}

/// Get an organization
Expand Down
79 changes: 77 additions & 2 deletions tests/org_members_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ struct FakePage<T> {
items: Vec<T>,
}

async fn setup_api(template: ResponseTemplate) -> MockServer {
async fn setup_list_api(template: ResponseTemplate) -> MockServer {
let org = "org";
let mock_server = MockServer::start().await;

Expand All @@ -31,11 +31,31 @@ async fn setup_api(template: ResponseTemplate) -> MockServer {
mock_server
}

//
async fn setup_check_membership_api(template: ResponseTemplate) -> MockServer {
let org = "org";
let mock_server = MockServer::start().await;
let username = "mona";

Mock::given(method("GET"))
.and(path(format!("/orgs/{org}/members/{username}")))
.respond_with(template)
.mount(&mock_server)
.await;
setup_error_handler(
&mock_server,
&format!("GET on /orgs/{org}/members/{username} was not received"),
)
.await;
mock_server
}

fn setup_octocrab(uri: &str) -> Octocrab {
Octocrab::builder().base_uri(uri).unwrap().build().unwrap()
}

const ORG: &str = "org";
const USERNAME: &str = "mona";

#[tokio::test]
async fn should_return_page_with_users() {
Expand All @@ -46,7 +66,7 @@ async fn should_return_page_with_users() {
items: vec![org_members],
};
let template = ResponseTemplate::new(200).set_body_json(&page_response);
let mock_server = setup_api(template).await;
let mock_server = setup_list_api(template).await;
let client = setup_octocrab(&mock_server.uri());
let org = client.orgs(ORG.to_owned());
let result = org.list_members().send().await;
Expand All @@ -61,3 +81,58 @@ async fn should_return_page_with_users() {
assert_eq!(items[0].login, login);
}
}

#[tokio::test]
async fn org_check_membership_204() {
let template = ResponseTemplate::new(204);
let mock_server = setup_check_membership_api(template).await;
let client = setup_octocrab(&mock_server.uri());
let org = client.orgs(ORG.to_owned());
let result = org.check_membership(USERNAME.to_owned()).await;

assert!(
result.is_ok(),
"expected successful result, got error: {:#?}",
result
);
assert!(
result.as_ref().unwrap(),
"expected _true_ to be returned, but got {:#?}",
result
);
}

#[tokio::test]
async fn org_check_membership_404() {
let template = ResponseTemplate::new(404);
let mock_server = setup_check_membership_api(template).await;
let client = setup_octocrab(&mock_server.uri());
let org = client.orgs(ORG.to_owned());
let result = org.check_membership(USERNAME.to_owned()).await;

assert!(
result.is_ok(),
"expected successful result, got error: {:#?}",
result
);
assert!(
!result.as_ref().unwrap(),
"expected false to be returned, but got {:#?}",
result
);
}

#[tokio::test]
async fn org_check_membership_500() {
let template = ResponseTemplate::new(500);
let mock_server = setup_check_membership_api(template).await;
let client = setup_octocrab(&mock_server.uri());
let org = client.orgs(ORG.to_owned());
let result = org.check_membership(USERNAME.to_owned()).await;

assert!(
result.is_err(),
"expected error result, got success somehow: {:#?}",
result
);
}
Loading