From 1faa8dc0c16060f0ff5521329cc52ec98d63c729 Mon Sep 17 00:00:00 2001 From: Valeriy S Date: Fri, 22 Feb 2019 16:38:45 +0300 Subject: [PATCH] fix: set a max-len rule for eslint --- .eslintrc.json | 4 ++++ api-server/server/boot_tests/challenge.test.js | 3 +++ api-server/server/utils/getSetAccessToken.test.js | 1 + client/src/pages/about.js | 2 ++ client/src/pages/donate-other.js | 2 ++ client/src/pages/support.js | 9 ++++++++- 6 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.eslintrc.json b/.eslintrc.json index 9b1ce4e06f..d68da12aff 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -3,6 +3,10 @@ "extends": ["@freecodecamp/eslint-config", "prettier", "prettier/react"], "plugins": ["prettier"], "rules": { + "max-len": [ + "error", + { "code": 80, "ignoreUrls": true, "ignoreTemplateLiterals": true } + ], "prettier/prettier": "error" }, "settings": { diff --git a/api-server/server/boot_tests/challenge.test.js b/api-server/server/boot_tests/challenge.test.js index 255a18fef3..5788211fea 100644 --- a/api-server/server/boot_tests/challenge.test.js +++ b/api-server/server/boot_tests/challenge.test.js @@ -180,6 +180,7 @@ describe('boot/challenge', () => { }); }); + // eslint-disable-next-line max-len it('returns the first challenge url if the provided id does not relate to a challenge', async () => { const challengeUrlResolver = await createChallengeUrlResolver(mockApp, { _getFirstChallenge: mockGetFirstChallenge @@ -349,6 +350,7 @@ describe('boot/challenge', () => { done(); }); + // eslint-disable-next-line max-len it('redirects to the url provided by the challengeUrlResolver', async done => { const challengeUrlResolver = await createChallengeUrlResolver(mockApp, { _getFirstChallenge: mockGetFirstChallenge @@ -369,6 +371,7 @@ describe('boot/challenge', () => { done(); }); + // eslint-disable-next-line max-len it('redirects to the first challenge for users without a currentChallengeId', async done => { const challengeUrlResolver = await createChallengeUrlResolver(mockApp, { _getFirstChallenge: mockGetFirstChallenge diff --git a/api-server/server/utils/getSetAccessToken.test.js b/api-server/server/utils/getSetAccessToken.test.js index cf57742b3b..937165194c 100644 --- a/api-server/server/utils/getSetAccessToken.test.js +++ b/api-server/server/utils/getSetAccessToken.test.js @@ -161,6 +161,7 @@ describe('getSetAccessToken', () => { }); describe('removeCookies', () => { + // eslint-disable-next-line max-len it('removes four cookies set in the lifetime of an authenticated session', () => { // expect.assertions(4); const req = mockReq(); diff --git a/client/src/pages/about.js b/client/src/pages/about.js index 66893f3c81..1fb85889cc 100644 --- a/client/src/pages/about.js +++ b/client/src/pages/about.js @@ -21,6 +21,7 @@ import { Link, Spacer } from '../components/helpers'; import './common-pages.css'; +/* eslint-disable max-len */ const AboutPage = () => { return ( @@ -335,6 +336,7 @@ const AboutPage = () => { ); }; +/* eslint-enable max-len */ AboutPage.displayName = 'AboutPage'; diff --git a/client/src/pages/donate-other.js b/client/src/pages/donate-other.js index da22f26386..324f7cee18 100644 --- a/client/src/pages/donate-other.js +++ b/client/src/pages/donate-other.js @@ -83,6 +83,7 @@ class DonateOtherPage extends Component { ); } + /* eslint-disable max-len */ render() { return ( @@ -222,6 +223,7 @@ class DonateOtherPage extends Component { ); } + /* eslint-enable max-len */ } DonateOtherPage.displayName = 'DonateOtherPage'; diff --git a/client/src/pages/support.js b/client/src/pages/support.js index d14a970e2a..dd541c9d1b 100644 --- a/client/src/pages/support.js +++ b/client/src/pages/support.js @@ -6,6 +6,7 @@ import { Link, Spacer } from '../components/helpers'; import './common-pages.css'; +/* eslint-disable max-len */ const SupportPage = () => { return ( @@ -43,7 +44,12 @@ const SupportPage = () => { cancel your donations right from your settings page. In the meantime, if you need to update or cancel your monthly donation, forward an invoice you received in your email to{' '} - team@freecodecamp.org{' '} + { + /* prettier-ignore */ + } + + team@freecodecamp.org + {' '} and tell us what you'd like us to do, and we'll take care of it for you in our database.

@@ -105,6 +111,7 @@ const SupportPage = () => {
); }; +/* eslint-enable max-len */ SupportPage.displayName = 'SupportPage';