Allow using socket/connect in another process. #5488
Merged
+101
−17
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Hermanverschooten
force-pushed
the
allow_non_test_process_for_channel
branch
from
5b2a84d to
48c210f
Compare
josevalim
reviewed
Jun 15, 2023
josevalim
reviewed
Jun 15, 2023
lib/phoenix/test/channel_test.ex
Outdated
| @@ -276,13 +292,13 @@ defmodule Phoenix.ChannelTest do | |||
| @doc false | |||
| @deprecated "Phoenix.ChannelTest.socket/0 is deprecated, please call socket/1 instead" | |||
| defmacro socket() do | |||
| socket(nil, nil, [], __CALLER__) | |||
| socket(nil, nil, [],[], __CALLER__) | |||
There was a problem hiding this comment.
Suggested change
| socket(nil, nil, [],[], __CALLER__) | |
| socket(nil, nil, [], [], __CALLER__) |
josevalim
reviewed
Jun 15, 2023
lib/phoenix/test/channel_test.ex
Outdated
| defmacro socket(id, assigns) do | ||
| socket(nil, id, assigns, __CALLER__) | ||
| socket(nil, id, assigns,[], __CALLER__) |
There was a problem hiding this comment.
Suggested change
| socket(nil, id, assigns,[], __CALLER__) | |
| socket(nil, id, assigns, [], __CALLER__) |
josevalim
reviewed
Jun 15, 2023
lib/phoenix/test/channel_test.ex
Outdated
| @@ -291,21 +307,21 @@ defmodule Phoenix.ChannelTest do | |||
| Useful for testing UserSocket authentication. Returns | |||
| the result of the handler's `connect/3` callback. | |||
| """ | |||
| defmacro connect(handler, params, connect_info \\ quote(do: %{})) do | |||
| defmacro connect(handler, params, connect_info \\ quote(do: %{}), options \\ []) do | |||
There was a problem hiding this comment.
I find two optional arguments a smell, so what if we do this:
defmacro connect(handler, params, options \\ quote(do: [])) do
And then __connect__ we do:
{connect_info, options} =
if is_map(options) do
IO.warn("Passing \"connect_info\" directly to connect/3 is deprecated, please pass \"connect_info: ...\" as an option instead")
{options, []}
else
Keyword.pop(options, :connect_info, %{})
end
48c210f to
cef59ef
Compare
|
💚 💙 💜 💛 ❤️ |
aptinio
added a commit
to aptinio/phoenix_live_view
that referenced
this pull request
Jun 18, 2023
brought about by: phoenixframework/phoenix#5488 Removing the 3rd argument is backwards compatible since `connect_info` still defaults to `%{}`.
josevalim
pushed a commit
to phoenixframework/phoenix_live_view
that referenced
this pull request
Jun 19, 2023
brought about by: phoenixframework/phoenix#5488 Removing the 3rd argument is backwards compatible since `connect_info` still defaults to `%{}`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As proposed by @josevalim in #5326, I added an optional 4th argument to
socket/3andconnect/3thatallows to give the
pidof the test process. This is needed when wanting to use the socket from aTaskorother process that is not your test.