From 355fcf1baee5d01fb9a7a9b9fc6897cba95372b0 Mon Sep 17 00:00:00 2001 From: Alexey Zakhlestin Date: Fri, 2 Mar 2018 13:52:09 +0300 Subject: [PATCH] =?UTF-8?q?=E2=8F=AAPartial=20Revert=20of=20"Fix=20new=20e?= =?UTF-8?q?slint=20errors"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit see https://github.com/eslint/eslint/issues/9992 e0db1acc04a7471b25ce0d5fb567a037feb2d5b3 --- app/models/attachment.js | 4 +- app/support/DbAdapter/index.js | 4 +- bin/count-daily-stats.js | 6 +-- bin/import_clikes.js | 6 +-- test/functional/postsV2.js | 4 +- test/functional/usersV2.js | 8 +-- test/unit/post.js | 16 +++--- test/unit/post_bubbling.js | 96 +++++++++++++++++----------------- test/unit/search.js | 24 ++++----- 9 files changed, 84 insertions(+), 84 deletions(-) diff --git a/app/models/attachment.js b/app/models/attachment.js index 67e426658..697290c7a 100644 --- a/app/models/attachment.js +++ b/app/models/attachment.js @@ -390,9 +390,9 @@ export function addModel(dbAdapter) { if (originalImage === null) { originalImage = promisifyAll(gm(originalFile)); } - for (const sizeId of thumbIds) { // eslint-disable-line no-await-in-loop + for (const sizeId of thumbIds) { const { w, h } = this.imageSizes[sizeId]; - await originalImage + await originalImage // eslint-disable-line no-await-in-loop .resizeExact(w, h) .profile(`${__dirname}/../../lib/assets/sRGB.icm`) .autoOrient() diff --git a/app/support/DbAdapter/index.js b/app/support/DbAdapter/index.js index fa7a3266b..1cffc4c73 100644 --- a/app/support/DbAdapter/index.js +++ b/app/support/DbAdapter/index.js @@ -59,9 +59,9 @@ class DbAdapterBase { * @param transaction */ async executeSerizlizableTransaction(transaction) { - while (true) { // eslint-disable-line no-constant-condition, no-await-in-loop + while (true) { // eslint-disable-line no-constant-condition try { - await this.database.transaction(async (trx) => { + await this.database.transaction(async (trx) => { // eslint-disable-line no-await-in-loop await trx.raw('SET TRANSACTION ISOLATION LEVEL SERIALIZABLE'); return transaction(trx); }); diff --git a/bin/count-daily-stats.js b/bin/count-daily-stats.js index e85d9c887..d2411a217 100755 --- a/bin/count-daily-stats.js +++ b/bin/count-daily-stats.js @@ -76,10 +76,10 @@ async function create_metric(metric, to_date, get_metric) { dt = await get_next_metric_update_date(metric); - while (!dt.isAfter(to_date)) { // eslint-disable-line no-await-in-loop + while (!dt.isAfter(to_date)) { const next_date = moment(dt).add(1, 'days'); - const res = await get_metric(dt, next_date); - await postgres('stats').insert({ dt, metric, value: res }); + const res = await get_metric(dt, next_date); // eslint-disable-line no-await-in-loop + await postgres('stats').insert({ dt, metric, value: res }); // eslint-disable-line no-await-in-loop process.stdout.write(`Creating stats for ${metric} for ${dt.format(`YYYY-MM-DD`)}: ${res}\n`); diff --git a/bin/import_clikes.js b/bin/import_clikes.js index 67041cf0b..b31c955f6 100644 --- a/bin/import_clikes.js +++ b/bin/import_clikes.js @@ -23,10 +23,10 @@ async function main() { const clikesData = JSON.parse(file); const clikesCount = clikesData.length; - for (const i in clikesData) { // eslint-disable-line no-await-in-loop + for (const i in clikesData) { const clike = clikesData[i]; process.stdout.write(`Processing clikes: ${parseInt(i) + 1} of ${clikesCount}\r`); - const [commentId, userId] = await dbAdapter._getCommentAndUserIntId(clike.comment_id, clike.user_id); + const [commentId, userId] = await dbAdapter._getCommentAndUserIntId(clike.comment_id, clike.user_id); // eslint-disable-line no-await-in-loop if (!commentId) { process.stderr.write(`Can't find comment "${clike.comment_id}": SKIP\n`); @@ -45,7 +45,7 @@ async function main() { }; try { - await postgres('comment_likes').insert(payload); + await postgres('comment_likes').insert(payload); // eslint-disable-line no-await-in-loop } catch (e) { if (e.message.includes('duplicate key value')) { continue; diff --git a/test/functional/postsV2.js b/test/functional/postsV2.js index 6f5566f68..d64e367cb 100644 --- a/test/functional/postsV2.js +++ b/test/functional/postsV2.js @@ -48,8 +48,8 @@ describe('TimelinesControllerV2', () => { describe('Comments folding test', () => { const expectFolding = async (nComments, expComments, expOmitted, allComments = false) => { - for (let n = 0; n < nComments; n++) { // eslint-disable-line no-await-in-loop - await createCommentAsync(luna, lunaPost.id, `Comment ${n + 1}`); + for (let n = 0; n < nComments; n++) { + await createCommentAsync(luna, lunaPost.id, `Comment ${n + 1}`); // eslint-disable-line no-await-in-loop } const post = await fetchPost(lunaPost.id, null, { allComments }); expect(post.posts.comments, 'to have length', expComments); diff --git a/test/functional/usersV2.js b/test/functional/usersV2.js index 8742d4ec6..d0aac4bab 100644 --- a/test/functional/usersV2.js +++ b/test/functional/usersV2.js @@ -163,9 +163,9 @@ describe('UsersControllerV2', () => { beforeEach(async () => { [user, ...readers] = await createTestUsers(readersCount + 1); - for (const reader of readers) { // eslint-disable-line no-await-in-loop + for (const reader of readers) { // Order is important - await subscribeToAsync(reader, user); + await subscribeToAsync(reader, user); // eslint-disable-line no-await-in-loop } }); @@ -188,9 +188,9 @@ describe('UsersControllerV2', () => { beforeEach(async () => { [user, ...friends] = await createTestUsers(friendsCount + 1); - for (const friend of friends) { // eslint-disable-line no-await-in-loop + for (const friend of friends) { // Order is important - await subscribeToAsync(user, friend); + await subscribeToAsync(user, friend); // eslint-disable-line no-await-in-loop } }); diff --git a/test/unit/post.js b/test/unit/post.js index 29520ba46..175fbcd1d 100644 --- a/test/unit/post.js +++ b/test/unit/post.js @@ -397,8 +397,8 @@ describe('Post', () => { }) it('should be possible to get all likes', async () => { - for (let i = 0; i < 10; i++) { // eslint-disable-line no-await-in-loop - await post.addLike(users[i]); + for (let i = 0; i < 10; i++) { + await post.addLike(users[i]); // eslint-disable-line no-await-in-loop } post.maxLikes = 'all' @@ -415,8 +415,8 @@ describe('Post', () => { }) it('should be possible to get some likes (properly sorted)', async () => { - for (let i = 0; i < 10; i++) { // eslint-disable-line no-await-in-loop - await post.addLike(users[i]); + for (let i = 0; i < 10; i++) { + await post.addLike(users[i]); // eslint-disable-line no-await-in-loop } post.maxLikes = 3 @@ -438,8 +438,8 @@ describe('Post', () => { post.currentUser = users[0].id // 2 likes -> 2 open - for (i = 0; i < 2; i++) { // eslint-disable-line no-await-in-loop - await post.addLike(users[i]); + for (i = 0; i < 2; i++) { + await post.addLike(users[i]); // eslint-disable-line no-await-in-loop } { @@ -635,13 +635,13 @@ describe('Post', () => { post = await userA.newPost(postAttrs) await post.create() - for (let i = 0; i < 10; i++) { // eslint-disable-line no-await-in-loop + for (let i = 0; i < 10; i++) { const commentAttrs = { body: 'Comment body', postId: post.id } comments[i] = userA.newComment(commentAttrs) - await comments[i].create(); + await comments[i].create() // eslint-disable-line no-await-in-loop } }) diff --git a/test/unit/post_bubbling.js b/test/unit/post_bubbling.js index 1b33b4acb..371cf1d7b 100644 --- a/test/unit/post_bubbling.js +++ b/test/unit/post_bubbling.js @@ -55,15 +55,15 @@ describe('PostBubbling', () => { await Promise.all([luna.create(), mars.create(), jupiter.create()]); lunaPosts = [] - for (const body of lunaPostsContent) { // eslint-disable-line no-await-in-loop - const post = await luna.newPost({ body }); - lunaPosts.push(await post.create()); + for (const body of lunaPostsContent) { + const post = await luna.newPost({ body }); // eslint-disable-line no-await-in-loop + lunaPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } marsPosts = [] - for (const body of marsPostsContent) { // eslint-disable-line no-await-in-loop - const post = await mars.newPost({ body }); - marsPosts.push(await post.create()); + for (const body of marsPostsContent) { + const post = await mars.newPost({ body }); // eslint-disable-line no-await-in-loop + marsPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } }) @@ -388,21 +388,21 @@ describe('PostBubbling', () => { await Promise.all([luna.create(), mars.create(), pluto.create(), jupiter.create()]); lunaPosts = [] - for (const body of lunaPostsContent) { // eslint-disable-line no-await-in-loop - const post = await luna.newPost({ body }); - lunaPosts.push(await post.create()); + for (const body of lunaPostsContent) { + const post = await luna.newPost({ body }); // eslint-disable-line no-await-in-loop + lunaPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } marsPosts = [] - for (const body of marsPostsContent) { // eslint-disable-line no-await-in-loop - const post = await mars.newPost({ body }); - marsPosts.push(await post.create()); + for (const body of marsPostsContent) { + const post = await mars.newPost({ body }); // eslint-disable-line no-await-in-loop + marsPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } plutoPosts = [] - for (const body of plutoPostsContent) { // eslint-disable-line no-await-in-loop - const post = await pluto.newPost({ body }); - plutoPosts.push(await post.create()); + for (const body of plutoPostsContent) { + const post = await pluto.newPost({ body }); // eslint-disable-line no-await-in-loop + plutoPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } }) @@ -472,9 +472,9 @@ describe('PostBubbling', () => { await mars.subscribeTo(jupiterTimelineId) await jupiter.subscribeTo(marsTimelineId) const jupiterPosts = [] - for (const body of jupiterPostsContent) { // eslint-disable-line no-await-in-loop - const post = await jupiter.newPost({ body }); - jupiterPosts.push(await post.create()); + for (const body of jupiterPostsContent) { + const post = await jupiter.newPost({ body }); // eslint-disable-line no-await-in-loop + jupiterPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } }) @@ -781,21 +781,21 @@ describe('PostBubbling', () => { await luna.update({ isPrivate: '1' }) lunaPosts = [] - for (const body of lunaPostsContent) { // eslint-disable-line no-await-in-loop - const post = await luna.newPost({ body }); - lunaPosts.push(await post.create()); + for (const body of lunaPostsContent) { + const post = await luna.newPost({ body }); // eslint-disable-line no-await-in-loop + lunaPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } marsPosts = [] - for (const body of marsPostsContent) { // eslint-disable-line no-await-in-loop - const post = await mars.newPost({ body }); - marsPosts.push(await post.create()); + for (const body of marsPostsContent) { + const post = await mars.newPost({ body }); // eslint-disable-line no-await-in-loop + marsPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } plutoPosts = [] - for (const body of plutoPostsContent) { // eslint-disable-line no-await-in-loop - const post = await pluto.newPost({ body }); - plutoPosts.push(await post.create()); + for (const body of plutoPostsContent) { + const post = await pluto.newPost({ body }); // eslint-disable-line no-await-in-loop + plutoPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } }) @@ -848,27 +848,27 @@ describe('PostBubbling', () => { easyfoxTimelineId = await easyfox.getPostsTimelineId() lunaPosts = [] - for (const body of lunaPostsContent) { // eslint-disable-line no-await-in-loop - const post = await luna.newPost({ body }); - lunaPosts.push(await post.create()); + for (const body of lunaPostsContent) { + const post = await luna.newPost({ body }); // eslint-disable-line no-await-in-loop + lunaPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } marsPosts = [] - for (const body of marsPostsContent) { // eslint-disable-line no-await-in-loop - const post = await mars.newPost({ body }); - marsPosts.push(await post.create()); + for (const body of marsPostsContent) { + const post = await mars.newPost({ body }); // eslint-disable-line no-await-in-loop + marsPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } plutoPosts = [] - for (const body of plutoPostsContent) { // eslint-disable-line no-await-in-loop - const post = await pluto.newPost({ body }); - plutoPosts.push(await post.create()); + for (const body of plutoPostsContent) { + const post = await pluto.newPost({ body }); // eslint-disable-line no-await-in-loop + plutoPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } easyfoxPosts = [] - for (const body of easyfoxPostsContent) { // eslint-disable-line no-await-in-loop - const post = await easyfox.newPost({ body, timelineIds: [easyfoxTimelineId] }); - easyfoxPosts.push(await post.create()); + for (const body of easyfoxPostsContent) { + const post = await easyfox.newPost({ body, timelineIds: [easyfoxTimelineId] }); // eslint-disable-line no-await-in-loop + easyfoxPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } }) @@ -964,21 +964,21 @@ describe('PostBubbling', () => { await Promise.all([luna.create(), mars.create(), pluto.create()]); lunaPosts = [] - for (const body of lunaPostsContent) { // eslint-disable-line no-await-in-loop - const post = await luna.newPost({ body }); - lunaPosts.push(await post.create()); + for (const body of lunaPostsContent) { + const post = await luna.newPost({ body }); // eslint-disable-line no-await-in-loop + lunaPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } marsPosts = [] - for (const body of marsPostsContent) { // eslint-disable-line no-await-in-loop - const post = await mars.newPost({ body }); - marsPosts.push(await post.create()); + for (const body of marsPostsContent) { + const post = await mars.newPost({ body }); // eslint-disable-line no-await-in-loop + marsPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } plutoPosts = [] - for (const body of plutoPostsContent) { // eslint-disable-line no-await-in-loop - const post = await pluto.newPost({ body }); - plutoPosts.push(await post.create()); + for (const body of plutoPostsContent) { + const post = await pluto.newPost({ body }); // eslint-disable-line no-await-in-loop + plutoPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } const [marsTimelineId, lunaTimelineId, plutoTimelineId] = await Promise.all([ diff --git a/test/unit/search.js b/test/unit/search.js index b7343252f..20f69945a 100644 --- a/test/unit/search.js +++ b/test/unit/search.js @@ -26,9 +26,9 @@ describe('FullTextSearch', () => { bannedByMarsUserIds = await mars.getBanIds() lunaPosts = [] - for (const body of lunaPostsContent) { // eslint-disable-line no-await-in-loop - const post = await luna.newPost({ body }); - lunaPosts.push(await post.create()); + for (const body of lunaPostsContent) { + const post = await luna.newPost({ body }); // eslint-disable-line no-await-in-loop + lunaPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } }) @@ -166,19 +166,19 @@ describe('FullTextSearch', () => { bannedByMarsUserIds = await mars.getBanIds() lunaPosts = [] - for (const body of lunaPostsContent) { // eslint-disable-line no-await-in-loop - const post = await luna.newPost({ body }); - lunaPosts.push(await post.create()); + for (const body of lunaPostsContent) { + const post = await luna.newPost({ body }); // eslint-disable-line no-await-in-loop + lunaPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } saturnPosts = [] - for (const body of saturnPostsContent) { // eslint-disable-line no-await-in-loop - const post = await saturn.newPost({ body }); - saturnPosts.push(await post.create()); + for (const body of saturnPostsContent) { + const post = await saturn.newPost({ body }); // eslint-disable-line no-await-in-loop + saturnPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } marsPosts = [] - for (const body of marsPostsContent) { // eslint-disable-line no-await-in-loop - const post = await mars.newPost({ body }); - marsPosts.push(await post.create()); + for (const body of marsPostsContent) { + const post = await mars.newPost({ body }); // eslint-disable-line no-await-in-loop + marsPosts.push(await post.create()); // eslint-disable-line no-await-in-loop } })