diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/pleroma/user_search_test.exs | 2 | ||||
| -rw-r--r-- | test/pleroma/user_test.exs | 4 | ||||
| -rw-r--r-- | test/pleroma/web/admin_api/search_test.exs | 2 | ||||
| -rw-r--r-- | test/pleroma/web/mastodon_api/controllers/account_controller_test.exs | 2 | ||||
| -rw-r--r-- | test/pleroma/web/mastodon_api/update_credentials_test.exs | 8 | ||||
| -rw-r--r-- | test/pleroma/web/mastodon_api/views/account_view_test.exs | 4 | ||||
| -rw-r--r-- | test/pleroma/web/metadata/providers/restrict_indexing_test.exs | 4 | ||||
| -rw-r--r-- | test/pleroma/web/metadata_test.exs | 8 | ||||
| -rw-r--r-- | test/support/factory.ex | 2 | 
9 files changed, 18 insertions, 18 deletions
diff --git a/test/pleroma/user_search_test.exs b/test/pleroma/user_search_test.exs index c4b805005..31d787ffa 100644 --- a/test/pleroma/user_search_test.exs +++ b/test/pleroma/user_search_test.exs @@ -66,7 +66,7 @@ defmodule Pleroma.UserSearchTest do      end      test "excludes users when discoverable is false" do -      insert(:user, %{nickname: "john 3000", discoverable: false}) +      insert(:user, %{nickname: "john 3000", is_discoverable: false})        insert(:user, %{nickname: "john 3001"})        users = User.search("john") diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs index d506f7047..7d7bf4b78 100644 --- a/test/pleroma/user_test.exs +++ b/test/pleroma/user_test.exs @@ -1467,7 +1467,7 @@ defmodule Pleroma.UserTest do          pleroma_settings_store: %{"q" => "x"},          fields: [%{"gg" => "qq"}],          raw_fields: [%{"gg" => "qq"}], -        discoverable: true, +        is_discoverable: true,          also_known_as: ["https://lol.olo/users/loll"]        }) @@ -1509,7 +1509,7 @@ defmodule Pleroma.UserTest do               pleroma_settings_store: %{},               fields: [],               raw_fields: [], -             discoverable: false, +             is_discoverable: false,               also_known_as: []             } = user    end diff --git a/test/pleroma/web/admin_api/search_test.exs b/test/pleroma/web/admin_api/search_test.exs index d88867c52..ceec64f1e 100644 --- a/test/pleroma/web/admin_api/search_test.exs +++ b/test/pleroma/web/admin_api/search_test.exs @@ -180,7 +180,7 @@ defmodule Pleroma.Web.AdminAPI.SearchTest do      test "it returns non-discoverable users" do        insert(:user) -      insert(:user, discoverable: false) +      insert(:user, is_discoverable: false)        {:ok, _results, total} = Search.user() diff --git a/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs index f7f1369e4..f7eb97dbb 100644 --- a/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs +++ b/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs @@ -1278,7 +1278,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do                   "note" => "",                   "pleroma" => %{                     "actor_type" => "Person", -                   "discoverable" => false, +                   "is_discoverable" => false,                     "no_rich_text" => false,                     "show_role" => true                   }, diff --git a/test/pleroma/web/mastodon_api/update_credentials_test.exs b/test/pleroma/web/mastodon_api/update_credentials_test.exs index fe462caa3..383d351cf 100644 --- a/test/pleroma/web/mastodon_api/update_credentials_test.exs +++ b/test/pleroma/web/mastodon_api/update_credentials_test.exs @@ -147,14 +147,14 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do      end      test "updates the user's discoverable status", %{conn: conn} do -      assert %{"source" => %{"pleroma" => %{"discoverable" => true}}} = +      assert %{"source" => %{"pleroma" => %{"is_discoverable" => true}}} =                 conn -               |> patch("/api/v1/accounts/update_credentials", %{discoverable: "true"}) +               |> patch("/api/v1/accounts/update_credentials", %{is_discoverable: "true"})                 |> json_response_and_validate_schema(:ok) -      assert %{"source" => %{"pleroma" => %{"discoverable" => false}}} = +      assert %{"source" => %{"pleroma" => %{"is_discoverable" => false}}} =                 conn -               |> patch("/api/v1/accounts/update_credentials", %{discoverable: "false"}) +               |> patch("/api/v1/accounts/update_credentials", %{is_discoverable: "false"})                 |> json_response_and_validate_schema(:ok)      end diff --git a/test/pleroma/web/mastodon_api/views/account_view_test.exs b/test/pleroma/web/mastodon_api/views/account_view_test.exs index a5f39b215..3b0454df2 100644 --- a/test/pleroma/web/mastodon_api/views/account_view_test.exs +++ b/test/pleroma/web/mastodon_api/views/account_view_test.exs @@ -69,7 +69,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do          sensitive: false,          pleroma: %{            actor_type: "Person", -          discoverable: true +          is_discoverable: true          },          fields: []        }, @@ -167,7 +167,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do          sensitive: false,          pleroma: %{            actor_type: "Service", -          discoverable: true +          is_discoverable: true          },          fields: []        }, diff --git a/test/pleroma/web/metadata/providers/restrict_indexing_test.exs b/test/pleroma/web/metadata/providers/restrict_indexing_test.exs index 6b3a65372..282d132c8 100644 --- a/test/pleroma/web/metadata/providers/restrict_indexing_test.exs +++ b/test/pleroma/web/metadata/providers/restrict_indexing_test.exs @@ -14,13 +14,13 @@ defmodule Pleroma.Web.Metadata.Providers.RestrictIndexingTest do      test "for local user" do        assert Pleroma.Web.Metadata.Providers.RestrictIndexing.build_tags(%{ -               user: %Pleroma.User{local: true, discoverable: true} +               user: %Pleroma.User{local: true, is_discoverable: true}               }) == []      end      test "for local user when discoverable is false" do        assert Pleroma.Web.Metadata.Providers.RestrictIndexing.build_tags(%{ -               user: %Pleroma.User{local: true, discoverable: false} +               user: %Pleroma.User{local: true, is_discoverable: false}               }) == [{:meta, [name: "robots", content: "noindex, noarchive"], []}]      end    end diff --git a/test/pleroma/web/metadata_test.exs b/test/pleroma/web/metadata_test.exs index ca6cbe67f..8fb946540 100644 --- a/test/pleroma/web/metadata_test.exs +++ b/test/pleroma/web/metadata_test.exs @@ -16,14 +16,14 @@ defmodule Pleroma.Web.MetadataTest do      end      test "for local user" do -      user = insert(:user, discoverable: false) +      user = insert(:user, is_discoverable: false)        assert Pleroma.Web.Metadata.build_tags(%{user: user}) =~                 "<meta content=\"noindex, noarchive\" name=\"robots\">"      end      test "for local user set to discoverable" do -      user = insert(:user, discoverable: true) +      user = insert(:user, is_discoverable: true)        refute Pleroma.Web.Metadata.build_tags(%{user: user}) =~                 "<meta content=\"noindex, noarchive\" name=\"robots\">" @@ -33,14 +33,14 @@ defmodule Pleroma.Web.MetadataTest do    describe "no metadata for private instances" do      test "for local user set to discoverable" do        clear_config([:instance, :public], false) -      user = insert(:user, bio: "This is my secret fedi account bio", discoverable: true) +      user = insert(:user, bio: "This is my secret fedi account bio", is_discoverable: true)        assert "" = Pleroma.Web.Metadata.build_tags(%{user: user})      end      test "search exclusion metadata is included" do        clear_config([:instance, :public], false) -      user = insert(:user, bio: "This is my secret fedi account bio", discoverable: false) +      user = insert(:user, bio: "This is my secret fedi account bio", is_discoverable: false)        assert ~s(<meta content="noindex, noarchive" name="robots">) ==                 Pleroma.Web.Metadata.build_tags(%{user: user}) diff --git a/test/support/factory.ex b/test/support/factory.ex index fb82be0c4..80b882ee4 100644 --- a/test/support/factory.ex +++ b/test/support/factory.ex @@ -31,7 +31,7 @@ defmodule Pleroma.Factory do        nickname: sequence(:nickname, &"nick#{&1}"),        password_hash: Pbkdf2.hash_pwd_salt("test"),        bio: sequence(:bio, &"Tester Number #{&1}"), -      discoverable: true, +      is_discoverable: true,        last_digest_emailed_at: NaiveDateTime.utc_now(),        last_refreshed_at: NaiveDateTime.utc_now(),        notification_settings: %Pleroma.User.NotificationSetting{},  | 
