Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
Signed-off-by: marcin mikołajczak <[email protected]>
  • Loading branch information
mkljczk committed Aug 31, 2024
1 parent e44bcd1 commit d47447a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions test/pleroma/web/common_api_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -1481,12 +1481,12 @@ defmodule Pleroma.Web.CommonAPITest do
assert {:ok, uselective, uopen, %{data: %{"state" => "accept"}}} =
CommonAPI.follow(uopen, uselective)

assert User.get_follow_state(uselective, uopen) == :follow_accept
assert User.get_follow_state(uopen, uselective) == :follow_accept

assert {:ok, uopen, uselective, %{data: %{"state" => "accept"}}} =
CommonAPI.follow(uselective, uopen)

assert User.get_follow_state(uopen, uselective) == :follow_accept
assert User.get_follow_state(uselective, uopen) == :follow_accept
end

test "creates a pending request for locked, non-followback local user" do

Check failure on line 1492 in test/pleroma/web/common_api_test.exs

View workflow job for this annotation

GitHub Actions / Test on OTP 26.2.5 / Elixir 1.15.8

test follow/2 creates a pending request for locked, non-followback local user (Pleroma.Web.CommonAPITest)
Expand All @@ -1496,12 +1496,12 @@ defmodule Pleroma.Web.CommonAPITest do
assert {:ok, ulocked, uopen, %{data: %{"state" => "accept"}}} =
CommonAPI.follow(uopen, ulocked)

assert User.get_follow_state(ulocked, uopen) == :follow_accept
assert User.get_follow_state(uopen, ulocked) == :follow_accept

assert {:ok, uopen, ulocked, %{data: %{"state" => "pending"}}} =
CommonAPI.follow(ulocked, uopen)

assert User.get_follow_state(uopen, ulocked) == :follow_pending
assert User.get_follow_state(ulocked, uopen) == :follow_pending
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1090,9 +1090,9 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do
end

describe "bubble" do
setup do: oauth_access(["read:statuses"])
test "filtering" do
%{conn: conn, user: user} = oauth_access(["read:statuses"])

test "filtering", %{conn: conn, user: user} do
clear_config([:instance, :local_bubble], [])
# our endpoint host has a port in it so let's set the AP ID
local_user = insert(:user, %{ap_id: "https://localhost/users/user"})
Expand Down

0 comments on commit d47447a

Please sign in to comment.