diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-19 00:55:12 +0100 |
| commit | f9d000ebaec7732d5fcd46aa6685108a2619966b (patch) | |
| tree | 9593841cf520b117ca4c3d5b68b19e9124c852da /spec/models/follow_spec.rb | |
| parent | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff) | |
| parent | c6598b17d9212c2d48395da73fa9529025d704cc (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/resolve_url_service.rb`: The private toot search by URL hack has been revamped upstream. Took upstream's version.
Diffstat (limited to 'spec/models/follow_spec.rb')
| -rw-r--r-- | spec/models/follow_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/follow_spec.rb b/spec/models/follow_spec.rb index 0c84e5e7b..e723a1ef2 100644 --- a/spec/models/follow_spec.rb +++ b/spec/models/follow_spec.rb @@ -5,7 +5,7 @@ RSpec.describe Follow, type: :model do let(:bob) { Fabricate(:account, username: 'bob') } describe 'validations' do - subject { Follow.new(account: alice, target_account: bob) } + subject { Follow.new(account: alice, target_account: bob, rate_limit: true) } it 'has a valid fabricator' do follow = Fabricate.build(:follow) |