From a2ef716f3b4b82564fb14d19665d64257d3d629b Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 17 Jan 2019 19:27:57 +0300 Subject: [PATCH] consistency in tests too --- test/unit/specs/modules/statuses.spec.js | 28 +++++++++---------- .../entity_normalizer.spec.js | 12 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js index 076e238c..33628b9b 100644 --- a/test/unit/specs/modules/statuses.spec.js +++ b/test/unit/specs/modules/statuses.spec.js @@ -82,7 +82,7 @@ describe('The Statuses module', () => { const status = makeMockStatus({id: '1'}) const otherStatus = makeMockStatus({id: '3'}) status.uri = 'xxx' - const deletion = makeMockStatus({id: 2, type: 'deletion'}) + const deletion = makeMockStatus({id: '2', type: 'deletion'}) deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.' deletion.uri = 'xxx' @@ -131,9 +131,9 @@ describe('The Statuses module', () => { it('splits retweets from their status and links them', () => { const state = cloneDeep(defaultState) - const status = makeMockStatus({id: 1}) - const retweet = makeMockStatus({id: 2, type: 'retweet'}) - const modStatus = makeMockStatus({id: 1, text: 'something else'}) + const status = makeMockStatus({id: '1'}) + const retweet = makeMockStatus({id: '2', type: 'retweet'}) + const modStatus = makeMockStatus({id: '1', text: 'something else'}) retweet.retweeted_status = status @@ -173,9 +173,9 @@ describe('The Statuses module', () => { it('replaces existing statuses with the same id, coming from a retweet', () => { const state = cloneDeep(defaultState) - const status = makeMockStatus({id: 1}) - const modStatus = makeMockStatus({id: 1, text: 'something else'}) - const retweet = makeMockStatus({id: 2, type: 'retweet'}) + const status = makeMockStatus({id: '1'}) + const modStatus = makeMockStatus({id: '1', text: 'something else'}) + const retweet = makeMockStatus({id: '2', type: 'retweet'}) retweet.retweeted_status = modStatus // Add original status @@ -197,7 +197,7 @@ describe('The Statuses module', () => { const status = makeMockStatus({id: '1'}) const favorite = { - id: 2, + id: '2', type: 'favorite', in_reply_to_status_id: '1', // The API uses strings here... uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00', @@ -225,7 +225,7 @@ describe('The Statuses module', () => { } const ownFavorite = { - id: 3, + id: '3', type: 'favorite', in_reply_to_status_id: '1', // The API uses strings here... uri: 'tag:shitposter.club,2016-08-21:fave:3895:note:773501:2016-08-21T16:52:15+00:00', @@ -251,7 +251,7 @@ describe('The Statuses module', () => { mentionedStatus.uri = 'xxx' otherStatus.attentions = [user] - const deletion = makeMockStatus({id: 4, type: 'deletion'}) + const deletion = makeMockStatus({id: '4', type: 'deletion'}) deletion.text = 'Dolus deleted notice {{tag:gs.smuglo.li,2016-11-18:noticeId=1038007:objectType=note}}.' deletion.uri = 'xxx' @@ -260,8 +260,8 @@ describe('The Statuses module', () => { state, { notifications: [{ - from_profile: { id: 2 }, - id: 998, + from_profile: { id: '2' }, + id: '998', type: 'mention', status: otherStatus, action: otherStatus, @@ -274,8 +274,8 @@ describe('The Statuses module', () => { state, { notifications: [{ - from_profile: { id: 2 }, - id: 999, + from_profile: { id: '2' }, + id: '999', type: 'mention', status: mentionedStatus, action: mentionedStatus, diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js index e5882725..2eddd470 100644 --- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js +++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js @@ -9,7 +9,7 @@ const makeMockStatusQvitter = (overrides = {}) => { external_url: 'https://ap.example/whatever', fave_num: 1, favorited: false, - id: 10335970, + id: '10335970', in_reply_to_ostatus_uri: null, in_reply_to_profileurl: null, in_reply_to_screen_name: null, @@ -20,7 +20,7 @@ const makeMockStatusQvitter = (overrides = {}) => { possibly_sensitive: false, repeat_num: 0, repeated: false, - statusnet_conversation_id: 16300488, + statusnet_conversation_id: '16300488', statusnet_html: '

haha benis

', summary: null, tags: [], @@ -45,7 +45,7 @@ const makeMockUserQvitter = (overrides = {}) => { following: true, follows_you: true, friends_count: 1, - id: 60717, + id: '60717', is_local: false, locked: false, name: 'Spurdo :ebin:', @@ -87,15 +87,15 @@ describe('QVitter preprocessing', () => { }) it('sets nsfw for statuses with the #nsfw tag', () => { - const safe = makeMockStatusQvitter({id: 1, text: 'Hello oniichan'}) - const nsfw = makeMockStatusQvitter({id: 1, text: 'Hello oniichan #nsfw'}) + const safe = makeMockStatusQvitter({id: '1', text: 'Hello oniichan'}) + const nsfw = makeMockStatusQvitter({id: '1', text: 'Hello oniichan #nsfw'}) expect(parseStatus(safe).nsfw).to.eq(false) expect(parseStatus(nsfw).nsfw).to.eq(true) }) it('leaves existing nsfw settings alone', () => { - const nsfw = makeMockStatusQvitter({id: 1, text: 'Hello oniichan #nsfw', nsfw: false}) + const nsfw = makeMockStatusQvitter({id: '1', text: 'Hello oniichan #nsfw', nsfw: false}) expect(parseStatus(nsfw).nsfw).to.eq(false) })