diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-05-29 13:52:26 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-05-29 13:52:26 +0200 |
commit | c087738270e7fb16b1d284e8dd72cf99b4238bb8 (patch) | |
tree | 23327fe190fd90589c9dc8d64e96fcf0b7d28ddd /spec | |
parent | 8b98afa781018bc7cfdb325f6b1fca0b1edcd8cb (diff) | |
parent | 90908fc24ba57c877de75fe117b8cc234e29d4f0 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'spec')
-rw-r--r-- | spec/controllers/emojis_controller_spec.rb | 17 | ||||
-rw-r--r-- | spec/models/status_spec.rb | 23 |
2 files changed, 29 insertions, 11 deletions
diff --git a/spec/controllers/emojis_controller_spec.rb b/spec/controllers/emojis_controller_spec.rb new file mode 100644 index 000000000..68bae256d --- /dev/null +++ b/spec/controllers/emojis_controller_spec.rb @@ -0,0 +1,17 @@ +require 'rails_helper' + +describe EmojisController do + render_views + + let(:emoji) { Fabricate(:custom_emoji) } + + describe 'GET #show' do + subject(:responce) { get :show, params: { id: emoji.id, format: :json } } + subject(:body) { JSON.parse(response.body, symbolize_names: true) } + + it 'returns the right response' do + expect(responce).to have_http_status 200 + expect(body[:name]).to eq ':coolcat:' + end + end +end diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb index 1f5a03877..03d1a94de 100644 --- a/spec/models/status_spec.rb +++ b/spec/models/status_spec.rb @@ -154,7 +154,7 @@ RSpec.describe Status, type: :model do describe '#target' do it 'returns nil if the status is self-contained' do - expect(subject.target).to be_nil + expect(subject.target).to be_nil end it 'returns nil if the status is a reply' do @@ -370,24 +370,25 @@ RSpec.describe Status, type: :model do expect(@results).to_not include(@followed_public_status) end - it 'includes direct statuses mentioning recipient from followed' do - Fabricate(:mention, account: account, status: @followed_direct_status) - expect(@results).to include(@followed_direct_status) - end - it 'does not include direct statuses not mentioning recipient from followed' do expect(@results).to_not include(@followed_direct_status) end - it 'includes direct statuses mentioning recipient from non-followed' do - Fabricate(:mention, account: account, status: @not_followed_direct_status) - expect(@results).to include(@not_followed_direct_status) - end - it 'does not include direct statuses not mentioning recipient from non-followed' do expect(@results).to_not include(@not_followed_direct_status) end + it 'includes direct statuses mentioning recipient from followed' do + Fabricate(:mention, account: account, status: @followed_direct_status) + results2 = Status.as_direct_timeline(account) + expect(results2).to include(@followed_direct_status) + end + + it 'includes direct statuses mentioning recipient from non-followed' do + Fabricate(:mention, account: account, status: @not_followed_direct_status) + results2 = Status.as_direct_timeline(account) + expect(results2).to include(@not_followed_direct_status) + end end describe '.as_public_timeline' do |