diff --git a/farmbot_os/lib/farmbot_os/configurator/logger_socket.ex b/farmbot_os/lib/farmbot_os/configurator/logger_socket.ex index 83d87aa4..86ee3835 100644 --- a/farmbot_os/lib/farmbot_os/configurator/logger_socket.ex +++ b/farmbot_os/lib/farmbot_os/configurator/logger_socket.ex @@ -20,16 +20,7 @@ defmodule FarmbotOS.Configurator.LoggerSocket do end @impl :cowboy_websocket - def websocket_handle({:text, message}, state) do - case Jason.decode(message) do - {:ok, json} -> - websocket_handle({:json, json}, state) - - _ -> - _ = Logger.debug("discarding info: #{message}") - {:ok, state} - end - end + def websocket_handle({:text, _}, state), do: {:ok, state} @impl :cowboy_websocket def websocket_info(:after_connect, state) do diff --git a/farmbot_os/test/farmbot_os/configurator/logger_socket_test.exs b/farmbot_os/test/farmbot_os/configurator/logger_socket_test.exs index 9fa7979d..424ec00f 100644 --- a/farmbot_os/test/farmbot_os/configurator/logger_socket_test.exs +++ b/farmbot_os/test/farmbot_os/configurator/logger_socket_test.exs @@ -3,12 +3,28 @@ defmodule FarmbotOS.Configurator.LoggerSocketTest do use Mimic alias FarmbotOS.Configurator.LoggerSocket setup :verify_on_exit! + import ExUnit.CaptureLog test "init/2" do - # TODO(Rick) Not sure what the real args are. - # Circle back to make this test more realistic - # later. expected = {:cowboy_websocket, :foo, :bar} assert expected == LoggerSocket.init(:foo, :bar) end + + test "websocket_init" do + assert {:ok, %{}} == LoggerSocket.websocket_init(nil) + assert_receive :after_connect + end + + test "websocket_handle (invalid JSON)" do + s = %{state: :yep} + msg = "Not JSON." + payl = {:text, msg} + assert {:ok, s} == LoggerSocket.websocket_handle(payl, s) + end + + test "websocket_info/2" do + assert capture_log(fn -> + LoggerSocket.websocket_info(:whatever, %{}) + end) =~ "Dropping :whatever" + end end diff --git a/farmbot_os/test/farmbot_os/sys_calls_test.exs b/farmbot_os/test/farmbot_os/sys_calls_test.exs index 36446958..28be53a4 100644 --- a/farmbot_os/test/farmbot_os/sys_calls_test.exs +++ b/farmbot_os/test/farmbot_os/sys_calls_test.exs @@ -96,8 +96,8 @@ defmodule FarmbotOS.SysCallsTest do end) assert capture_io(fn -> - assert {:error, "\"this is a test\""} == SysCalls.sync() - end) =~ "green slow_blink" + assert {:error, "\"this is a test\""} == SysCalls.sync() + end) =~ "green slow_blink" end test "get_sequence(id)" do