diff --git a/bin/mastodon-data.js b/bin/mastodon-data.js index 5896ec1..c765e01 100644 --- a/bin/mastodon-data.js +++ b/bin/mastodon-data.js @@ -74,7 +74,7 @@ export const actions = times(30, i => ({ { user: 'foobar', post: { - text: "content warning", + text: 'content warning', spoiler: 'CW' } }, @@ -259,4 +259,4 @@ export const actions = times(30, i => ({ privacy: 'unlisted' } } -]) \ No newline at end of file +]) diff --git a/bin/restore-mastodon-data.js b/bin/restore-mastodon-data.js index b6c1ad0..3d796f8 100644 --- a/bin/restore-mastodon-data.js +++ b/bin/restore-mastodon-data.js @@ -15,7 +15,7 @@ global.File = FileApi.File global.FormData = FileApi.FormData global.fetch = fetch -async function submitMedia(accessToken, filename, alt) { +async function submitMedia (accessToken, filename, alt) { let form = new FormData() form.append('file', fs.createReadStream(path.join(__dirname, '../tests/images/' + filename))) form.append('description', alt) @@ -72,4 +72,4 @@ export async function restoreMastodonData () { await new Promise(resolve => setTimeout(resolve, 1500)) } console.log('Restored mastodon data') -} \ No newline at end of file +} diff --git a/bin/run-mastodon.js b/bin/run-mastodon.js index df9d86c..731ecf6 100644 --- a/bin/run-mastodon.js +++ b/bin/run-mastodon.js @@ -34,7 +34,7 @@ async function cloneMastodon () { } } -async function setupMastodonDatabase() { +async function setupMastodonDatabase () { console.log('Setting up mastodon database...') try { await exec('dropdb mastodon_development', {cwd: mastodonDir}) diff --git a/routes/_api/follow.js b/routes/_api/follow.js index b093101..8aae944 100644 --- a/routes/_api/follow.js +++ b/routes/_api/follow.js @@ -1,12 +1,12 @@ import { postWithTimeout } from '../_utils/ajax' import { auth, basename } from './utils' -export async function followAccount(instanceName, accessToken, accountId) { +export async function followAccount (instanceName, accessToken, accountId) { let url = `${basename(instanceName)}/api/v1/accounts/${accountId}/follow` return postWithTimeout(url, null, auth(accessToken)) } -export async function unfollowAccount(instanceName, accessToken, accountId) { +export async function unfollowAccount (instanceName, accessToken, accountId) { let url = `${basename(instanceName)}/api/v1/accounts/${accountId}/unfollow` return postWithTimeout(url, null, auth(accessToken)) -} \ No newline at end of file +} diff --git a/routes/_api/statuses.js b/routes/_api/statuses.js index 0df1c1d..c416734 100644 --- a/routes/_api/statuses.js +++ b/routes/_api/statuses.js @@ -32,4 +32,4 @@ export async function pinStatus (instanceName, accessToken, statusId) { export async function unpinStatus (instanceName, accessToken, statusId) { let url = `${basename(instanceName)}/api/v1/statuses/${statusId}/unpin` return postWithTimeout(url, null, auth(accessToken)) -} \ No newline at end of file +} diff --git a/tests/serverActions.js b/tests/serverActions.js index aee0e9c..3bb98fd 100644 --- a/tests/serverActions.js +++ b/tests/serverActions.js @@ -1,8 +1,7 @@ import { favoriteStatus } from '../routes/_api/favorite' import fetch from 'node-fetch' -global.fetch = fetch - import { users } from './users' +global.fetch = fetch export async function favoriteStatusAsAdmin (statusId) { return favoriteStatus('localhost:3000', users.admin.accessToken, statusId) diff --git a/tests/spec/11-reblog-favorites-count.js b/tests/spec/11-reblog-favorites-count.js index 374b553..6973e1f 100644 --- a/tests/spec/11-reblog-favorites-count.js +++ b/tests/spec/11-reblog-favorites-count.js @@ -12,7 +12,7 @@ test('shows favorites', async t => { .expect(getFavoritesCount()).eql(2) .expect($('.icon-button[aria-label="Favorite"]').getAttribute('aria-pressed')).eql('true') .click($('.status-favs-reblogs').nth(1)) - .expect(getUrl()).match(/\/statuses\/[^\/]+\/favorites/) + .expect(getUrl()).match(/\/statuses\/[^/]+\/favorites/) .expect($('.search-result-account-name').nth(0).innerText).eql('foobar') .expect($('.search-result-account-username').nth(0).innerText).eql('@foobar') .expect($('.search-result-account-name').nth(1).innerText).eql('admin') @@ -26,7 +26,7 @@ test('shows boosts', async t => { .expect(getReblogsCount()).eql(1) .expect($('.icon-button[aria-label="Boost"]').getAttribute('aria-pressed')).eql('false') .click($('.status-favs-reblogs').nth(0)) - .expect(getUrl()).match(/\/statuses\/[^\/]+\/reblogs/) + .expect(getUrl()).match(/\/statuses\/[^/]+\/reblogs/) .expect($('.search-result-account-name').nth(0).innerText).eql('admin') .expect($('.search-result-account-username').nth(0).innerText).eql('@admin') }) diff --git a/tests/users.js b/tests/users.js index e577394..70ad7e1 100644 --- a/tests/users.js +++ b/tests/users.js @@ -23,4 +23,4 @@ export const users = { accessToken: 'e9a463ba1729ae0049a97a312af702cb3d08d84de1cc8d6da3fad90af068117b', id: 4 } -} \ No newline at end of file +}