From 26cd6e3bd29f3c84740aaf5b8c64d1c8c89810ab Mon Sep 17 00:00:00 2001 From: Josh Rotenberg Date: Tue, 4 Feb 2025 17:09:10 -0800 Subject: [PATCH] use a single setup_octocrab --- ...ns_add_selected_repo_to_org_secret_test.rs | 9 ++------ .../actions_delete_workflow_run_logs_test.rs | 9 ++------ ...move_selected_repo_from_org_secret_test.rs | 9 ++------ tests/actions_self_hosted_runners.rs | 4 ++-- tests/actions_workflows_dispatches_test.rs | 9 ++------ tests/check_suites.rs | 9 ++------ tests/code_scanning_alert_update_test.rs | 9 ++------ tests/code_scanning_alerts_list_test.rs | 9 ++------ tests/code_scanning_analysis_test.rs | 9 ++------ tests/commit_associated_check_runs_tests.rs | 10 +++------ tests/current_user_orgs_test.rs | 10 +++------ tests/dependabot_alerts_test.rs | 9 ++------ tests/events_test.rs | 9 ++------ tests/follow_redirect.rs | 10 +++------ tests/generate_release_notes_test.rs | 10 +++------ tests/gists_test.rs | 9 ++------ tests/hooks_delivery_list.rs | 10 +++------ tests/issues_check_assignee_test.rs | 9 ++------ tests/issues_comments_delete_test.rs | 9 ++------ .../issues_comments_reactions_delete_test.rs | 9 ++------ tests/issues_labels_delete_test.rs | 10 +++------ tests/issues_locking_test.rs | 10 +++------ tests/issues_reactions_delete_test.rs | 9 ++------ tests/notifications_threads_test.rs | 9 ++------ tests/org_installations_test.rs | 9 ++------ tests/org_members_tests.rs | 10 +++------ tests/org_secrets_test.rs | 21 +++++++------------ tests/projects_org_create_project_test.rs | 10 +++------ tests/projects_org_list_projects_test.rs | 10 +++------ tests/projects_project_delete_test.rs | 10 +++------ tests/projects_project_get_test.rs | 10 +++------ tests/projects_project_update_test.rs | 10 +++------ tests/projects_repo_create_project_test.rs | 10 +++------ tests/projects_repo_list_projects_test.rs | 10 +++------ tests/projects_user_create_project_test.rs | 10 +++------ tests/projects_user_list_projects_test.rs | 10 +++------ tests/pull_request_commits_test.rs | 9 ++------ tests/pull_request_review_comment_test.rs | 10 +++------ tests/pull_request_review_operations_test.rs | 10 +++------ tests/repo_contributors_test.rs | 9 ++------ tests/repo_delete_ref_test.rs | 10 +++------ tests/repo_secrets_test.rs | 20 ++++++------------ tests/repos_commit_test.rs | 10 +++------ tests/repos_delete_test.rs | 9 ++------ tests/repos_events_test.rs | 9 ++------ tests/repos_is_collaborator_test.rs | 9 ++------ tests/repos_merges_test.rs | 10 +++------ tests/repos_releases_get_by_id.rs | 10 +++------ tests/repos_releases_get_by_tag.rs | 10 +++------ tests/repos_releases_get_latest.rs | 10 +++------ tests/repos_releases_list_test.rs | 10 +++------ tests/repos_stargazers_tests.rs | 10 +++------ tests/secrets_alerts_test.rs | 11 +++------- tests/team_delete_test.rs | 9 ++------ tests/team_invitations_tests.rs | 10 +++------ tests/team_members_tests.rs | 10 +++------ tests/team_repos_tests.rs | 9 ++------ tests/{mock_error.rs => test_common.rs} | 11 ++++++++++ tests/user_blocks_tests.rs | 9 ++------ tests/user_deserialize_test.rs | 9 ++------ tests/user_emails_tests.rs | 9 ++------ tests/user_git_ssh_keys_tests.rs | 9 ++------ tests/user_gpg_keys_tests.rs | 9 ++------ tests/user_repositories_tests.rs | 10 +++------ tests/user_social_accounts_tests.rs | 9 ++------ tests/user_ssh_signing_keys_tests.rs | 9 ++------ 66 files changed, 181 insertions(+), 465 deletions(-) rename tests/{mock_error.rs => test_common.rs} (74%) diff --git a/tests/actions_add_selected_repo_to_org_secret_test.rs b/tests/actions_add_selected_repo_to_org_secret_test.rs index a2abc5c4..49cfc591 100644 --- a/tests/actions_add_selected_repo_to_org_secret_test.rs +++ b/tests/actions_add_selected_repo_to_org_secret_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +29,6 @@ async fn setup_put_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const ORG: &str = "org"; const SECRET_NAME: &str = "some_secret"; const REPOSITORY_ID: u64 = 456; diff --git a/tests/actions_delete_workflow_run_logs_test.rs b/tests/actions_delete_workflow_run_logs_test.rs index 5187ae10..dd6707a7 100644 --- a/tests/actions_delete_workflow_run_logs_test.rs +++ b/tests/actions_delete_workflow_run_logs_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +29,6 @@ async fn setup_delete_workflow_run_logs_api(template: ResponseTemplate) -> MockS mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const RUN_ID: u64 = 456; diff --git a/tests/actions_remove_selected_repo_from_org_secret_test.rs b/tests/actions_remove_selected_repo_from_org_secret_test.rs index f259e77a..58630758 100644 --- a/tests/actions_remove_selected_repo_from_org_secret_test.rs +++ b/tests/actions_remove_selected_repo_from_org_secret_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +29,6 @@ async fn setup_delete_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const ORG: &str = "org"; const SECRET_NAME: &str = "some_secret"; const REPOSITORY_ID: u64 = 456; diff --git a/tests/actions_self_hosted_runners.rs b/tests/actions_self_hosted_runners.rs index 457702e0..29667e94 100644 --- a/tests/actions_self_hosted_runners.rs +++ b/tests/actions_self_hosted_runners.rs @@ -1,10 +1,9 @@ // Tests for calls to the actions self-hosted runners API: // - /repos/{owner}/{repo}/actions/runners // - /orgs/{org}/actions/runners -mod mock_error; +mod test_common; use http::StatusCode; -use mock_error::setup_error_handler; use octocrab::{ models::{ actions::{SelfHostedRunner, SelfHostedRunnerJitConfig, SelfHostedRunnerToken}, @@ -14,6 +13,7 @@ use octocrab::{ }; use serde::{Deserialize, Serialize}; use serde_json::json; +use test_common::setup_error_handler; use wiremock::{ matchers::{body_json, method, path}, Mock, MockServer, ResponseTemplate, diff --git a/tests/actions_workflows_dispatches_test.rs b/tests/actions_workflows_dispatches_test.rs index 87780487..f44c7eba 100644 --- a/tests/actions_workflows_dispatches_test.rs +++ b/tests/actions_workflows_dispatches_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +29,6 @@ async fn setup_post_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const WORKFLOW_ID: &str = "workflow.yaml"; diff --git a/tests/check_suites.rs b/tests/check_suites.rs index c8dc532d..38e9d9d3 100644 --- a/tests/check_suites.rs +++ b/tests/check_suites.rs @@ -3,14 +3,13 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::checks::{AutoTriggerCheck, CheckSuite, CheckSuitePreferences}; use octocrab::models::{AppId, CheckRunId, CheckSuiteId}; use octocrab::params::repos::Commitish; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; /// Unit test for calls to the `/repos/OWNER/REPO/contributors` endpoint -mod mock_error; +mod test_common; const OWNER: &str = "XAMPPRocky"; const REPO: &str = "octocrab"; @@ -31,10 +30,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_create_check_suite() { let check_suite_response: CheckSuite = diff --git a/tests/code_scanning_alert_update_test.rs b/tests/code_scanning_alert_update_test.rs index a7152c04..a46e6c3a 100644 --- a/tests/code_scanning_alert_update_test.rs +++ b/tests/code_scanning_alert_update_test.rs @@ -3,12 +3,11 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::code_scannings::CodeScanningAlert; use octocrab::params::AlertState; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; -mod mock_error; +mod test_common; async fn setup_issue_check_assignee_api(template: ResponseTemplate) -> MockServer { let owner: &str = "org"; @@ -35,10 +34,6 @@ async fn setup_issue_check_assignee_api(template: ResponseTemplate) -> MockServe mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; diff --git a/tests/code_scanning_alerts_list_test.rs b/tests/code_scanning_alerts_list_test.rs index e27c75a8..abc12074 100644 --- a/tests/code_scanning_alerts_list_test.rs +++ b/tests/code_scanning_alerts_list_test.rs @@ -3,11 +3,10 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::code_scannings::CodeScanningAlert; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; -mod mock_error; +mod test_common; const OWNER: &str = "org"; const REPO: &str = "some-repo"; @@ -55,10 +54,6 @@ async fn setup_codescanning_list_api(template: ResponseTemplate, is_org: bool) - mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn check_list_200() { let s = include_str!("resources/codescanning_alerts_multiple.json"); diff --git a/tests/code_scanning_analysis_test.rs b/tests/code_scanning_analysis_test.rs index 581cde19..91df9b43 100644 --- a/tests/code_scanning_analysis_test.rs +++ b/tests/code_scanning_analysis_test.rs @@ -4,11 +4,10 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::code_scannings::CodeScanningAlert; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; -mod mock_error; +mod test_common; async fn setup_issue_check_assignee_api(template: ResponseTemplate) -> MockServer { let owner: &str = "org"; @@ -35,10 +34,6 @@ async fn setup_issue_check_assignee_api(template: ResponseTemplate) -> MockServe mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const ASSIGNEE: &str = "some-user"; diff --git a/tests/commit_associated_check_runs_tests.rs b/tests/commit_associated_check_runs_tests.rs index a182f434..4a25ac33 100644 --- a/tests/commit_associated_check_runs_tests.rs +++ b/tests/commit_associated_check_runs_tests.rs @@ -1,12 +1,12 @@ /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; use octocrab::models::checks::ListCheckRuns; use octocrab::models::CheckRunId; use octocrab::params::repos::Reference; -use octocrab::{Error, Octocrab}; +use octocrab::Error; use serde_json::{json, Value}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +30,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_page_with_check_runs() { let mocked_response: ListCheckRuns = diff --git a/tests/current_user_orgs_test.rs b/tests/current_user_orgs_test.rs index 2d9b5ea4..ff6d45c5 100644 --- a/tests/current_user_orgs_test.rs +++ b/tests/current_user_orgs_test.rs @@ -1,9 +1,9 @@ // Tests for calls to the /user/memberships/orgs API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::orgs::MembershipInvitation, Octocrab, Page}; +use octocrab::{models::orgs::MembershipInvitation, Page}; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +30,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_page_with_invitations() { let membership_invitations: Vec = diff --git a/tests/dependabot_alerts_test.rs b/tests/dependabot_alerts_test.rs index 57847213..c42f36be 100644 --- a/tests/dependabot_alerts_test.rs +++ b/tests/dependabot_alerts_test.rs @@ -3,11 +3,10 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::repos::dependabot::DependabotAlert; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; -mod mock_error; +mod test_common; const OWNER: &str = "org"; const REPO: &str = "some-repo"; @@ -37,10 +36,6 @@ async fn setup_dependabot_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn check_dependabot_alerts_list_200() { let s = include_str!("resources/check_dependabot_alerts.json"); diff --git a/tests/events_test.rs b/tests/events_test.rs index fe1871ca..9a044996 100644 --- a/tests/events_test.rs +++ b/tests/events_test.rs @@ -1,13 +1,12 @@ // Tests for calls to the /repos/{owner}/{repo}/events API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; use octocrab::{ etag::{EntityTag, Etagged}, models::events, - Octocrab, }; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -29,10 +28,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_page_with_events_and_etag() { let event: events::Event = diff --git a/tests/follow_redirect.rs b/tests/follow_redirect.rs index a421399b..da207d6f 100644 --- a/tests/follow_redirect.rs +++ b/tests/follow_redirect.rs @@ -1,9 +1,9 @@ // Tests for calls to the /repos/{owner}/{repo}/stargazers API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::StarGazer, Octocrab, Page}; +use octocrab::{models::StarGazer, Page}; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ http::HeaderValue, matchers::{method, path}, @@ -44,10 +44,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "old-owner"; const REPO: &str = "repo"; diff --git a/tests/generate_release_notes_test.rs b/tests/generate_release_notes_test.rs index ac1350d4..58e8c14e 100644 --- a/tests/generate_release_notes_test.rs +++ b/tests/generate_release_notes_test.rs @@ -1,9 +1,9 @@ /// Tests generating release notes: /// /repos/{owner}/{repo}/releases/generate-notes -mod mock_error; -use mock_error::setup_error_handler; +mod test_common; + use octocrab::models::repos::ReleaseNotes; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -27,10 +27,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_page_with_check_runs() { let owner = "owner"; diff --git a/tests/gists_test.rs b/tests/gists_test.rs index 4102fe97..50f45043 100644 --- a/tests/gists_test.rs +++ b/tests/gists_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -83,10 +82,6 @@ async fn setup_put_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const GIST_ID: &str = "12c55a94bd03166ff33ed0596263b4c6"; #[tokio::test] diff --git a/tests/hooks_delivery_list.rs b/tests/hooks_delivery_list.rs index 08243691..386eb1a4 100644 --- a/tests/hooks_delivery_list.rs +++ b/tests/hooks_delivery_list.rs @@ -1,12 +1,12 @@ /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; use octocrab::models::hooks::Delivery; use octocrab::models::HookId; -use octocrab::{Error, Octocrab}; +use octocrab::Error; use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -35,10 +35,6 @@ async fn setup_get_api(template: ResponseTemplate, number: u64) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_deliveries_for_org_by_id() { let number: u64 = 148681297; diff --git a/tests/issues_check_assignee_test.rs b/tests/issues_check_assignee_test.rs index e4a0d947..6fedabe7 100644 --- a/tests/issues_check_assignee_test.rs +++ b/tests/issues_check_assignee_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -28,10 +27,6 @@ async fn setup_issue_check_assignee_api(template: ResponseTemplate) -> MockServe mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const ASSIGNEE: &str = "some-user"; diff --git a/tests/issues_comments_delete_test.rs b/tests/issues_comments_delete_test.rs index fb315796..7e8530a6 100644 --- a/tests/issues_comments_delete_test.rs +++ b/tests/issues_comments_delete_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +29,6 @@ async fn setup_remove_comment_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const COMMENT_ID: u64 = 123; diff --git a/tests/issues_comments_reactions_delete_test.rs b/tests/issues_comments_reactions_delete_test.rs index 96c1a2ab..46105e68 100644 --- a/tests/issues_comments_reactions_delete_test.rs +++ b/tests/issues_comments_reactions_delete_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -31,10 +30,6 @@ async fn setup_remove_comment_reaction_api(template: ResponseTemplate) -> MockSe mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const COMMENT_ID: u64 = 123; diff --git a/tests/issues_labels_delete_test.rs b/tests/issues_labels_delete_test.rs index d79f56da..17c6861a 100644 --- a/tests/issues_labels_delete_test.rs +++ b/tests/issues_labels_delete_test.rs @@ -1,7 +1,7 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models, Octocrab}; +use octocrab::models; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -53,10 +53,6 @@ async fn setup_delete_label_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const ISSUE_NUMBER: u64 = 123; diff --git a/tests/issues_locking_test.rs b/tests/issues_locking_test.rs index 866638aa..521b24c6 100644 --- a/tests/issues_locking_test.rs +++ b/tests/issues_locking_test.rs @@ -1,7 +1,7 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{params::LockReason, Octocrab}; +use octocrab::params::LockReason; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -53,10 +53,6 @@ async fn setup_issue_unlock_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const ISSUE_NUMBER: u64 = 123; diff --git a/tests/issues_reactions_delete_test.rs b/tests/issues_reactions_delete_test.rs index 0dd3e36f..aab9b1aa 100644 --- a/tests/issues_reactions_delete_test.rs +++ b/tests/issues_reactions_delete_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -31,10 +30,6 @@ async fn setup_remove_reaction_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const ISSUE_NUMBER: u64 = 123; diff --git a/tests/notifications_threads_test.rs b/tests/notifications_threads_test.rs index 020f83bb..7f8e3034 100644 --- a/tests/notifications_threads_test.rs +++ b/tests/notifications_threads_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -28,10 +27,6 @@ async fn setup_delete_thread_sub_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const THREAD_ID: u64 = 123u64; #[tokio::test] diff --git a/tests/org_installations_test.rs b/tests/org_installations_test.rs index 75450edd..f42b6c95 100644 --- a/tests/org_installations_test.rs +++ b/tests/org_installations_test.rs @@ -1,9 +1,8 @@ // Tests for calls to the /orgs/{org}/installation endpoint. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; use octocrab::models::{Author, Installation, InstallationId}; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -25,10 +24,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_org_installation() { let org_installation_response: Installation = diff --git a/tests/org_members_tests.rs b/tests/org_members_tests.rs index efa1c7dc..b4d5f59f 100644 --- a/tests/org_members_tests.rs +++ b/tests/org_members_tests.rs @@ -1,9 +1,9 @@ // Tests for calls to the /repos/{owner}/members API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::Author, Octocrab, Page}; +use octocrab::{models::Author, Page}; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -50,10 +50,6 @@ async fn setup_check_membership_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const ORG: &str = "org"; const USERNAME: &str = "mona"; diff --git a/tests/org_secrets_test.rs b/tests/org_secrets_test.rs index ec7dfa5f..8d4b10f8 100644 --- a/tests/org_secrets_test.rs +++ b/tests/org_secrets_test.rs @@ -1,18 +1,15 @@ // Tests for calls to the /orgs/{ORG}/actions/secrets API. -mod mock_error; +mod test_common; use chrono::DateTime; -use mock_error::setup_error_handler; -use octocrab::{ - models::{ - orgs::secrets::{ - CreateOrganizationSecret, CreateOrganizationSecretResponse, OrganizationSecret, - OrganizationSecrets, Visibility, - }, - PublicKey, +use octocrab::models::{ + orgs::secrets::{ + CreateOrganizationSecret, CreateOrganizationSecretResponse, OrganizationSecret, + OrganizationSecrets, Visibility, }, - Octocrab, + PublicKey, }; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -68,10 +65,6 @@ async fn setup_delete_api(template: ResponseTemplate, secrets_path: &str) -> Moc mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_org_secrets() { let org_secrets: OrganizationSecrets = diff --git a/tests/projects_org_create_project_test.rs b/tests/projects_org_create_project_test.rs index 292b940d..31aec001 100644 --- a/tests/projects_org_create_project_test.rs +++ b/tests/projects_org_create_project_test.rs @@ -1,9 +1,9 @@ // Tests for calls to the /orgs/{org}/projects API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::Project, Octocrab}; +use octocrab::models::Project; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +30,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_create_organization_project() { let org_project: Project = diff --git a/tests/projects_org_list_projects_test.rs b/tests/projects_org_list_projects_test.rs index 32620624..9d834c40 100644 --- a/tests/projects_org_list_projects_test.rs +++ b/tests/projects_org_list_projects_test.rs @@ -1,9 +1,9 @@ // Tests for calls to the /orgs/{org}/projects API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::Project, Octocrab, Page}; +use octocrab::{models::Project, Page}; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -32,10 +32,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_list_org_projects() { let org_project: Vec = diff --git a/tests/projects_project_delete_test.rs b/tests/projects_project_delete_test.rs index 76e5d200..22032afc 100644 --- a/tests/projects_project_delete_test.rs +++ b/tests/projects_project_delete_test.rs @@ -1,9 +1,9 @@ // Tests for calls to the /projects/{project_id} API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::Project, Octocrab}; +use octocrab::models::Project; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +30,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_delete_project_204() { let template = ResponseTemplate::new(204); diff --git a/tests/projects_project_get_test.rs b/tests/projects_project_get_test.rs index ff84075a..f7cf4c01 100644 --- a/tests/projects_project_get_test.rs +++ b/tests/projects_project_get_test.rs @@ -1,9 +1,9 @@ // Tests for calls to the /projects/{project_id} API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::Project, Octocrab}; +use octocrab::models::Project; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +30,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_get_projects_by_its_id() { let org_project: Project = diff --git a/tests/projects_project_update_test.rs b/tests/projects_project_update_test.rs index 0660deda..60b61bce 100644 --- a/tests/projects_project_update_test.rs +++ b/tests/projects_project_update_test.rs @@ -1,9 +1,9 @@ // Tests for calls to the /projects/{project_id} API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::Project, Octocrab}; +use octocrab::models::Project; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +30,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_update_project_name() { let org_project: Project = diff --git a/tests/projects_repo_create_project_test.rs b/tests/projects_repo_create_project_test.rs index 9edb7856..60f5281c 100644 --- a/tests/projects_repo_create_project_test.rs +++ b/tests/projects_repo_create_project_test.rs @@ -1,9 +1,9 @@ // Tests for calls to the /repos/{owner}/{repo}/projects API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::Project, Octocrab}; +use octocrab::models::Project; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -31,10 +31,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_create_repo_project() { let repo_project: Project = diff --git a/tests/projects_repo_list_projects_test.rs b/tests/projects_repo_list_projects_test.rs index c1663836..d7ed9881 100644 --- a/tests/projects_repo_list_projects_test.rs +++ b/tests/projects_repo_list_projects_test.rs @@ -1,9 +1,9 @@ // Tests for calls to the /repos/{owner}/{repo}/projects API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::Project, Octocrab, Page}; +use octocrab::{models::Project, Page}; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -34,10 +34,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_list_repo_projects() { let repo_project: Vec = diff --git a/tests/projects_user_create_project_test.rs b/tests/projects_user_create_project_test.rs index 2160f2d3..966bf92b 100644 --- a/tests/projects_user_create_project_test.rs +++ b/tests/projects_user_create_project_test.rs @@ -1,9 +1,9 @@ // Tests for calls to the /projects/{project_id} API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::Project, Octocrab}; +use octocrab::models::Project; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -26,10 +26,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_create_user_project() { let org_project: Project = diff --git a/tests/projects_user_list_projects_test.rs b/tests/projects_user_list_projects_test.rs index ad973a51..7d6b42ed 100644 --- a/tests/projects_user_list_projects_test.rs +++ b/tests/projects_user_list_projects_test.rs @@ -1,9 +1,9 @@ // Tests for calls to the /users/{username}/projects API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::Project, Octocrab, Page}; +use octocrab::{models::Project, Page}; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -32,10 +32,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_list_user_projects() { let org_project: Vec = diff --git a/tests/pull_request_commits_test.rs b/tests/pull_request_commits_test.rs index 5b6e13ad..74186650 100644 --- a/tests/pull_request_commits_test.rs +++ b/tests/pull_request_commits_test.rs @@ -3,12 +3,11 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::repos::RepoCommit; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; /// Unit test for calls to the `/repos/OWNER/REPO/contributors` endpoint -mod mock_error; +mod test_common; const OWNER: &str = "XAMPPRocky"; const REPO: &str = "octocrab"; @@ -32,10 +31,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_pull_request_commits() { let pull_request_commits_response: Vec = diff --git a/tests/pull_request_review_comment_test.rs b/tests/pull_request_review_comment_test.rs index c062b8f1..7e539bdd 100644 --- a/tests/pull_request_review_comment_test.rs +++ b/tests/pull_request_review_comment_test.rs @@ -1,23 +1,19 @@ +use test_common::setup_octocrab; use wiremock::matchers::{method, path}; use wiremock::{Mock, MockServer, ResponseTemplate}; use octocrab::models::pulls::Comment; use octocrab::models::CommentId; -use octocrab::Octocrab; -use crate::mock_error::setup_error_handler; +use crate::test_common::setup_error_handler; /// Unit test for calls to the `/repos/{owner}/{repo}/pulls/comments/{comment_id}` endpoint -mod mock_error; +mod test_common; const OWNER: &str = "XAMPPRocky"; const REPO: &str = "octocrab"; const COMMENT_ID: u64 = 42; -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_work_with_review_comment() { let review_comment_response: Comment = diff --git a/tests/pull_request_review_operations_test.rs b/tests/pull_request_review_operations_test.rs index d55a2a40..b73d8130 100644 --- a/tests/pull_request_review_operations_test.rs +++ b/tests/pull_request_review_operations_test.rs @@ -1,13 +1,13 @@ +use test_common::setup_octocrab; use wiremock::matchers::{method, path}; use wiremock::{Mock, MockServer, ResponseTemplate}; use octocrab::models::pulls::{Review, ReviewAction, ReviewComment}; -use octocrab::Octocrab; -use crate::mock_error::setup_error_handler; +use crate::test_common::setup_error_handler; /// Unit test for calls to the `/repos/{owner}/{repo}/pulls/{pull_number}/reviews/{review_id}` endpoint -mod mock_error; +mod test_common; const OWNER: &str = "XAMPPRocky"; const REPO: &str = "octocrab"; @@ -15,10 +15,6 @@ const PULL_NUMBER: u64 = 42; const REVIEW_ID: u64 = 42; const COMMENT_ID: u64 = 42; -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_work_with_specific_review() { let review_ops_response: Review = diff --git a/tests/repo_contributors_test.rs b/tests/repo_contributors_test.rs index ced3536c..255f1600 100644 --- a/tests/repo_contributors_test.rs +++ b/tests/repo_contributors_test.rs @@ -3,12 +3,11 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::{Author, Contributor}; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; /// Unit test for calls to the `/repos/OWNER/REPO/contributors` endpoint -mod mock_error; +mod test_common; const OWNER: &str = "XAMPPRocky"; const REPO: &str = "octocrab"; @@ -29,10 +28,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_repo_contributors() { let repo_contributors_response: Vec = diff --git a/tests/repo_delete_ref_test.rs b/tests/repo_delete_ref_test.rs index 870bd8b1..7459f79a 100644 --- a/tests/repo_delete_ref_test.rs +++ b/tests/repo_delete_ref_test.rs @@ -1,7 +1,7 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{params::repos::Reference, Octocrab}; +use octocrab::params::repos::Reference; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -28,10 +28,6 @@ async fn setup_delete_ref_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const BRANCH: &str = "foo"; diff --git a/tests/repo_secrets_test.rs b/tests/repo_secrets_test.rs index a51c381d..41fc0035 100644 --- a/tests/repo_secrets_test.rs +++ b/tests/repo_secrets_test.rs @@ -1,18 +1,14 @@ // Tests for calls to the /repos/{owner}/{repo}/actions/secrets API. -mod mock_error; +mod test_common; use chrono::DateTime; -use mock_error::setup_error_handler; -use octocrab::{ - models::{ - repos::secrets::{ - CreateRepositorySecret, CreateRepositorySecretResponse, RepositorySecret, - RepositorySecrets, - }, - PublicKey, +use octocrab::models::{ + repos::secrets::{ + CreateRepositorySecret, CreateRepositorySecretResponse, RepositorySecret, RepositorySecrets, }, - Octocrab, + PublicKey, }; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -75,10 +71,6 @@ async fn setup_delete_api(template: ResponseTemplate, secrets_path: &str) -> Moc mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_repo_secrets() { let repo_secrets: RepositorySecrets = diff --git a/tests/repos_commit_test.rs b/tests/repos_commit_test.rs index aa240436..c746db26 100644 --- a/tests/repos_commit_test.rs +++ b/tests/repos_commit_test.rs @@ -1,7 +1,7 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::repos::RepoCommit, Octocrab}; +use octocrab::models::repos::RepoCommit; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -27,10 +27,6 @@ async fn setup_repos_commits_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; diff --git a/tests/repos_delete_test.rs b/tests/repos_delete_test.rs index 64076ac4..9a3383cc 100644 --- a/tests/repos_delete_test.rs +++ b/tests/repos_delete_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -27,10 +26,6 @@ async fn setup_delete_repo_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; diff --git a/tests/repos_events_test.rs b/tests/repos_events_test.rs index e9ebceeb..0c70a56d 100644 --- a/tests/repos_events_test.rs +++ b/tests/repos_events_test.rs @@ -1,13 +1,12 @@ // Tests for calls to the /repos/{owner}/{repo}/events API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; use octocrab::{ etag::{EntityTag, Etagged}, models::events, - Octocrab, }; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -35,10 +34,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "owner"; const REPO: &str = "repo"; diff --git a/tests/repos_is_collaborator_test.rs b/tests/repos_is_collaborator_test.rs index 2e5d0352..c64e88cf 100644 --- a/tests/repos_is_collaborator_test.rs +++ b/tests/repos_is_collaborator_test.rs @@ -1,7 +1,6 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -30,10 +29,6 @@ async fn setup_repo_collaborator_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const USERNAME: &str = "someusername"; diff --git a/tests/repos_merges_test.rs b/tests/repos_merges_test.rs index 1b08df49..870363af 100644 --- a/tests/repos_merges_test.rs +++ b/tests/repos_merges_test.rs @@ -1,7 +1,7 @@ -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::repos::MergeCommit, Octocrab}; +use octocrab::models::repos::MergeCommit; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -27,10 +27,6 @@ async fn setup_repos_merges_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "org"; const REPO: &str = "some-repo"; const BRANCH_HEAD: &str = "head"; diff --git a/tests/repos_releases_get_by_id.rs b/tests/repos_releases_get_by_id.rs index befda92a..1f53baca 100644 --- a/tests/repos_releases_get_by_id.rs +++ b/tests/repos_releases_get_by_id.rs @@ -1,12 +1,12 @@ /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; use octocrab::models::repos::Release; use octocrab::models::ReleaseId; -use octocrab::{Error, Octocrab}; +use octocrab::Error; use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -36,10 +36,6 @@ async fn setup_get_api(template: ResponseTemplate, number: u64) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_release_for_repository_by_id() { let number: u64 = 148681297; diff --git a/tests/repos_releases_get_by_tag.rs b/tests/repos_releases_get_by_tag.rs index 66ba5be7..c25a65db 100644 --- a/tests/repos_releases_get_by_tag.rs +++ b/tests/repos_releases_get_by_tag.rs @@ -1,12 +1,12 @@ /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; use octocrab::models::repos::Release; use octocrab::models::ReleaseId; -use octocrab::{Error, Octocrab}; +use octocrab::Error; use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -36,10 +36,6 @@ async fn setup_get_api(template: ResponseTemplate, tag: &str) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_release_for_repository_by_tag() { let tag: String = "v0.37.0".to_string(); diff --git a/tests/repos_releases_get_latest.rs b/tests/repos_releases_get_latest.rs index d276cca0..fb40af17 100644 --- a/tests/repos_releases_get_latest.rs +++ b/tests/repos_releases_get_latest.rs @@ -1,12 +1,12 @@ /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; use octocrab::models::repos::Release; use octocrab::models::ReleaseId; -use octocrab::{Error, Octocrab}; +use octocrab::Error; use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -36,10 +36,6 @@ async fn setup_get_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_latest_release_for_repository() { let number: u64 = 150372594; diff --git a/tests/repos_releases_list_test.rs b/tests/repos_releases_list_test.rs index ceed7aa2..8d612696 100644 --- a/tests/repos_releases_list_test.rs +++ b/tests/repos_releases_list_test.rs @@ -1,12 +1,12 @@ /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; use octocrab::models::repos::Release; use octocrab::models::ReleaseId; -use octocrab::{Error, Octocrab}; +use octocrab::Error; use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -36,10 +36,6 @@ async fn setup_get_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_releases_for_repository() { let mocked_response: Vec = diff --git a/tests/repos_stargazers_tests.rs b/tests/repos_stargazers_tests.rs index 4cc7bb11..049916b8 100644 --- a/tests/repos_stargazers_tests.rs +++ b/tests/repos_stargazers_tests.rs @@ -1,9 +1,9 @@ // Tests for calls to the /repos/{owner}/{repo}/stargazers API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::StarGazer, Octocrab, Page}; +use octocrab::{models::StarGazer, Page}; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -31,10 +31,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const OWNER: &str = "owner"; const REPO: &str = "repo"; diff --git a/tests/secrets_alerts_test.rs b/tests/secrets_alerts_test.rs index 5b793e74..3c38c040 100644 --- a/tests/secrets_alerts_test.rs +++ b/tests/secrets_alerts_test.rs @@ -1,14 +1,13 @@ +mod test_common; + use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::repos::secret_scanning_alert::SecretScanningAlert; use octocrab::models::repos::secret_scanning_alert::SecretsScanningAlertLocation; -use octocrab::Octocrab; - -mod mock_error; +use test_common::{setup_error_handler, setup_octocrab}; const OWNER: &str = "org"; const REPO: &str = "some-repo"; @@ -64,10 +63,6 @@ async fn setup_secrets_locations_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn check_secrets_alert_list_200() { let s: &str = include_str!("resources/check_secrets_alerts.json"); diff --git a/tests/team_delete_test.rs b/tests/team_delete_test.rs index ad08cf1a..068efc71 100644 --- a/tests/team_delete_test.rs +++ b/tests/team_delete_test.rs @@ -1,9 +1,8 @@ // Tests for calls to the /orgs/{org}/teams/{team}/members API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -33,10 +32,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const ORG: &str = "org"; const TEAM: &str = "team-name"; diff --git a/tests/team_invitations_tests.rs b/tests/team_invitations_tests.rs index 4b30b5a5..a8b0aa04 100644 --- a/tests/team_invitations_tests.rs +++ b/tests/team_invitations_tests.rs @@ -1,9 +1,9 @@ // Tests for calls to the /orgs/{org}/teams/{team}/invitations API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::teams::TeamInvitation, Octocrab, Page}; +use octocrab::{models::teams::TeamInvitation, Page}; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -32,10 +32,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const ORG: &str = "org"; const TEAM: &str = "team-name"; diff --git a/tests/team_members_tests.rs b/tests/team_members_tests.rs index 4bb810c8..d92dd4ae 100644 --- a/tests/team_members_tests.rs +++ b/tests/team_members_tests.rs @@ -1,9 +1,9 @@ // Tests for calls to the /orgs/{org}/teams/{team}/members API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::{models::Author, Octocrab, Page}; +use octocrab::{models::Author, Page}; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -32,10 +32,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const ORG: &str = "org"; const TEAM: &str = "team-name"; diff --git a/tests/team_repos_tests.rs b/tests/team_repos_tests.rs index dacf4e7b..7101098d 100644 --- a/tests/team_repos_tests.rs +++ b/tests/team_repos_tests.rs @@ -1,9 +1,8 @@ // Tests for calls to the /orgs/{org}/teams/{team}/members API. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; -use octocrab::Octocrab; use serde::{Deserialize, Serialize}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -39,10 +38,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - const ORG: &str = "org"; const TEAM: &str = "team-name"; const REPO: &str = "testing"; diff --git a/tests/mock_error.rs b/tests/test_common.rs similarity index 74% rename from tests/mock_error.rs rename to tests/test_common.rs index a39fb4e8..c029d371 100644 --- a/tests/mock_error.rs +++ b/tests/test_common.rs @@ -1,3 +1,4 @@ +use octocrab::Octocrab; use serde_json::json; use wiremock::{ matchers::{method, path_regex}, @@ -20,3 +21,13 @@ pub async fn setup_error_handler(mock_server: &MockServer, message: &str) { .mount(mock_server) .await; } + +// Sets up an Octocrab client with the given URI. +#[allow(dead_code)] +pub fn setup_octocrab(uri: &str) -> octocrab::Octocrab { + Octocrab::builder() + .base_uri(uri) + .unwrap() + .build() + .expect("Could not create octocrab client") +} diff --git a/tests/user_blocks_tests.rs b/tests/user_blocks_tests.rs index 893e0300..78c2747b 100644 --- a/tests/user_blocks_tests.rs +++ b/tests/user_blocks_tests.rs @@ -4,12 +4,11 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::SimpleUser; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; #[derive(Serialize, Deserialize)] struct FakePage { @@ -38,10 +37,6 @@ async fn setup_blocks_mock( mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_list_of_blocked_by_user() { let mocked_response: Vec = diff --git a/tests/user_deserialize_test.rs b/tests/user_deserialize_test.rs index 41839ee6..57d59063 100644 --- a/tests/user_deserialize_test.rs +++ b/tests/user_deserialize_test.rs @@ -1,17 +1,12 @@ /// Tests API calls related to check runs of a specific commit. -mod mock_error; -use mock_error::setup_error_handler; +mod test_common; use octocrab::models::UserProfile; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, }; -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - async fn setup_api(template: ResponseTemplate) -> MockServer { let mock_server = MockServer::start().await; diff --git a/tests/user_emails_tests.rs b/tests/user_emails_tests.rs index baa78bca..be5869c6 100644 --- a/tests/user_emails_tests.rs +++ b/tests/user_emails_tests.rs @@ -4,13 +4,12 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::UserEmailInfo; use octocrab::params::users::emails::EmailVisibilityState; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; async fn setup_emails_mock( http_method: &str, @@ -32,10 +31,6 @@ async fn setup_emails_mock( mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_respond_to_primary_email_visibility() { let mocked_response: Vec = diff --git a/tests/user_git_ssh_keys_tests.rs b/tests/user_git_ssh_keys_tests.rs index ef364cf4..ad355548 100644 --- a/tests/user_git_ssh_keys_tests.rs +++ b/tests/user_git_ssh_keys_tests.rs @@ -4,12 +4,11 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::GitSshKey; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; const GIT_SSH_KEY_ID: u64 = 42; @@ -33,10 +32,6 @@ async fn setup_git_ssh_keys_mock( mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_respond_to_get_git_ssh_key() { let mocked_response: GitSshKey = diff --git a/tests/user_gpg_keys_tests.rs b/tests/user_gpg_keys_tests.rs index 2679ed6a..4af30d3e 100644 --- a/tests/user_gpg_keys_tests.rs +++ b/tests/user_gpg_keys_tests.rs @@ -4,12 +4,11 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::GpgKey; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; const GPG_KEY_ID: u64 = 42; @@ -33,10 +32,6 @@ async fn setup_gpg_keys_mock( mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_respond_to_get_gpg_key() { let mocked_response: GpgKey = diff --git a/tests/user_repositories_tests.rs b/tests/user_repositories_tests.rs index 09162347..ae4d1201 100644 --- a/tests/user_repositories_tests.rs +++ b/tests/user_repositories_tests.rs @@ -1,11 +1,11 @@ /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; -use mock_error::setup_error_handler; use octocrab::models::{Repository, RepositoryId}; -use octocrab::{Error, Octocrab}; +use octocrab::Error; use serde::{Deserialize, Serialize}; use serde_json::{json, Value}; +use test_common::{setup_error_handler, setup_octocrab}; use wiremock::{ matchers::{method, path}, Mock, MockServer, ResponseTemplate, @@ -34,10 +34,6 @@ async fn setup_api(template: ResponseTemplate) -> MockServer { mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_return_repositories_for_user() { let mocked_response: Vec = diff --git a/tests/user_social_accounts_tests.rs b/tests/user_social_accounts_tests.rs index 95f5a26c..9159aab2 100644 --- a/tests/user_social_accounts_tests.rs +++ b/tests/user_social_accounts_tests.rs @@ -4,12 +4,11 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::SocialAccount; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; async fn setup_social_accounts_mock( http_method: &str, @@ -31,10 +30,6 @@ async fn setup_social_accounts_mock( mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_respond_to_social_accounts_list() { let mocked_response: Vec = diff --git a/tests/user_ssh_signing_keys_tests.rs b/tests/user_ssh_signing_keys_tests.rs index 504e0de1..2e5d14d1 100644 --- a/tests/user_ssh_signing_keys_tests.rs +++ b/tests/user_ssh_signing_keys_tests.rs @@ -4,12 +4,11 @@ use wiremock::{ Mock, MockServer, ResponseTemplate, }; -use mock_error::setup_error_handler; use octocrab::models::SshSigningKey; -use octocrab::Octocrab; +use test_common::{setup_error_handler, setup_octocrab}; /// Tests API calls related to check runs of a specific commit. -mod mock_error; +mod test_common; const SSH_SIGNING_KEY_ID: u64 = 42; @@ -33,10 +32,6 @@ async fn setup_ssh_signing_keys_mock( mock_server } -fn setup_octocrab(uri: &str) -> Octocrab { - Octocrab::builder().base_uri(uri).unwrap().build().unwrap() -} - #[tokio::test] async fn should_respond_to_get_ssh_signing_key() { let mocked_response: SshSigningKey =