diff options
Diffstat (limited to 'test')
5 files changed, 19 insertions, 19 deletions
diff --git a/test/pleroma/user_test.exs b/test/pleroma/user_test.exs index 2cfd54d52..5f008acb1 100644 --- a/test/pleroma/user_test.exs +++ b/test/pleroma/user_test.exs @@ -664,14 +664,14 @@ defmodule Pleroma.UserTest do assert user.is_confirmed end - test "it sets 'accepts_newsletter'" do - params = Map.put_new(@full_user_data, :accepts_newsletter, true) + test "it sets 'accepts_email_list'" do + params = Map.put_new(@full_user_data, :accepts_email_list, true) changeset = User.register_changeset(%User{}, params) assert changeset.valid? {:ok, user} = Repo.insert(changeset) - assert user.accepts_newsletter + assert user.accepts_email_list end end @@ -748,13 +748,13 @@ defmodule Pleroma.UserTest do end describe "update_changeset/2" do - test "it sets :accepts_newsletter" do + test "it sets :accepts_email_list" do changeset = - %User{accepts_newsletter: false} - |> User.update_changeset(%{accepts_newsletter: true}) + %User{accepts_email_list: false} + |> User.update_changeset(%{accepts_email_list: true}) assert changeset.valid? - assert %User{accepts_newsletter: true} = Ecto.Changeset.apply_changes(changeset) + assert %User{accepts_email_list: true} = Ecto.Changeset.apply_changes(changeset) end end 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 3558394fd..9ddd5c935 100644 --- a/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs +++ b/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs @@ -1125,7 +1125,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do assert user assert user.is_confirmed assert user.is_approved - refute user.accepts_newsletter + refute user.accepts_email_list end test "registers but does not log in with :account_activation_required", %{conn: conn} do @@ -1357,7 +1357,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do assert json_response_and_validate_schema(res, 200) end - test "registration with accepts_newsletter", %{conn: conn, valid_params: valid_params} do + test "registration with accepts_email_list", %{conn: conn, valid_params: valid_params} do app_token = insert(:oauth_token, user: nil) conn = put_req_header(conn, "authorization", "Bearer " <> app_token.token) @@ -1365,10 +1365,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do conn |> put_req_header("content-type", "application/json") |> Map.put(:remote_ip, {127, 0, 0, 9}) - |> post("/api/v1/accounts", Map.put(valid_params, :accepts_newsletter, true)) + |> post("/api/v1/accounts", Map.put(valid_params, :accepts_email_list, true)) assert json_response_and_validate_schema(res, 200) - assert %User{accepts_newsletter: true} = Repo.get_by(User, email: "lain@example.org") + assert %User{accepts_email_list: true} = Repo.get_by(User, email: "lain@example.org") end test "returns forbidden if token is invalid", %{conn: conn, valid_params: valid_params} do diff --git a/test/pleroma/web/mastodon_api/update_credentials_test.exs b/test/pleroma/web/mastodon_api/update_credentials_test.exs index 21917e282..fd2eadd1b 100644 --- a/test/pleroma/web/mastodon_api/update_credentials_test.exs +++ b/test/pleroma/web/mastodon_api/update_credentials_test.exs @@ -114,10 +114,10 @@ defmodule Pleroma.Web.MastodonAPI.UpdateCredentialsTest do end test "updates the user's newsletter preference", %{user: user, conn: conn} do - conn = patch(conn, "/api/v1/accounts/update_credentials", %{accepts_newsletter: "true"}) + conn = patch(conn, "/api/v1/accounts/update_credentials", %{accepts_email_list: "true"}) assert json_response_and_validate_schema(conn, 200) - assert %User{accepts_newsletter: true} = User.get_by_id(user.id) + assert %User{accepts_email_list: true} = User.get_by_id(user.id) end test "updates the user's allow_following_move", %{user: user, conn: conn} do 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 a0a4d1ac6..96cec6652 100644 --- a/test/pleroma/web/mastodon_api/views/account_view_test.exs +++ b/test/pleroma/web/mastodon_api/views/account_view_test.exs @@ -470,7 +470,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do end end - test "shows accepts_newsletter only to the account owner" do + test "shows accepts_email_list only to the account owner" do user = insert(:user) other_user = insert(:user) @@ -479,12 +479,12 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do assert AccountView.render( "show.json", %{user: user, for: other_user} - )[:pleroma][:accepts_newsletter] == nil + )[:pleroma][:accepts_email_list] == nil assert AccountView.render( "show.json", %{user: user, for: user} - )[:pleroma][:accepts_newsletter] == user.accepts_newsletter + )[:pleroma][:accepts_email_list] == user.accepts_email_list end describe "follow requests counter" do diff --git a/test/pleroma/web/twitter_api/twitter_api_test.exs b/test/pleroma/web/twitter_api/twitter_api_test.exs index 295a57d71..ac841b1f1 100644 --- a/test/pleroma/web/twitter_api/twitter_api_test.exs +++ b/test/pleroma/web/twitter_api/twitter_api_test.exs @@ -146,18 +146,18 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do assert user2.bio == expected_text end - test "it registers a new user with accepts_newsletter." do + test "it registers a new user with accepts_email_list." do data = %{ :username => "lain", :email => "lain@wired.jp", :fullname => "lain iwakura", :password => "bear", :confirm => "bear", - :accepts_newsletter => true + :accepts_email_list => true } {:ok, user} = TwitterAPI.register_user(data) - assert user.accepts_newsletter + assert user.accepts_email_list end describe "register with one time token" do |