Skip to content

Commit

Permalink
chore: use non deprecated fields
Browse files Browse the repository at this point in the history
Signed-off-by: Jérémie Drouet <jeremie.drouet@datadoghq.com>
  • Loading branch information
jdrouet committed Aug 22, 2023
1 parent ce33ee9 commit 1d58ee9
Show file tree
Hide file tree
Showing 33 changed files with 527 additions and 110 deletions.
24 changes: 20 additions & 4 deletions src/certification/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ mod tests {
#[tokio::test]
async fn tv_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", super::TV_PATH)
Expand All @@ -74,7 +78,11 @@ mod tests {
#[tokio::test]
async fn movie_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", super::MOVIE_PATH)
Expand All @@ -91,7 +99,11 @@ mod tests {
#[tokio::test]
async fn invalid_api_key() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();
let cmd = CertificationList::tv();

let _m = server
Expand All @@ -110,7 +122,11 @@ mod tests {
#[tokio::test]
async fn resource_not_found() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();
let cmd = CertificationList::tv();

let _m = server
Expand Down
40 changes: 32 additions & 8 deletions src/changes/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ mod tests {
#[tokio::test]
async fn tv_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();
let cmd = ChangeList::tv();

let _m = server
Expand All @@ -118,7 +122,11 @@ mod tests {
#[tokio::test]
async fn tv_works_with_args() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", super::TV_PATH)
Expand All @@ -136,8 +144,8 @@ mod tests {
.await;

let result = ChangeList::tv()
.with_start_date(Some(NaiveDate::from_ymd(2015, 3, 14)))
.with_end_date(Some(NaiveDate::from_ymd(2019, 3, 14)))
.with_start_date(Some(NaiveDate::from_ymd_opt(2015, 3, 14).unwrap()))
.with_end_date(Some(NaiveDate::from_ymd_opt(2019, 3, 14).unwrap()))
.with_page(Some(2))
.execute(&client)
.await
Expand All @@ -148,7 +156,11 @@ mod tests {
#[tokio::test]
async fn movie_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();
let cmd = ChangeList::movie();

let _m = server
Expand All @@ -166,7 +178,11 @@ mod tests {
#[tokio::test]
async fn person_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();
let cmd = ChangeList::person();

let _m = server
Expand All @@ -184,7 +200,11 @@ mod tests {
#[tokio::test]
async fn invalid_api_key() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();
let cmd = ChangeList::tv();

let _m = server
Expand All @@ -203,7 +223,11 @@ mod tests {
#[tokio::test]
async fn resource_not_found() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();
let cmd = ChangeList::tv();

let _m = server
Expand Down
18 changes: 15 additions & 3 deletions src/company/alternative_names.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ mod tests {
#[tokio::test]
async fn it_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/company/1/alternative_names")
Expand All @@ -90,7 +94,11 @@ mod tests {
#[tokio::test]
async fn invalid_api_key() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/company/1/alternative_names")
Expand All @@ -112,7 +120,11 @@ mod tests {
#[tokio::test]
async fn resource_not_found() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/company/1/alternative_names")
Expand Down
18 changes: 15 additions & 3 deletions src/company/details.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ mod tests {
#[tokio::test]
async fn it_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/company/1")
Expand All @@ -70,7 +74,11 @@ mod tests {
#[tokio::test]
async fn invalid_api_key() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/company/1")
Expand All @@ -89,7 +97,11 @@ mod tests {
#[tokio::test]
async fn resource_not_found() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/company/1")
Expand Down
18 changes: 15 additions & 3 deletions src/company/images.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,11 @@ mod tests {
#[tokio::test]
async fn it_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/company/1/images")
Expand All @@ -89,7 +93,11 @@ mod tests {
#[tokio::test]
async fn invalid_api_key() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/company/1/images")
Expand All @@ -108,7 +116,11 @@ mod tests {
#[tokio::test]
async fn resource_not_found() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/company/1/images")
Expand Down
24 changes: 20 additions & 4 deletions src/genre/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,11 @@ mod tests {
#[tokio::test]
async fn movie_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();
let cmd = GenreList::movie();

let _m = server
Expand All @@ -86,7 +90,11 @@ mod tests {
#[tokio::test]
async fn tv_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();
let cmd = GenreList::tv();

let _m = server
Expand All @@ -104,7 +112,11 @@ mod tests {
#[tokio::test]
async fn invalid_api_key() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();
let cmd = GenreList::tv();

let _m = server
Expand All @@ -123,7 +135,11 @@ mod tests {
#[tokio::test]
async fn resource_not_found() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();
let cmd = GenreList::tv();

let _m = server
Expand Down
18 changes: 15 additions & 3 deletions src/movie/alternative_titles.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,11 @@ mod tests {
#[tokio::test]
async fn it_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/movie/3/alternative_titles")
Expand All @@ -101,7 +105,11 @@ mod tests {
#[tokio::test]
async fn invalid_api_key() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/movie/1/alternative_titles")
Expand All @@ -123,7 +131,11 @@ mod tests {
#[tokio::test]
async fn resource_not_found() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/movie/1/alternative_titles")
Expand Down
22 changes: 17 additions & 5 deletions src/movie/changes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,11 @@ mod tests {
#[tokio::test]
async fn it_works() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/movie/3/changes")
Expand All @@ -121,7 +125,11 @@ mod tests {
#[tokio::test]
async fn invalid_api_key() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/movie/1/changes")
Expand All @@ -140,7 +148,11 @@ mod tests {
#[tokio::test]
async fn resource_not_found() {
let mut server = mockito::Server::new_async().await;
let client = Client::new("secret".into()).with_base_url(server.url());
let client = Client::builder()
.with_api_key("secret".into())
.with_base_url(server.url())
.build()
.unwrap();

let _m = server
.mock("GET", "/movie/1/changes")
Expand Down Expand Up @@ -169,8 +181,8 @@ mod integration_tests {
let client = Client::new(secret);

let result = MovieChanges::new(1)
.with_start_date(Some(chrono::NaiveDate::from_ymd(2015, 3, 14)))
.with_end_date(Some(chrono::NaiveDate::from_ymd(2019, 3, 14)))
.with_start_date(Some(chrono::NaiveDate::from_ymd_opt(2015, 3, 14).unwrap()))
.with_end_date(Some(chrono::NaiveDate::from_ymd_opt(2019, 3, 14).unwrap()))
.execute(&client)
.await
.unwrap();
Expand Down
Loading

0 comments on commit 1d58ee9

Please sign in to comment.