diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-17 22:53:26 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-17 22:53:26 +0300 |
| commit | 01c1078015c1ddbaa195125034489a14233df206 (patch) | |
| tree | 01c63b7d6a8040decf6e0cd1630b715ca2cb29c6 /test/web/instances/instance_test.exs | |
| parent | 76068873dbf9da191dd2487158ca88df198b811a (diff) | |
| parent | 79376abae347a5039931f57c581074b6da859827 (diff) | |
| download | pleroma-01c1078015c1ddbaa195125034489a14233df206.tar.gz pleroma-01c1078015c1ddbaa195125034489a14233df206.zip | |
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
Diffstat (limited to 'test/web/instances/instance_test.exs')
| -rw-r--r-- | test/web/instances/instance_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/instances/instance_test.exs b/test/web/instances/instance_test.exs index 3fd011fd3..0b53bc6cd 100644 --- a/test/web/instances/instance_test.exs +++ b/test/web/instances/instance_test.exs @@ -16,7 +16,8 @@ defmodule Pleroma.Instances.InstanceTest do describe "set_reachable/1" do test "clears `unreachable_since` of existing matching Instance record having non-nil `unreachable_since`" do - instance = insert(:instance, unreachable_since: NaiveDateTime.utc_now()) + unreachable_since = NaiveDateTime.to_iso8601(NaiveDateTime.utc_now()) + instance = insert(:instance, unreachable_since: unreachable_since) assert {:ok, instance} = Instance.set_reachable(instance.host) refute instance.unreachable_since |