Merge branch 'next-minor' into develop

This commit is contained in:
Benjamin Neff 2019-04-26 17:41:33 +02:00
commit 4e22c4b211
No known key found for this signature in database
GPG key ID: 971464C3F1A90194

View file

@ -63,7 +63,7 @@ describe Diaspora::Federation::Entities do
expect(federation_entity.parent_guid).to eq(diaspora_entity.post.guid)
expect(federation_entity.text).to eq(diaspora_entity.text)
expect(federation_entity.created_at).to eq(diaspora_entity.created_at)
expect(federation_entity.edited_at).to eq(edited_at)
expect(federation_entity.edited_at).to be_within(1.second).of(edited_at)
expect(federation_entity.author_signature).to eq(diaspora_entity.signature.author_signature)
expect(federation_entity.signature_order.map(&:to_s)).to eq(diaspora_entity.signature.signature_order.order.split)
expect(federation_entity.additional_data).to eq(diaspora_entity.signature.additional_data)