From 6d2e35005f63819da1e9f80b4e20d13b763ea157 Mon Sep 17 00:00:00 2001 From: Adrian Kumpf Date: Mon, 27 Jan 2020 16:50:50 +0100 Subject: [PATCH] Bump floki to 0.25.0 --- mix.lock | 2 +- test/support/test_helper.ex | 7 -- .../controllers/car_controller_test.exs | 6 +- .../live/car_summary_live_test.exs | 52 +++++++++------ .../live/charge_cost_live_test.exs | 24 +++---- .../teslamate_web/live/geofence_live_test.exs | 56 ++++++++-------- test/teslamate_web/live/settings_test.exs | 64 +++++++++---------- 7 files changed, 108 insertions(+), 103 deletions(-) diff --git a/mix.lock b/mix.lock index 6cdd0867..6309e9d6 100644 --- a/mix.lock +++ b/mix.lock @@ -13,7 +13,7 @@ "eternal": {:hex, :eternal, "1.2.1", "d5b6b2499ba876c57be2581b5b999ee9bdf861c647401066d3eeed111d096bc4", [:mix], [], "hexpm"}, "excoveralls": {:hex, :excoveralls, "0.12.2", "a513defac45c59e310ac42fcf2b8ae96f1f85746410f30b1ff2b710a4b6cd44b", [:mix], [{:hackney, "~> 1.0", [hex: :hackney, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm"}, "file_system": {:hex, :file_system, "0.2.7", "e6f7f155970975789f26e77b8b8d8ab084c59844d8ecfaf58cbda31c494d14aa", [:mix], [], "hexpm"}, - "floki": {:hex, :floki, "0.24.0", "81ec04f66cdc7d142fa8c9f402e4493a25bf9eb8bc39f971f58a8ea84a2e35d3", [:mix], [{:html_entities, "~> 0.5.0", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm"}, + "floki": {:hex, :floki, "0.25.0", "b1c9ddf5f32a3a90b43b76f3386ca054325dc2478af020e87b5111c19f2284ac", [:mix], [{:html_entities, "~> 0.5.0", [hex: :html_entities, repo: "hexpm", optional: false]}], "hexpm"}, "fuse": {:hex, :fuse, "2.4.2", "9106b08db8793a34cc156177d7e24c41bd638ee1b28463cb76562fde213e8ced", [:rebar3], [], "hexpm"}, "gen_state_machine": {:hex, :gen_state_machine, "2.1.0", "a38b0e53fad812d29ec149f0d354da5d1bc0d7222c3711f3a0bd5aa608b42992", [:mix], [], "hexpm"}, "gettext": {:hex, :gettext, "0.17.4", "f13088e1ec10ce01665cf25f5ff779e7df3f2dc71b37084976cf89d1aa124d5c", [:mix], [], "hexpm"}, diff --git a/test/support/test_helper.ex b/test/support/test_helper.ex index d5e14e92..13d0306a 100644 --- a/test/support/test_helper.ex +++ b/test/support/test_helper.ex @@ -11,11 +11,4 @@ defmodule TestHelper do Process.sleep(delay) eventually(fun, attempts - 1, delay) end - - def parse_document!(document) do - case Floki.parse_document(document) do - {:error, reason} -> raise reason - {:ok, html} -> html - end - end end diff --git a/test/teslamate_web/controllers/car_controller_test.exs b/test/teslamate_web/controllers/car_controller_test.exs index 5d304340..f593424a 100644 --- a/test/teslamate_web/controllers/car_controller_test.exs +++ b/test/teslamate_web/controllers/car_controller_test.exs @@ -9,7 +9,7 @@ defmodule TeslaMateWeb.CarControllerTest do defp table_row(html, key, value, opts \\ []) do assert {"tr", _, [{"td", _, [^key]}, {"td", [], [v]}]} = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("tr") |> Enum.find(&match?({"tr", _, [{"td", _, [^key]}, _td]}, &1)) @@ -24,7 +24,7 @@ defmodule TeslaMateWeb.CarControllerTest do assert {"span", _, [{"span", [{"class", ^icon_class}], _}]} = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".icons .icon") |> Enum.find(&match?({"span", [_, {"data-tooltip", ^tooltip}], _}, &1)) end @@ -80,7 +80,7 @@ defmodule TeslaMateWeb.CarControllerTest do {"div", [{"class", "car card"}], _} ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".car") end diff --git a/test/teslamate_web/live/car_summary_live_test.exs b/test/teslamate_web/live/car_summary_live_test.exs index e4127eda..96a8160f 100644 --- a/test/teslamate_web/live/car_summary_live_test.exs +++ b/test/teslamate_web/live/car_summary_live_test.exs @@ -8,7 +8,7 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do defp table_row(html, key, value, opts \\ []) do assert {"tr", _, [{"td", _, [^key]}, {"td", [], [v]}]} = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("tr") |> Enum.find(&match?({"tr", _, [{"td", _, [^key]}, _td]}, &1)) @@ -65,13 +65,19 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do assert "try to sleep" == html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("a[phx-click=suspend_logging]") |> Floki.text() # Suspend render_click(view, :suspend_logging) - assert view |> render() |> table_row("Status", "falling asleep") + + TestHelper.eventually( + fn -> + assert view |> render() |> table_row("Status", "falling asleep") + end, + delay: 5 + ) end for {msg, id, status, settings, attrs} <- [ @@ -130,7 +136,7 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do assert [{"a", [_, _, {"disabled", "disabled"}], [unquote(msg)]}] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".button.is-danger") end end @@ -156,7 +162,7 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do assert [] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("a[phx-click=suspend_logging]") end @@ -189,7 +195,7 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do assert ["disabled"] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("a[phx-click=suspend_logging]") |> Floki.attribute("disabled") end @@ -219,7 +225,7 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do assert "try to sleep" == html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("a[phx-click=suspend_logging]") |> Floki.text() @@ -227,14 +233,20 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do # Suspend render_click(view, :suspend_logging) - assert html = render(view) - assert table_row(html, "Status", "falling asleep") - assert "cancel sleep attempt" == - html - |> TestHelper.parse_document!() - |> Floki.find("a[phx-click=resume_logging]") - |> Floki.text() + TestHelper.eventually( + fn -> + assert html = render(view) + assert table_row(html, "Status", "falling asleep") + + assert "cancel sleep attempt" == + html + |> Floki.parse_document!() + |> Floki.find("a[phx-click=resume_logging]") + |> Floki.text() + end, + delay: 5 + ) # Resume render_click(view, :resume_logging) @@ -262,7 +274,7 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do assert {"span", _, [{"span", [{"class", "mdi mdi-alert-box"}], _}]} = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".icons .icon") |> Enum.find( &match?({"span", [_, {"data-tooltip", "Health check failed"}], _}, &1) @@ -294,7 +306,7 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do ], _} ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".icons .spinner") end @@ -326,7 +338,7 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do ], _} ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".icons .spinner") end, delay: 20 @@ -363,7 +375,7 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do ], _} ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".icons .spinner") end, delay: 20 @@ -388,7 +400,7 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do assert {"span", _, [{"span", [{"class", "mdi mdi-gift-outline"}], _}]} = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".icons .icon") |> Enum.find( &match?({"span", [_, {"data-tooltip", "Software Update available"}], _}, &1) @@ -413,7 +425,7 @@ defmodule TeslaMateWeb.CarLive.SummaryTest do assert {"span", _, [{"span", [{"class", "mdi mdi-snowflake"}], _}]} = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".icons .icon") |> Enum.find( &match?({"span", [_, {"data-tooltip", "Reduced Battery Range"}], _}, &1) diff --git a/test/teslamate_web/live/charge_cost_live_test.exs b/test/teslamate_web/live/charge_cost_live_test.exs index 05d588a5..fac16548 100644 --- a/test/teslamate_web/live/charge_cost_live_test.exs +++ b/test/teslamate_web/live/charge_cost_live_test.exs @@ -19,7 +19,7 @@ defmodule TeslaMateWeb.ChargeLive.CostTest do assert [] == html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#date-tag") # complete @@ -31,7 +31,7 @@ defmodule TeslaMateWeb.ChargeLive.CostTest do assert [tag] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#date-tag") assert tag @@ -65,7 +65,7 @@ defmodule TeslaMateWeb.ChargeLive.CostTest do ]} ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#energy-tag") end @@ -77,7 +77,7 @@ defmodule TeslaMateWeb.ChargeLive.CostTest do assert [] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#energy-tag") end @@ -93,7 +93,7 @@ defmodule TeslaMateWeb.ChargeLive.CostTest do ]} ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#car-tag") end @@ -119,7 +119,7 @@ defmodule TeslaMateWeb.ChargeLive.CostTest do ]} ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#location-tag") end @@ -158,7 +158,7 @@ defmodule TeslaMateWeb.ChargeLive.CostTest do ]} ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#location-tag") end end @@ -171,20 +171,20 @@ defmodule TeslaMateWeb.ChargeLive.CostTest do assert [] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#charging_process_cost") |> Floki.attribute("value") html = render_submit(view, :save, %{charging_process: %{cost: 42.12}}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() assert ["42.12"] = html |> Floki.find("#charging_process_cost") |> Floki.attribute("value") assert Decimal.from_float(42.12) == Repo.get(ChargingProcess, id).cost html = render_submit(view, :save, %{charging_process: %{cost: nil}}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() assert [] = html |> Floki.find("#charging_process_cost") |> Floki.attribute("value") assert nil == Repo.get(ChargingProcess, id).cost @@ -202,7 +202,7 @@ defmodule TeslaMateWeb.ChargeLive.CostTest do assert ["http://grafana.example.com/d/xyz/12"] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".control a") |> Floki.attribute("href") end @@ -215,7 +215,7 @@ defmodule TeslaMateWeb.ChargeLive.CostTest do assert ["/"] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".control a") |> Floki.attribute("href") end diff --git a/test/teslamate_web/live/geofence_live_test.exs b/test/teslamate_web/live/geofence_live_test.exs index 377171b8..8a756220 100644 --- a/test/teslamate_web/live/geofence_live_test.exs +++ b/test/teslamate_web/live/geofence_live_test.exs @@ -51,7 +51,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do ["Post office", "-25.06619, -130.1005", "100 m", _] ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("tr") |> Enum.map(fn row -> row |> Floki.find("td") |> Enum.map(&Floki.text/1) end) end @@ -71,7 +71,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do assert {:ok, view, html} = live(conn, "/geo-fences") assert ["Post office", "-25.06619, -130.1005", "328 ft", _] = - html |> TestHelper.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) + html |> Floki.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) end test "allows deletion of a geo-fence", %{conn: conn} do @@ -81,17 +81,17 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do assert {:ok, view, html} = live(conn, "/geo-fences") assert ["Victory Column", "52.51452, 13.35014", "100 m", _] = - html |> TestHelper.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) + html |> Floki.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) assert [{"a", _, _}] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("[data-id=#{id}]") assert [{"tbody", _, []}] = view |> render_click(:delete, %{"id" => "#{id}"}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("tbody") end end @@ -102,7 +102,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do geofence_fixture(%{name: "Post office", latitude: -25.066188, longitude: -130.100502}) assert {:ok, view, html} = live(conn, "/geo-fences/#{id}/edit") - html = TestHelper.parse_document!(html) + html = Floki.parse_document!(html) name = Floki.find(html, "#geo_fence_name") assert ["Post office"] = Floki.attribute(name, "value") @@ -118,7 +118,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do html = render_submit(view, :save, %{geo_fence: %{name: "", radius: ""}}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() assert [""] = html |> Floki.find("#geo_fence_name") |> Floki.attribute("value") @@ -138,7 +138,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do geofence_fixture(%{name: "Post office", latitude: -25.066188, longitude: -130.100502}) assert {:ok, view, html} = live(conn, "/geo-fences/#{id}/edit") - html = TestHelper.parse_document!(html) + html = Floki.parse_document!(html) name = Floki.find(html, "#geo_fence_name") assert ["Post office"] = Floki.attribute(name, "value") @@ -160,7 +160,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do assert {:ok, view, html} = live(conn, "/geo-fences") assert ["Adamstown", "0.0, 0.0", "20 m", _] = - html |> TestHelper.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) + html |> Floki.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) end test "allows editing of a geo-fence with radius being displayed in ft", %{conn: conn} do @@ -179,7 +179,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do radius = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#geo_fence_radius") assert ["66.0"] = Floki.attribute(radius, "value") @@ -197,7 +197,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do assert {:ok, view, html} = live(conn, "/geo-fences") assert ["Post office", "-25.06619, -130.1005", "30 ft", _] = - html |> TestHelper.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) + html |> Floki.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) {:ok, _settings} = Settings.get_global_settings!() |> Settings.update_global_settings(%{unit_of_length: :km}) @@ -205,7 +205,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do assert {:ok, view, html} = live(conn, "/geo-fences") assert ["Post office", "-25.06619, -130.1005", "9 m", _] = - html |> TestHelper.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) + html |> Floki.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) end end @@ -221,7 +221,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do }) assert {:ok, view, html} = live(conn, "/geo-fences/new") - html = TestHelper.parse_document!(html) + html = Floki.parse_document!(html) latitude = Floki.find(html, "#geo_fence_latitude") longitude = Floki.find(html, "#geo_fence_longitude") @@ -239,7 +239,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do render_submit(view, :save, %{ geo_fence: %{name: "", longitude: nil, latitude: nil, radius: ""} }) - |> TestHelper.parse_document!() + |> Floki.parse_document!() assert [""] = html |> Floki.find("#geo_fence_name") |> Floki.attribute("value") assert [""] = html |> Floki.find("#geo_fence_latitude") |> Floki.attribute("value") @@ -275,7 +275,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do radius: "40" } }) - |> TestHelper.parse_document!() + |> Floki.parse_document!() assert ["foo"] = html |> Floki.find("#geo_fence_name") |> Floki.attribute("value") assert ["wat"] = html |> Floki.find("#geo_fence_latitude") |> Floki.attribute("value") @@ -303,7 +303,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do # Default radius of 20m assert html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#geo_fence_radius") |> Floki.attribute("value") == ["20"] @@ -320,7 +320,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do assert {:ok, view, html} = live(conn, "/geo-fences") assert ["post office", "-25.06619, -130.1005", "25 m", _] = - html |> TestHelper.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) + html |> Floki.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) end test "warn if a geo-fence already exists for a location", %{conn: conn} do @@ -338,7 +338,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do radius: "20" } }) - |> TestHelper.parse_document!() + |> Floki.parse_document!() assert [_field_name, field_position, _field_radius, _field_sleep_mode, _] = Floki.find(html, ".field.is-horizontal") @@ -366,7 +366,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do assert {:ok, view, html} = live(conn, "/geo-fences") assert ["post office", "-25.06619, -130.1005", "50 ft", _] = - html |> TestHelper.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) + html |> Floki.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) {:ok, _settings} = Settings.get_global_settings!() |> Settings.update_global_settings(%{unit_of_length: :km}) @@ -374,7 +374,7 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do assert {:ok, view, html} = live(conn, "/geo-fences") assert ["post office", "-25.06619, -130.1005", "15 m", _] = - html |> TestHelper.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) + html |> Floki.parse_document!() |> Floki.find("td") |> Enum.map(&Floki.text/1) end end @@ -390,25 +390,25 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do assert ["checked"] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#sleep_mode_#{car.id}") |> Floki.attribute("checked") assert [] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#sleep_mode_#{another_car.id}") |> Floki.attribute("checked") assert [] = render_click(view, :toggle, %{checked: "false", car: to_string(car.id)}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#sleep_mode_#{car.id}") |> Floki.attribute("checked") assert ["checked"] = render_click(view, :toggle, %{checked: "true", car: to_string(another_car.id)}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#sleep_mode_#{another_car.id}") |> Floki.attribute("checked") @@ -438,25 +438,25 @@ defmodule TeslaMateWeb.GeoFenceLiveTest do assert [] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#sleep_mode_#{car.id}") |> Floki.attribute("checked") assert ["checked"] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#sleep_mode_#{another_car.id}") |> Floki.attribute("checked") assert ["checked"] = render_click(view, :toggle, %{checked: "true", car: to_string(car.id)}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#sleep_mode_#{car.id}") |> Floki.attribute("checked") assert [] = render_click(view, :toggle, %{checked: "false", car: to_string(another_car.id)}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#sleep_mode_#{another_car.id}") |> Floki.attribute("checked") diff --git a/test/teslamate_web/live/settings_test.exs b/test/teslamate_web/live/settings_test.exs index ec63a547..ac397155 100644 --- a/test/teslamate_web/live/settings_test.exs +++ b/test/teslamate_web/live/settings_test.exs @@ -15,7 +15,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do ]} ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_unit_of_length") assert [ @@ -26,7 +26,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do ]} ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_unit_of_temperature") end @@ -41,7 +41,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do ]} ] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_preferred_range") end @@ -49,7 +49,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert {:ok, view, _html} = live(conn, "/settings") assert render_change(view, :change, %{global_settings: %{base_url: nil}}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_base_url") |> Floki.attribute("value") == [] @@ -58,7 +58,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert render_change(view, :change, %{ global_settings: %{base_url: " https://example.com/ "} }) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_base_url") |> Floki.attribute("value") == ["https://example.com"] @@ -69,7 +69,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert {:ok, view, _html} = live(conn, "/settings") assert render_change(view, :change, %{global_settings: %{grafana_url: nil}}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_grafana_url") |> Floki.attribute("value") == [] @@ -78,7 +78,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert render_change(view, :change, %{ global_settings: %{grafana_url: " https://example.com/ "} }) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_grafana_url") |> Floki.attribute("value") == ["https://example.com"] @@ -96,7 +96,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do ]} ] = render_change(view, :change, %{global_settings: %{unit_of_length: :mi}}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_unit_of_length") assert settings = Settings.get_global_settings!() @@ -110,7 +110,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do ]} ] = render_change(view, :change, %{global_settings: %{unit_of_temperature: :F}}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_unit_of_temperature") assert settings = Settings.get_global_settings!() @@ -137,7 +137,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert [{"option", [{"value", "en"}, {"selected", "selected"}], ["English"]}] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_language option[selected]") render_change(view, :change, %{global_settings: %{language: "de"}}) @@ -145,7 +145,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do TestHelper.eventually(fn -> assert [{"option", [{"value", "de"}, {"selected", "selected"}], ["German"]}] = render(view) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_language option[selected]") assert %Address{country: "de"} = Repo.get(Address, address_id) @@ -169,7 +169,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert [{"option", [{"value", "en"}, {"selected", "selected"}], ["English"]}] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_language option[selected]") render_change(view, :change, %{global_settings: %{language: "de"}}) @@ -179,7 +179,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert "There was a problem retrieving data from OpenStreetMap. Please try again later." = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("form .field-body") |> Enum.find( &match?( @@ -200,7 +200,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert [{"option", [{"value", "en"}, {"selected", "selected"}], ["English"]}] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#global_settings_language option[selected]") assert %Address{ @@ -251,7 +251,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert ["checked"] == html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#car_settings_#{car.id}_sleep_mode_enabled") |> Floki.attribute("checked") @@ -260,21 +260,21 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert [] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#car_settings_#{car.id}_sleep_mode_enabled") |> Floki.attribute("checked") for id <- ids do assert ["disabled"] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(id) |> Floki.attribute("disabled") end html = render_change(view, :change, %{"car_settings_#{car.id}" => %{sleep_mode_enabled: true}}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() assert ["checked"] = html @@ -290,7 +290,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do car = car_fixture() assert {:ok, _view, html} = live(conn, "/settings") - html = TestHelper.parse_document!(html) + html = Floki.parse_document!(html) assert car.name == html |> Floki.find(".dropdown-item.is-active") |> Floki.text() @@ -349,7 +349,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do ) assert {:ok, _view, html} = live(conn, "/settings") - html = TestHelper.parse_document!(html) + html = Floki.parse_document!(html) assert car.name == html |> Floki.find(".dropdown-item.is-active") |> Floki.text() @@ -385,13 +385,13 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert car.name == html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".dropdown-item.is-active") |> Floki.text() assert [{"option", [{"value", "90"}, {"selected", "selected"}], ["90 min"]}] = render_change(view, :change, %{"car_settings_#{car.id}" => %{suspend_min: 90}}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#car_settings_#{car.id}_suspend_min option") |> Enum.filter(&match?({_, [_, {"selected", "selected"}], _}, &1)) @@ -402,7 +402,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do render_change(view, :change, %{ "car_settings_#{car.id}" => %{suspend_after_idle_min: 30} }) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#car_settings_#{car.id}_suspend_after_idle_min option") |> Enum.filter(&match?({_, [_, {"selected", "selected"}], _}, &1)) @@ -413,7 +413,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do render_change(view, :change, %{ "car_settings_#{car.id}" => %{req_no_shift_state_reading: true} }) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#car_settings_#{car.id}_req_no_shift_state_reading") |> Floki.attribute("checked") @@ -424,7 +424,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do render_change(view, :change, %{ "car_settings_#{car.id}" => %{req_no_temp_reading: true} }) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#car_settings_#{car.id}_req_no_temp_reading") |> Floki.attribute("checked") @@ -435,7 +435,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do render_change(view, :change, %{ "car_settings_#{car.id}" => %{req_not_unlocked: false} }) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#car_settings_#{car.id}_req_not_unlocked") |> Floki.attribute("checked") @@ -451,7 +451,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert one.name == html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".dropdown-item.is-active") |> Floki.text() @@ -459,7 +459,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert [{"option", [{"value", "90"}, {"selected", "selected"}], ["90 min"]}] = render_change(view, :change, %{"car_settings_#{one.id}" => %{suspend_min: 90}}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#car_settings_#{one.id}_suspend_min option") |> Enum.filter(&match?({_, [_, {"selected", "selected"}], _}, &1)) @@ -472,13 +472,13 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert two.name == html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find(".dropdown-item.is-active") |> Floki.text() assert [{"option", [{"value", "21"}, {"selected", "selected"}], ["21 min"]}] = html - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#car_settings_#{two.id}_suspend_min option") |> Enum.filter(&match?({_, [_, {"selected", "selected"}], _}, &1)) @@ -486,7 +486,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert [{"option", [{"value", "60"}, {"selected", "selected"}], ["60 min"]}] = render_click(view, :change, %{"car_settings_#{two.id}" => %{suspend_min: 60}}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() |> Floki.find("#car_settings_#{two.id}_suspend_min option") |> Enum.filter(&match?({_, [_, {"selected", "selected"}], _}, &1)) @@ -494,7 +494,7 @@ defmodule TeslaMateWeb.SettingsLiveTest do assert html = render_click(view, :car, %{id: one.id}) - |> TestHelper.parse_document!() + |> Floki.parse_document!() assert one.name == html