Simplify test helpers

Author: whatyouhide

test/context_test.exs

@@ -1,7 +1,7 @@
 defmodule Sentry.ContextTest do
   use ExUnit.Case, async: false
 
-  import Sentry.TestEnvironmentHelper
+  import Sentry.TestHelpers
 
   alias Sentry.{Context, Event, Interfaces}
 
@@ -80,7 +80,7 @@ defmodule Sentry.ContextTest do
   @tag start_app: false
   test "passing in tags context as option overrides Context and Application config" do
     Context.set_tags_context(%{"key" => "345", "key1" => "123"})
-    modify_env(:sentry, tags: %{"key" => "overridden", "key2" => "1234", "key3" => "12345"})
+    modify_app_env(tags: %{"key" => "overridden", "key2" => "1234", "key3" => "12345"})
 
     event = Event.create_event(tags: %{"key" => "123"})
 

test/envelope_test.exs

@@ -1,8 +1,9 @@
 defmodule Sentry.EnvelopeTest do
   use ExUnit.Case, async: false
 
+  import Sentry.TestHelpers
+
   alias Sentry.{Envelope, Event, Interfaces}
-  alias Sentry.TestEnvironmentHelper
 
   describe "from_binary/1" do
     test "parses envelope with empty headers" do
@@ -133,7 +134,7 @@ defmodule Sentry.EnvelopeTest do
 
   describe "to_binary/1" do
     test "encodes an envelope" do
-      TestEnvironmentHelper.modify_env(:sentry, environment_name: "test")
+      modify_app_env(environment_name: "test")
 
       event = Event.create_event([])
       envelope = Envelope.new([event])

test/event_test.exs

@@ -1,11 +1,11 @@
 defmodule Sentry.EventTest do
   use ExUnit.Case, async: false
 
+  import Sentry.TestHelpers
+
   alias Sentry.Event
   alias Sentry.Interfaces
 
-  import Sentry.TestEnvironmentHelper
-
   doctest Event, import: true
 
   def event_generated_by_exception(extra \\ %{}) do
@@ -290,7 +290,7 @@ defmodule Sentry.EventTest do
   end
 
   test "sets :in_app to true when configured" do
-    modify_env(:sentry, in_app_module_allow_list: [Sentry, :random, Sentry.Submodule])
+    modify_app_env(in_app_module_allow_list: [Sentry, :random, Sentry.Submodule])
     exception = RuntimeError.exception("error")
 
     event =

test/logger_backend_test.exs

@@ -1,7 +1,8 @@
 defmodule Sentry.LoggerBackendTest do
   use ExUnit.Case, async: false
 
-  alias Sentry.TestEnvironmentHelper
+  import Sentry.TestHelpers
+
   alias Sentry.TestGenServer
 
   require Logger
@@ -338,7 +339,7 @@ defmodule Sentry.LoggerBackendTest do
     pid = self()
     ref = make_ref()
 
-    TestEnvironmentHelper.modify_env(:sentry,
+    modify_app_env(
       before_send: fn event ->
         send(pid, {ref, event})
         false

test/mix/sentry.send_test_event_test.exs

@@ -2,10 +2,10 @@ defmodule Mix.Tasks.Sentry.SendTestEventTest do
   use ExUnit.Case
 
   import ExUnit.CaptureIO
-  import Sentry.TestEnvironmentHelper
+  import Sentry.TestHelpers
 
   test "prints if :dsn is not set" do
-    modify_env(:sentry, dsn: nil)
+    modify_app_env(dsn: nil)
 
     output =
       capture_io(fn ->
@@ -32,7 +32,7 @@ defmodule Mix.Tasks.Sentry.SendTestEventTest do
       Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
     end)
 
-    modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+    modify_app_env(dsn: "http://public:secret@localhost:#{bypass.port}/1")
 
     output =
       capture_io(fn ->
@@ -62,7 +62,7 @@ defmodule Mix.Tasks.Sentry.SendTestEventTest do
       Plug.Conn.resp(conn, 500, ~s<{"id": "340"}>)
     end)
 
-    modify_env(:sentry,
+    modify_app_env(
       dsn: "http://public:secret@localhost:#{bypass.port}/1",
       request_retries: []
     )

test/plug_capture_test.exs

@@ -2,7 +2,7 @@ defmodule Sentry.PlugCaptureTest do
   use ExUnit.Case
   use Plug.Test
 
-  import Sentry.TestEnvironmentHelper
+  import Sentry.TestHelpers
   import ExUnit.CaptureLog
 
   defmodule PhoenixController do
@@ -56,12 +56,12 @@ defmodule Sentry.PlugCaptureTest do
     Bypass.expect(bypass, fn conn ->
       {:ok, body, conn} = Plug.Conn.read_body(conn)
 
-      _event = TestHelpers.decode_event_from_envelope!(body)
+      _event = decode_event_from_envelope!(body)
 
       Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
     end)
 
-    modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+    modify_app_env(dsn: "http://public:secret@localhost:#{bypass.port}/1")
 
     assert_raise(Plug.Conn.WrapperError, "** (RuntimeError) Error", fn ->
       conn(:get, "/error_route")
@@ -75,12 +75,12 @@ defmodule Sentry.PlugCaptureTest do
     Bypass.expect(bypass, fn conn ->
       {:ok, body, conn} = Plug.Conn.read_body(conn)
 
-      _event = TestHelpers.decode_event_from_envelope!(body)
+      _event = decode_event_from_envelope!(body)
 
       Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
     end)
 
-    modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+    modify_app_env(dsn: "http://public:secret@localhost:#{bypass.port}/1")
 
     catch_throw(
       conn(:get, "/throw_route")
@@ -94,12 +94,12 @@ defmodule Sentry.PlugCaptureTest do
     Bypass.expect(bypass, fn conn ->
       {:ok, body, conn} = Plug.Conn.read_body(conn)
 
-      _event = TestHelpers.decode_event_from_envelope!(body)
+      _event = decode_event_from_envelope!(body)
 
       Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
     end)
 
-    modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+    modify_app_env(dsn: "http://public:secret@localhost:#{bypass.port}/1")
 
     catch_exit(
       conn(:get, "/exit_route")
@@ -113,7 +113,7 @@ defmodule Sentry.PlugCaptureTest do
     Bypass.expect(bypass, fn conn ->
       {:ok, body, conn} = Plug.Conn.read_body(conn)
 
-      event = TestHelpers.decode_event_from_envelope!(body)
+      event = decode_event_from_envelope!(body)
 
       assert event.request["url"] == "http://www.example.com/error_route"
       assert event.request["method"] == "GET"
@@ -122,7 +122,7 @@ defmodule Sentry.PlugCaptureTest do
       Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
     end)
 
-    modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+    modify_app_env(dsn: "http://public:secret@localhost:#{bypass.port}/1")
 
     assert_raise(Plug.Conn.WrapperError, "** (RuntimeError) Error", fn ->
       conn(:get, "/error_route")
@@ -136,12 +136,12 @@ defmodule Sentry.PlugCaptureTest do
     Bypass.expect_once(bypass, fn conn ->
       {:ok, body, conn} = Plug.Conn.read_body(conn)
 
-      _event = TestHelpers.decode_event_from_envelope!(body)
+      _event = decode_event_from_envelope!(body)
 
       Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
     end)
 
-    modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+    modify_app_env(dsn: "http://public:secret@localhost:#{bypass.port}/1")
 
     assert_raise(Plug.Conn.WrapperError, "** (RuntimeError) Error", fn ->
       conn(:get, "/error_route")
@@ -165,7 +165,7 @@ defmodule Sentry.PlugCaptureTest do
       Bypass.expect(bypass, fn conn ->
         {:ok, body, conn} = Plug.Conn.read_body(conn)
 
-        event = TestHelpers.decode_event_from_envelope!(body)
+        event = decode_event_from_envelope!(body)
 
         assert event.culprit == "Sentry.PlugCaptureTest.PhoenixController.error/2"
 
@@ -175,7 +175,7 @@ defmodule Sentry.PlugCaptureTest do
         Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
       end)
 
-      modify_env(:sentry,
+      modify_app_env(
         dsn: "http://public:secret@localhost:#{bypass.port}/1",
         "#{__MODULE__.PhoenixEndpoint}": [
           render_errors: [view: Sentry.ErrorView, accepts: ~w(html)]
@@ -198,14 +198,14 @@ defmodule Sentry.PlugCaptureTest do
       Bypass.expect(bypass, fn conn ->
         {:ok, body, conn} = Plug.Conn.read_body(conn)
 
-        event = TestHelpers.decode_event_from_envelope!(body)
+        event = decode_event_from_envelope!(body)
 
         assert event.culprit == "Sentry.PlugCaptureTest.PhoenixController.exit/2"
         assert event.message == "Uncaught exit - :test"
         Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
       end)
 
-      modify_env(:sentry,
+      modify_app_env(
         dsn: "http://public:secret@localhost:#{bypass.port}/1",
         "#{__MODULE__.PhoenixEndpoint}": [
           render_errors: [view: Sentry.ErrorView, accepts: ~w(html)]
@@ -225,14 +225,14 @@ defmodule Sentry.PlugCaptureTest do
       Bypass.expect(bypass, fn conn ->
         {:ok, body, conn} = Plug.Conn.read_body(conn)
 
-        event = TestHelpers.decode_event_from_envelope!(body)
+        event = decode_event_from_envelope!(body)
 
         assert event.culprit == "Sentry.PlugCaptureTest.PhoenixController.throw/2"
         assert event.message == "Uncaught throw - :test"
         Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
       end)
 
-      modify_env(:sentry,
+      modify_app_env(
         dsn: "http://public:secret@localhost:#{bypass.port}/1",
         "#{__MODULE__.PhoenixEndpoint}": [
           render_errors: [view: Sentry.ErrorView, accepts: ~w(html)]
@@ -269,7 +269,7 @@ defmodule Sentry.PlugCaptureTest do
         Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
       end)
 
-      modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+      modify_app_env(dsn: "http://public:secret@localhost:#{bypass.port}/1")
 
       start_supervised!(PhoenixEndpoint)
 
@@ -280,7 +280,7 @@ defmodule Sentry.PlugCaptureTest do
       end
 
       assert_receive {^ref, sentry_body}
-      event = TestHelpers.decode_event_from_envelope!(sentry_body)
+      event = decode_event_from_envelope!(sentry_body)
 
       assert event.culprit == "Sentry.PlugCaptureTest.PhoenixController.action_clause_error/2"
       assert [exception] = event.exception
@@ -295,12 +295,12 @@ defmodule Sentry.PlugCaptureTest do
     Bypass.expect(bypass, fn conn ->
       {:ok, body, conn} = Plug.Conn.read_body(conn)
 
-      _event = TestHelpers.decode_event_from_envelope!(body)
+      _event = decode_event_from_envelope!(body)
 
       Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
     end)
 
-    modify_env(:sentry,
+    modify_app_env(
       dsn: "http://public:secret@localhost:#{bypass.port}/1",
       "#{__MODULE__.PhoenixEndpoint}": [
         render_errors: [view: Sentry.ErrorView, accepts: ~w(html)]
@@ -332,12 +332,12 @@ defmodule Sentry.PlugCaptureTest do
     Bypass.expect(bypass, fn conn ->
       {:ok, body, conn} = Plug.Conn.read_body(conn)
 
-      _event = TestHelpers.decode_event_from_envelope!(body)
+      _event = decode_event_from_envelope!(body)
 
       Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
     end)
 
-    modify_env(:sentry, dsn: "http://public:secret@localhost:#{bypass.port}/1")
+    modify_app_env(dsn: "http://public:secret@localhost:#{bypass.port}/1")
 
     conn = conn(:get, "/error_route")
 
@@ -358,12 +358,12 @@ defmodule Sentry.PlugCaptureTest do
 
     Bypass.expect(bypass, fn conn ->
       {:ok, body, conn} = Plug.Conn.read_body(conn)
-      event = TestHelpers.decode_event_from_envelope!(body)
+      event = decode_event_from_envelope!(body)
       assert event.culprit == "Sentry.PlugCaptureTest.PhoenixController.assigns/2"
       Plug.Conn.resp(conn, 200, ~s<{"id": "340"}>)
     end)
 
-    modify_env(:sentry,
+    modify_app_env(
       dsn: "http://public:secret@localhost:#{bypass.port}/1",
       "#{__MODULE__.PhoenixEndpoint}": [
         render_errors: [view: Sentry.ErrorView, accepts: ~w(html)]