No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/test/web/metadata/user_test.exs b/test/web/metadata/user_test.exs
	index 5968036ba..54e72b004 100644
	--- a/test/web/metadata/user_test.exs
	+++ b/test/web/metadata/user_test.exs
	@@ -1,34 +1,30 @@
	# Pleroma: A lightweight social networking server
	# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
	# SPDX-License-Identifier: AGPL-3.0-only

	defmodule Pleroma.Web.Preload.Providers.UserTest do
	use Pleroma.DataCase
	import Pleroma.Factory
	alias Pleroma.Web.Preload.Providers.User

	setup do
	user = insert(:user)

	{:ok, User.generate_terms(%{user: user})}
	end

	test "it renders the accounts", %{"api/v1/accounts": accounts} do
	-<<<<<<< HEAD
	assert %{acct: username, username: username} = accounts
	-=======
	- assert %{"acct" => username, "username" => username} = accounts
	->>>>>>> 8025e21a4... adapt dat structures
	end

	test "it renders the relationships", %{"api/v1/accounts/relationships": relationships} do
	[
	%{
	blocked_by: false,
	blocking: false,
	showing_reblogs: true,
	subscribing: false
	}
	] = relationships
	end
	end