From b155e6ccf55bbd0e2b07d6e06349849dd1f06f0a Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Wed, 12 Apr 2017 09:53:55 -0400 Subject: [PATCH] Fix issue with intermittent api/v1/notifications failure (#1606) The spec was checking the activity_id of the activities held in notifications within the controller. Because the activities are different models, it is possible that they are created with the same database IDs, and when they are this spec fails because an activity which should not count as a match is counted as one. --- .../api/v1/notifications_controller_spec.rb | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/spec/controllers/api/v1/notifications_controller_spec.rb b/spec/controllers/api/v1/notifications_controller_spec.rb index c390d4f014..e3c9530941 100644 --- a/spec/controllers/api/v1/notifications_controller_spec.rb +++ b/spec/controllers/api/v1/notifications_controller_spec.rb @@ -13,11 +13,12 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do describe 'GET #index' do before do - status = PostStatusService.new.call(user.account, 'Test') - @reblog = ReblogService.new.call(other.account, status) - @mention = PostStatusService.new.call(other.account, 'Hello @alice') - @favourite = FavouriteService.new.call(other.account, status) - @follow = FollowService.new.call(other.account, 'alice') + first_status = PostStatusService.new.call(user.account, 'Test') + @reblog_of_first_status = ReblogService.new.call(other.account, first_status) + mentioning_status = PostStatusService.new.call(other.account, 'Hello @alice') + @mention_from_status = mentioning_status.mentions.first + @favourite = FavouriteService.new.call(other.account, first_status) + @follow = FollowService.new.call(other.account, 'alice') end describe 'with no options' do @@ -30,19 +31,19 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do end it 'includes reblog' do - expect(assigns(:notifications).map(&:activity_id)).to include(@reblog.id) + expect(assigns(:notifications).map(&:activity)).to include(@reblog_of_first_status) end it 'includes mention' do - expect(assigns(:notifications).map(&:activity_id)).to include(@mention.mentions.first.id) + expect(assigns(:notifications).map(&:activity)).to include(@mention_from_status) end it 'includes favourite' do - expect(assigns(:notifications).map(&:activity_id)).to include(@favourite.id) + expect(assigns(:notifications).map(&:activity)).to include(@favourite) end it 'includes follow' do - expect(assigns(:notifications).map(&:activity_id)).to include(@follow.id) + expect(assigns(:notifications).map(&:activity)).to include(@follow) end end @@ -56,19 +57,19 @@ RSpec.describe Api::V1::NotificationsController, type: :controller do end it 'includes reblog' do - expect(assigns(:notifications).map(&:activity_id)).to include(@reblog.id) + expect(assigns(:notifications).map(&:activity)).to include(@reblog_of_first_status) end it 'excludes mention' do - expect(assigns(:notifications).map(&:activity_id)).to_not include(@mention.mentions.first.id) + expect(assigns(:notifications).map(&:activity)).to_not include(@mention_from_status) end it 'includes favourite' do - expect(assigns(:notifications).map(&:activity_id)).to include(@favourite.id) + expect(assigns(:notifications).map(&:activity)).to include(@favourite) end it 'includes follow' do - expect(assigns(:notifications).map(&:activity_id)).to include(@follow.id) + expect(assigns(:notifications).map(&:activity)).to include(@follow) end end end