aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2018-12-24 20:09:18 +0300
committerMaxim Filippov <colixer@gmail.com>2018-12-24 20:09:18 +0300
commit18a4cbb244dbc188f5a391626fb98e3a53571318 (patch)
tree74e4932a15a71e3bdacc3d869bf3115010ce687e
parent0f412cf6e68fcebda3e94b71b7f182af689748bf (diff)
downloadpleroma-18a4cbb244dbc188f5a391626fb98e3a53571318.tar.gz
Capitalize "tombstone"
-rw-r--r--lib/pleroma/object.ex2
-rw-r--r--test/activity_test.exs4
-rw-r--r--test/user_test.exs2
-rw-r--r--test/web/activity_pub/activity_pub_test.exs2
-rw-r--r--test/web/activity_pub/transmogrifier_test.exs2
-rw-r--r--test/web/mastodon_api/mastodon_api_controller_test.exs2
6 files changed, 7 insertions, 7 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 436cf6d5d..31f206c39 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -65,7 +65,7 @@ defmodule Pleroma.Object do
def get_tombstone(%Object{data: data}, deleted \\ DateTime.utc_now()) do
%{
id: data["id"],
- type: "tombstone",
+ type: "Tombstone",
deleted: deleted
}
end
diff --git a/test/activity_test.exs b/test/activity_test.exs
index 87c9ddc50..c47fe39da 100644
--- a/test/activity_test.exs
+++ b/test/activity_test.exs
@@ -33,7 +33,7 @@ defmodule Pleroma.ActivityTest do
assert Pleroma.Activity.get_tombstone(activity, deleted) == %{
id: activity.data["object"]["id"],
context: activity.data["context"],
- type: "tombstone",
+ type: "Tombstone",
published: activity.data["published"],
deleted: deleted
}
@@ -43,7 +43,7 @@ defmodule Pleroma.ActivityTest do
activity = insert(:note_activity)
{:ok, deleted} = Pleroma.Activity.swap_data_with_tombstone(activity)
- assert deleted.data.type == "tombstone"
+ assert deleted.data.type == "Tombstone"
found_activity = Repo.get(Activity, activity.id)
diff --git a/test/user_test.exs b/test/user_test.exs
index 43a3687ec..f7a003c28 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -625,7 +625,7 @@ defmodule Pleroma.UserTest do
# TODO: Remove favorites, repeats, delete activities.
- assert Repo.get(Activity, activity.id).data["type"] == "tombstone"
+ assert Repo.get(Activity, activity.id).data["type"] == "Tombstone"
end
test "get_public_key_for_ap_id fetches a user that's not in the db" do
diff --git a/test/web/activity_pub/activity_pub_test.exs b/test/web/activity_pub/activity_pub_test.exs
index 95731a868..4d16a87e2 100644
--- a/test/web/activity_pub/activity_pub_test.exs
+++ b/test/web/activity_pub/activity_pub_test.exs
@@ -478,7 +478,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
assert Repo.get(Activity, delete.id) != nil
- assert Repo.get(Object, object.id).data["type"] == "tombstone"
+ assert Repo.get(Object, object.id).data["type"] == "Tombstone"
end
end
diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs
index 18a5ad3d0..8ab240dff 100644
--- a/test/web/activity_pub/transmogrifier_test.exs
+++ b/test/web/activity_pub/transmogrifier_test.exs
@@ -363,7 +363,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
{:ok, %Activity{local: false}} = Transmogrifier.handle_incoming(data)
- assert Repo.get(Activity, activity.id).data["type"] == "tombstone"
+ assert Repo.get(Activity, activity.id).data["type"] == "Tombstone"
end
test "it fails for incoming deletes with spoofed origin" do
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index 6c6cc2a00..f1baa9953 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -292,7 +292,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert %{} = json_response(conn, 200)
- assert Repo.get(Activity, activity.id).data["type"] == "tombstone"
+ assert Repo.get(Activity, activity.id).data["type"] == "Tombstone"
end
test "when you didn't create it", %{conn: conn} do