Merge branch 'master' into smoove-gbfs-version

apps/transport/lib/opendatasoft/url_extractor.ex

@@ -124,15 +124,6 @@ defmodule Opendatasoft.UrlExtractor do
 
   @doc """
   Get a download from a CSVs if it exists
-
-  ## Examples
-      iex> [{"name,file\\ntoulouse,http", %{"id" => "bob"}}, {"stop,lon,lat\\n1,48.8,2.3", %{"id" => "bobette"}}]
-      ...> |> UrlExtractor.get_resources_with_url_from_csv()
-      {:ok, [%{"url" => "http", "title" => "http", "id" => "bob"}]}
-
-    iex> UrlExtractor.get_resources_with_url_from_csv([{"stop,lon,lat\\n1,48.8,2.3", %{"id" => "bob"}}])
-    {:error, "No url found"}
-
   """
   @spec get_resources_with_url_from_csv([{binary, map()}]) ::
           {:ok, [map()]} | {:error, binary()}
@@ -277,7 +268,9 @@ defmodule Opendatasoft.UrlExtractor do
 
   @spec get_filename(binary()) :: binary()
   defp get_filename(url) do
-    with {:ok, %HTTPoison.Response{headers: headers}} <- HTTPoison.head(url),
+    httpoison_impl = Transport.Shared.Wrapper.HTTPoison.impl()
+
+    with {:ok, %HTTPoison.Response{headers: headers}} <- httpoison_impl.head(url),
          {_, content} <- Enum.find(headers, fn {h, _} -> h == "Content-Disposition" end),
          %{"filename" => filename} <- Regex.named_captures(~r/filename="(?<filename>.*)"/, content) do
       filename

apps/transport/test/transport/import_data_service_test.exs

@@ -6,6 +6,7 @@ defmodule Transport.ImportDataServiceTest do
 
   setup do
     Mox.stub_with(Datagouvfr.Client.CommunityResources.Mock, Datagouvfr.Client.StubCommunityResources)
+    Mox.stub_with(Transport.HTTPoison.Mock, HTTPoison)
     :ok
   end
 

apps/transport/test/transport/url_extractor_doc_test.exs

@@ -1,5 +1,23 @@
 defmodule Transport.UrlExtractorDocTest do
   use ExUnit.Case, async: true
   alias Opendatasoft.UrlExtractor
+  import Mox
   doctest UrlExtractor
+
+  test "get urls in CSV file" do
+    Transport.HTTPoison.Mock |> expect(:head, fn _url -> %HTTPoison.Response{} end)
+
+    res =
+      [{"name,file\ntoulouse,http", %{"id" => "bob"}}, {"stop,lon,lat\n1,48.8,2.3", %{"id" => "bobette"}}]
+      |> UrlExtractor.get_resources_with_url_from_csv()
+
+    assert res == {:ok, [%{"url" => "http", "title" => "http", "id" => "bob"}]}
+  end
+
+  test "get urls in CSV file : no url available" do
+    Transport.HTTPoison.Mock |> expect(:head, fn _url -> %HTTPoison.Response{} end)
+
+    assert UrlExtractor.get_resources_with_url_from_csv([{"stop,lon,lat\\n1,48.8,2.3", %{"id" => "bob"}}]) ==
+             {:error, "No url found"}
+  end
 end