docs: rewrite tests

Author: leo-210

test/examples/city_info_test.gleam

@@ -1,9 +1,7 @@
-import gleam/fetch
 import gleam/http/request
 import gleam/httpc
 import gleam/int
 import gleam/io
-import gleam/javascript/promise
 import gleam/option
 import sunny
 import sunny/api/geocoding
@@ -13,7 +11,7 @@ pub fn city_info_test() {
   // API access.
   let sunny = sunny.new()
 
-  let req =
+  let assert Ok(location) =
     sunny
     // If the location your searching for isn't the first result, try 
     // `geocoding.get_locations`
@@ -22,9 +20,8 @@ pub fn city_info_test() {
       // Changing the language can impact the search results.
       |> geocoding.set_language(geocoding.French),
     )
-
-  use body <- send(req)
-  let assert Ok(location) = geocoding.get_first_result(body)
+    |> send
+    |> geocoding.get_first_result
 
   let assert option.Some(population) = location.population
 
@@ -37,21 +34,8 @@ pub fn city_info_test() {
   )
 }
 
-@target(erlang)
-fn send(req: request.Request(String), callback: fn(String) -> Nil) -> Nil {
+fn send(req: request.Request(String)) -> String {
   let assert Ok(res) = httpc.send(req)
 
-  callback(res.body)
-}
-
-@target(javascript)
-fn send(req: request.Request(String), callback: fn(String) -> Nil) -> Nil {
-  {
-    use resp <- promise.try_await(fetch.send(req))
-    use resp <- promise.try_await(fetch.read_text_body(resp))
-
-    callback(resp.body)
-    promise.resolve(Ok(Nil))
-  }
-  Nil
+  res.body
 }

test/examples/current_temperature_test.gleam

@@ -1,9 +1,7 @@
 import gleam/dict
-import gleam/fetch
 import gleam/http/request
 import gleam/httpc
 import gleam/io
-import gleam/javascript/promise
 import gleam/option
 import sunny
 import sunny/api/forecast
@@ -24,17 +22,16 @@ pub fn current_temperature_test() {
   // convert it to a position.
   let position = position.Position(43.0, 5.0)
 
-  let req =
+  let assert Ok(forecast_result) =
     sunny
     |> forecast.get_request(
       forecast.params(position)
       // All available variables are listed in the `sunny/api/forecast/instant` module.
       // Daily variables are in `sunny/api/forecast/daily`.
       |> forecast.set_current([instant.Temperature2m]),
     )
-
-  use body <- send(req)
-  let assert Ok(forecast_result) = forecast.get_result(body)
+    |> send
+    |> forecast.get_result
 
   let assert option.Some(data.CurrentData(data: data, ..)) =
     forecast_result.current
@@ -48,21 +45,8 @@ pub fn current_temperature_test() {
   )
 }
 
-@target(erlang)
-fn send(req: request.Request(String), callback: fn(String) -> Nil) -> Nil {
+fn send(req: request.Request(String)) -> String {
   let assert Ok(res) = httpc.send(req)
 
-  callback(res.body)
-}
-
-@target(javascript)
-fn send(req: request.Request(String), callback: fn(String) -> Nil) -> Nil {
-  {
-    use resp <- promise.try_await(fetch.send(req))
-    use resp <- promise.try_await(fetch.read_text_body(resp))
-
-    callback(resp.body)
-    promise.resolve(Ok(Nil))
-  }
-  Nil
+  res.body
 }

test/examples/hourly_forecast.gleam

@@ -1,10 +1,8 @@
 import birl
-import gleam/fetch
 import gleam/float
 import gleam/http/request
 import gleam/httpc
 import gleam/io
-import gleam/javascript/promise
 import gleam/list
 import sunny
 import sunny/api/forecast
@@ -25,7 +23,7 @@ pub fn hourly_forecast_test() {
   // convert it to a position.
   let position = position.Position(43.0, 5.0)
 
-  let req =
+  let assert Ok(forecast_result) =
     sunny
     |> forecast.get_request(
       forecast.params(position)
@@ -35,9 +33,8 @@ pub fn hourly_forecast_test() {
       |> forecast.set_hourly([instant.WeatherCode])
       |> forecast.set_forecast_days(1),
     )
-
-  use body <- send(req)
-  let assert Ok(forecast_result) = forecast.get_result(body)
+    |> send
+    |> forecast.get_result
 
   let assert Ok(hourly_weather) =
     forecast_result.hourly
@@ -55,21 +52,8 @@ pub fn hourly_forecast_test() {
   })
 }
 
-@target(erlang)
-fn send(req: request.Request(String), callback: fn(String) -> Nil) -> Nil {
+fn send(req: request.Request(String)) -> String {
   let assert Ok(res) = httpc.send(req)
 
-  callback(res.body)
-}
-
-@target(javascript)
-fn send(req: request.Request(String), callback: fn(String) -> Nil) -> Nil {
-  {
-    use resp <- promise.try_await(fetch.send(req))
-    use resp <- promise.try_await(fetch.read_text_body(resp))
-
-    callback(resp.body)
-    promise.resolve(Ok(Nil))
-  }
-  Nil
+  res.body
 }

test/forecast_test.gleam

@@ -1,8 +1,6 @@
 import gleam/dict
-import gleam/fetch
 import gleam/http/request
 import gleam/httpc
-import gleam/javascript/promise
 import gleam/list
 import gleam/option
 import gleeunit/should
@@ -17,15 +15,15 @@ const coords = position.Position(43.0, 5.0)
 pub fn hourly_all_test() {
   let sunny = sunny.new()
 
-  let req =
+  let forecast_result =
     sunny
     |> forecast.get_request(
       forecast.params(coords)
       |> forecast.set_all_hourly([]),
     )
-
-  use body <- send(req)
-  let assert Ok(forecast_result) = forecast.get_result(body)
+    |> send
+    |> forecast.get_result
+    |> should.be_ok
 
   use var <- list.each(instant.all)
   let l =
@@ -40,15 +38,15 @@ pub fn hourly_all_test() {
 pub fn daily_all_test() {
   let sunny = sunny.new()
 
-  let req =
+  let forecast_result =
     sunny
     |> forecast.get_request(
       forecast.params(coords)
       |> forecast.set_all_daily([]),
     )
-
-  use body <- send(req)
-  let assert Ok(forecast_result) = forecast.get_result(body)
+    |> send
+    |> forecast.get_result
+    |> should.be_ok
 
   use var <- list.each(daily.all)
   let l =
@@ -63,14 +61,14 @@ pub fn daily_all_test() {
 pub fn minutely_all_test() {
   let sunny = sunny.new()
 
-  let req =
+  let forecast_result =
     sunny
     |> forecast.get_request(
       forecast.params(coords) |> forecast.set_all_minutely([]),
     )
-
-  use body <- send(req)
-  let assert Ok(forecast_result) = forecast.get_result(body)
+    |> send
+    |> forecast.get_result
+    |> should.be_ok
 
   use var <- list.each(instant.all)
   let l =
@@ -85,14 +83,14 @@ pub fn minutely_all_test() {
 pub fn current_all_test() {
   let sunny = sunny.new()
 
-  let req =
+  let forecast_result =
     sunny
     |> forecast.get_request(
       forecast.params(coords) |> forecast.set_all_current([]),
     )
-
-  use body <- send(req)
-  let assert Ok(forecast_result) = forecast.get_result(body)
+    |> send
+    |> forecast.get_result
+    |> should.be_ok
 
   let assert option.Some(current) = forecast_result.current
 
@@ -105,12 +103,12 @@ pub fn current_all_test() {
 pub fn none_test() {
   let sunny = sunny.new()
 
-  let req =
+  let forecast_result =
     sunny
     |> forecast.get_request(forecast.params(coords))
-
-  use body <- send(req)
-  let assert Ok(forecast_result) = forecast.get_result(body)
+    |> send
+    |> forecast.get_result
+    |> should.be_ok
 
   forecast_result.hourly.time
   |> list.is_empty
@@ -144,21 +142,8 @@ pub fn none_test() {
   |> should.be_error
 }
 
-@target(erlang)
-fn send(req: request.Request(String), callback: fn(String) -> Nil) -> Nil {
+fn send(req: request.Request(String)) -> String {
   let assert Ok(res) = httpc.send(req)
 
-  callback(res.body)
-}
-
-@target(javascript)
-fn send(req: request.Request(String), callback: fn(String) -> Nil) -> Nil {
-  {
-    use resp <- promise.try_await(fetch.send(req))
-    use resp <- promise.try_await(fetch.read_text_body(resp))
-
-    callback(resp.body)
-    promise.resolve(Ok(Nil))
-  }
-  Nil
+  res.body
 }