diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-03-28 13:01:33 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-28 13:01:33 +0100 |
commit | 050efbc12650feaac3e833c4dd740bf090e3dae1 (patch) | |
tree | 260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b /spec/lib/activitypub/activity/create_spec.rb | |
parent | 0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (diff) | |
parent | 24d5b6f9e39d2ac62a9657c7d19bc8c437b0735b (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml
Diffstat (limited to 'spec/lib/activitypub/activity/create_spec.rb')
-rw-r--r-- | spec/lib/activitypub/activity/create_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/activitypub/activity/create_spec.rb b/spec/lib/activitypub/activity/create_spec.rb index 3a1463d95..412609de4 100644 --- a/spec/lib/activitypub/activity/create_spec.rb +++ b/spec/lib/activitypub/activity/create_spec.rb @@ -464,7 +464,7 @@ RSpec.describe ActivityPub::Activity::Create do context 'when a vote to a local poll' do let(:poll) { Fabricate(:poll, options: %w(Yellow Blue)) } - let!(:local_status) { Fabricate(:status, owned_poll: poll) } + let!(:local_status) { Fabricate(:status, poll: poll) } let(:object_json) do { @@ -489,7 +489,7 @@ RSpec.describe ActivityPub::Activity::Create do poll.save(validate: false) poll end - let!(:local_status) { Fabricate(:status, owned_poll: poll) } + let!(:local_status) { Fabricate(:status, poll: poll) } let(:object_json) do { |