fixed tests
authorMaksim Pechnikov <parallel588@gmail.com>
Tue, 15 Sep 2020 12:32:49 +0000 (15:32 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Tue, 15 Sep 2020 12:32:49 +0000 (15:32 +0300)
test/marker_test.exs
test/repo_test.exs
test/web/mastodon_api/controllers/account_controller_test.exs
test/web/mastodon_api/controllers/marker_controller_test.exs
test/web/mastodon_api/views/account_view_test.exs

index 5b6d0b4a4729b4af0886fefb25f013222a7eefe7..7b3943c7be5ca907b3c990daa46c72abc7d2a104 100644 (file)
@@ -33,8 +33,8 @@ defmodule Pleroma.MarkerTest do
     test "returns user markers" do
       user = insert(:user)
       marker = insert(:marker, user: user)
-      insert(:notification, user: user)
-      insert(:notification, user: user)
+      insert(:notification, user: user, activity: insert(:note_activity))
+      insert(:notification, user: user, activity: insert(:note_activity))
       insert(:marker, timeline: "home", user: user)
 
       assert Marker.get_markers(
index 92e827c950fb68401b38d2327f8fdc00d963fe85..72c0b5071ccb99dfecfbef9b4c18f4e3111284a8 100644 (file)
@@ -37,7 +37,9 @@ defmodule Pleroma.RepoTest do
 
     test "get one-to-many assoc from repo" do
       user = insert(:user)
-      notification = refresh_record(insert(:notification, user: user))
+
+      notification =
+        refresh_record(insert(:notification, user: user, activity: insert(:note_activity)))
 
       assert Repo.get_assoc(user, :notifications) == {:ok, [notification]}
     end
index 17a1e7d661f9234102c28807e54ee0fa7ea8953a..f7f1369e48e35d70a19d925a2a3c2d2f66a05b00 100644 (file)
@@ -1442,7 +1442,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
   describe "verify_credentials" do
     test "verify_credentials" do
       %{user: user, conn: conn} = oauth_access(["read:accounts"])
-      [notification | _] = insert_list(7, :notification, user: user)
+
+      [notification | _] =
+        insert_list(7, :notification, user: user, activity: insert(:note_activity))
+
       Pleroma.Notification.set_read_up_to(user, notification.id)
       conn = get(conn, "/api/v1/accounts/verify_credentials")
 
index 6dd40fb4a9f741f3b4e613ad3cbd6f20ab029b01..9f0481120df495e61ab4f4812b9ac50beb8c9e4f 100644 (file)
@@ -11,7 +11,7 @@ defmodule Pleroma.Web.MastodonAPI.MarkerControllerTest do
     test "gets markers with correct scopes", %{conn: conn} do
       user = insert(:user)
       token = insert(:oauth_token, user: user, scopes: ["read:statuses"])
-      insert_list(7, :notification, user: user)
+      insert_list(7, :notification, user: user, activity: insert(:note_activity))
 
       {:ok, %{"notifications" => marker}} =
         Pleroma.Marker.upsert(
index 9f22f9dcf99e7a2a2445c8739583098cd595d4d1..c5f491d6bd69da77ab2a7e5584e3bacf14739351 100644 (file)
@@ -448,7 +448,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
 
     test "shows unread_count only to the account owner" do
       user = insert(:user)
-      insert_list(7, :notification, user: user)
+      insert_list(7, :notification, user: user, activity: insert(:note_activity))
       other_user = insert(:user)
 
       user = User.get_cached_by_ap_id(user.ap_id)