diff --git a/.eslintrc.yml b/.eslintrc.yml index bb4c8a916c..509cabf1dc 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -46,6 +46,7 @@ rules: promise/prefer-await-to-then: 'error' func-style: ['error', 'declaration', { 'allowArrowFunctions': true }] new-cap: ['error', { 'capIsNew': true }] + import/order: ['error', { 'newlines-between': 'never' }] # Mocha-related. mocha/no-exclusive-tests: 'error' diff --git a/core/base-service/base-json.spec.js b/core/base-service/base-json.spec.js index 41bcc32306..4ecbc36d9e 100644 --- a/core/base-service/base-json.spec.js +++ b/core/base-service/base-json.spec.js @@ -3,7 +3,6 @@ const Joi = require('joi') const { expect } = require('chai') const sinon = require('sinon') - const BaseJsonService = require('./base-json') const dummySchema = Joi.object({ diff --git a/core/base-service/base-xml.spec.js b/core/base-service/base-xml.spec.js index aeba56ee69..3c20ab371d 100644 --- a/core/base-service/base-xml.spec.js +++ b/core/base-service/base-xml.spec.js @@ -3,7 +3,6 @@ const Joi = require('joi') const { expect } = require('chai') const sinon = require('sinon') - const BaseXmlService = require('./base-xml') const dummySchema = Joi.object({ diff --git a/core/base-service/base-yaml.js b/core/base-service/base-yaml.js index c8d857e455..6cea043c67 100644 --- a/core/base-service/base-yaml.js +++ b/core/base-service/base-yaml.js @@ -1,10 +1,10 @@ 'use strict' -const BaseService = require('./base') const emojic = require('emojic') +const yaml = require('js-yaml') +const BaseService = require('./base') const { InvalidResponse } = require('./errors') const trace = require('./trace') -const yaml = require('js-yaml') class BaseYamlService extends BaseService { async _requestYaml({ diff --git a/core/base-service/base.spec.js b/core/base-service/base.spec.js index e002f26c14..a3c06f63ed 100644 --- a/core/base-service/base.spec.js +++ b/core/base-service/base.spec.js @@ -4,7 +4,6 @@ const Joi = require('joi') const { expect } = require('chai') const sinon = require('sinon') const trace = require('./trace') - const { NotFound, Inaccessible, diff --git a/core/base-service/index.js b/core/base-service/index.js index 2f021c5185..7e7dd8a51f 100644 --- a/core/base-service/index.js +++ b/core/base-service/index.js @@ -7,10 +7,8 @@ const BaseStaticService = require('./base-static') const BaseSvgScrapingService = require('./base-svg-scraping') const BaseXmlService = require('./base-xml') const BaseYamlService = require('./base-yaml') - const deprecatedService = require('./deprecated-service') const redirector = require('./redirector') - const { NotFound, InvalidResponse, diff --git a/core/base-service/trace.js b/core/base-service/trace.js index 4d4575d3bf..97ef96c66c 100644 --- a/core/base-service/trace.js +++ b/core/base-service/trace.js @@ -1,6 +1,7 @@ 'use strict' const chalk = require('chalk') +const config = require('config').util.toObject() // Config is loaded globally but it would be better to inject it. To do that, // there needs to be one instance of the service created at registration time, @@ -9,7 +10,7 @@ const chalk = require('chalk') // thereby gaining access to the injected config. const { services: { trace: enableTraceLogging }, -} = require('config').util.toObject().public +} = config.public function _formatLabelForStage(stage, label) { const colorFn = { diff --git a/core/server/in-process-server-test-helpers.js b/core/server/in-process-server-test-helpers.js index e7f4c31262..fbf530a48d 100644 --- a/core/server/in-process-server-test-helpers.js +++ b/core/server/in-process-server-test-helpers.js @@ -1,7 +1,7 @@ 'use strict' -const Server = require('./server') const config = require('config').util.toObject() +const Server = require('./server') function createTestServer({ port }) { const serverConfig = { diff --git a/core/server/server.js b/core/server/server.js index 898be6cf0f..ea381f583e 100644 --- a/core/server/server.js +++ b/core/server/server.js @@ -1,9 +1,9 @@ 'use strict' const fs = require('fs') -const bytes = require('bytes') const path = require('path') const url = require('url') +const bytes = require('bytes') const Joi = require('joi') const Camp = require('camp') const makeBadge = require('../../gh-badges/lib/make-badge') diff --git a/core/server/server.spec.js b/core/server/server.spec.js index 73a2b3aea9..88ecaaf87c 100644 --- a/core/server/server.spec.js +++ b/core/server/server.spec.js @@ -1,12 +1,12 @@ 'use strict' +const fs = require('fs') +const path = require('path') const { expect } = require('chai') const fetch = require('node-fetch') const got = require('got') -const fs = require('fs') const isPng = require('is-png') const isSvg = require('is-svg') -const path = require('path') const sinon = require('sinon') const portfinder = require('portfinder') const Joi = require('joi') diff --git a/core/service-test-runner/cli.js b/core/service-test-runner/cli.js index 7d7a74aaef..4901085d27 100644 --- a/core/service-test-runner/cli.js +++ b/core/service-test-runner/cli.js @@ -54,8 +54,8 @@ const minimist = require('minimist') const envFlag = require('node-env-flag') const readAllStdinSync = require('read-all-stdin-sync') -const Runner = require('./runner') const { createTestServer } = require('../server/in-process-server-test-helpers') +const Runner = require('./runner') require('../../lib/unhandled-rejection.spec') diff --git a/core/service-test-runner/service-tester.js b/core/service-test-runner/service-tester.js index e9fc897a0e..35d439f703 100644 --- a/core/service-test-runner/service-tester.js +++ b/core/service-test-runner/service-tester.js @@ -1,10 +1,11 @@ 'use strict' const emojic = require('emojic') +const trace = require('../base-service/trace') const frisby = require('./icedfrisby-no-nock')( + // eslint-disable-next-line import/order require('icedfrisby-nock')(require('icedfrisby')) ) -const trace = require('../base-service/trace') /** * Encapsulate a suite of tests. Create new tests using create() and register diff --git a/core/token-pooling/redis-token-persistence.js b/core/token-pooling/redis-token-persistence.js index 7cda161647..6646f17af0 100644 --- a/core/token-pooling/redis-token-persistence.js +++ b/core/token-pooling/redis-token-persistence.js @@ -1,7 +1,7 @@ 'use strict' -const redis = require('redis') const { promisify } = require('util') +const redis = require('redis') const log = require('../server/log') const TokenPersistence = require('./token-persistence') diff --git a/doc/service-tests.md b/doc/service-tests.md index 0660f8a576..d62587268e 100644 --- a/doc/service-tests.md +++ b/doc/service-tests.md @@ -36,7 +36,6 @@ We'll start by adding some boilerplate to our file: 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) ``` diff --git a/frontend/components/category-headings.spec.js b/frontend/components/category-headings.spec.js index 1a8a72482d..c8de2b2556 100644 --- a/frontend/components/category-headings.spec.js +++ b/frontend/components/category-headings.spec.js @@ -1,8 +1,8 @@ import React from 'react' import { shallow } from 'enzyme' import { expect } from 'chai' -import { CategoryHeading, CategoryHeadings } from './category-headings' import { H3 } from './common' +import { CategoryHeading, CategoryHeadings } from './category-headings' import './enzyme-conf.spec' diff --git a/frontend/components/customizer/path-builder.spec.js b/frontend/components/customizer/path-builder.spec.js index fdf59b3d44..030aef1bbf 100644 --- a/frontend/components/customizer/path-builder.spec.js +++ b/frontend/components/customizer/path-builder.spec.js @@ -1,6 +1,6 @@ -import PathBuilder from './path-builder' import { test, given } from 'sazerac' import pathToRegexp from 'path-to-regexp' +import PathBuilder from './path-builder' describe('', function() { const tokens = pathToRegexp.parse('github/license/:user/:repo') diff --git a/frontend/components/header.js b/frontend/components/header.js index 7baa33af63..6256e793c6 100644 --- a/frontend/components/header.js +++ b/frontend/components/header.js @@ -1,8 +1,8 @@ import { Link } from 'gatsby' import React from 'react' import styled from 'styled-components' -import { VerticalSpace } from './common' import Logo from '../images/logo.svg' +import { VerticalSpace } from './common' const Highlights = styled.p` font-style: italic; diff --git a/frontend/lib/service-definitions/index.js b/frontend/lib/service-definitions/index.js index 166843308d..d36c744646 100644 --- a/frontend/lib/service-definitions/index.js +++ b/frontend/lib/service-definitions/index.js @@ -1,5 +1,4 @@ import groupBy from 'lodash.groupby' - import { services, categories } from '../../../service-definitions.yml' export { services, categories } from '../../../service-definitions.yml' diff --git a/gh-badges/lib/badge-cli.spec.js b/gh-badges/lib/badge-cli.spec.js index 8f9225ef05..4c0478264d 100644 --- a/gh-badges/lib/badge-cli.spec.js +++ b/gh-badges/lib/badge-cli.spec.js @@ -4,7 +4,6 @@ const path = require('path') const isPng = require('is-png') const isSvg = require('is-svg') const { spawn } = require('child-process-promise') - const { expect, use } = require('chai') use(require('chai-string')) use(require('sinon-chai')) diff --git a/gh-badges/lib/index.spec.js b/gh-badges/lib/index.spec.js index ee0591d4dc..68a6e7d3b1 100644 --- a/gh-badges/lib/index.spec.js +++ b/gh-badges/lib/index.spec.js @@ -1,8 +1,8 @@ 'use strict' const { expect } = require('chai') -const { BadgeFactory } = require('./index') const isSvg = require('is-svg') +const { BadgeFactory } = require('.') const bf = new BadgeFactory() diff --git a/lib/logos.js b/lib/logos.js index 4708e31dc8..a818d83dd5 100644 --- a/lib/logos.js +++ b/lib/logos.js @@ -3,7 +3,6 @@ const { toSvgColor } = require('../gh-badges/lib/color') const coalesce = require('../core/base-service/coalesce') const { svg2base64 } = require('./svg-helpers') - const logos = require('./load-logos')() const simpleIcons = require('./load-simple-icons')() diff --git a/lib/server-secrets.js b/lib/server-secrets.js index ffd41f518b..55358ae3bf 100644 --- a/lib/server-secrets.js +++ b/lib/server-secrets.js @@ -2,6 +2,8 @@ const fs = require('fs') const path = require('path') +const config = require('config').util.toObject() + const legacySecretsPath = path.join(__dirname, '..', 'private', 'secret.json') if (fs.existsSync(legacySecretsPath)) { console.error( @@ -10,6 +12,4 @@ if (fs.existsSync(legacySecretsPath)) { process.exit(1) } -const config = require('config').util.toObject() - module.exports = config.private diff --git a/scripts/badge-cli.js b/scripts/badge-cli.js index 3bf5da67f4..3f4868e274 100644 --- a/scripts/badge-cli.js +++ b/scripts/badge-cli.js @@ -1,13 +1,12 @@ 'use strict' const { URL } = require('url') +const config = require('config').util.toObject() const got = require('got') const emojic = require('emojic') const Server = require('../core/server/server') const trace = require('../core/base-service/trace') -const config = require('config').util.toObject() - function normalizeBadgeUrl(url) { // Provide a base URL in order to accept fragments. const { pathname, searchParams } = new URL(url, 'http://example.com') diff --git a/scripts/export-service-definitions-cli.js b/scripts/export-service-definitions-cli.js index 5994515ca0..e761abb8b8 100644 --- a/scripts/export-service-definitions-cli.js +++ b/scripts/export-service-definitions-cli.js @@ -1,7 +1,6 @@ 'use strict' const yaml = require('js-yaml') - const { collectDefinitions } = require('../core/base-service/loader') const definitions = collectDefinitions() diff --git a/scripts/refactoring-cli.js b/scripts/refactoring-cli.js index 8981e4a2b2..357d6d0cf8 100644 --- a/scripts/refactoring-cli.js +++ b/scripts/refactoring-cli.js @@ -1,7 +1,6 @@ 'use strict' const chalk = require('chalk') - const { namedColors } = require('../gh-badges/lib/color') const { floorCount } = require('../lib/color-formatters') const { loadServiceClasses } = require('../core/base-service/loader') diff --git a/server.js b/server.js index 1b77c7e644..efc81f32ba 100644 --- a/server.js +++ b/server.js @@ -1,4 +1,5 @@ 'use strict' +/* eslint-disable import/order */ require('dotenv').config() diff --git a/services/amo/amo-downloads.service.js b/services/amo/amo-downloads.service.js index 2170e6aa36..ba6e492ac8 100644 --- a/services/amo/amo-downloads.service.js +++ b/services/amo/amo-downloads.service.js @@ -2,7 +2,6 @@ const { metric } = require('../../lib/text-formatters') const { downloadCount } = require('../../lib/color-formatters') - const { BaseAmoService, keywords } = require('./amo-base') module.exports = class AmoDownloads extends BaseAmoService { diff --git a/services/ansible/ansible-quality.tester.js b/services/ansible/ansible-quality.tester.js index 5add4cb7c4..e7a812f414 100644 --- a/services/ansible/ansible-quality.tester.js +++ b/services/ansible/ansible-quality.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { nonNegativeInteger } = require('../validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('quality score (valid)') diff --git a/services/appveyor/appveyor-ci.service.js b/services/appveyor/appveyor-ci.service.js index 0fe8bf2193..e8548afdcb 100644 --- a/services/appveyor/appveyor-ci.service.js +++ b/services/appveyor/appveyor-ci.service.js @@ -1,8 +1,7 @@ 'use strict' -const AppVeyorBase = require('./appveyor-base') - const { renderBuildStatusBadge } = require('../../lib/build-status') +const AppVeyorBase = require('./appveyor-base') module.exports = class AppVeyorCi extends AppVeyorBase { static get route() { diff --git a/services/appveyor/appveyor-ci.tester.js b/services/appveyor/appveyor-ci.tester.js index 0d53289510..8128f84af8 100644 --- a/services/appveyor/appveyor-ci.tester.js +++ b/services/appveyor/appveyor-ci.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isBuildStatus } = require('../../lib/build-status') - const t = (module.exports = require('../tester').createServiceTester()) t.create('CI status') diff --git a/services/appveyor/appveyor-tests.tester.js b/services/appveyor/appveyor-tests.tester.js index 25acacd4a3..8f67ffe53d 100644 --- a/services/appveyor/appveyor-tests.tester.js +++ b/services/appveyor/appveyor-tests.tester.js @@ -1,7 +1,8 @@ 'use strict' -const Joi = require('joi') const queryString = require('querystring') +const Joi = require('joi') +const t = (module.exports = require('../tester').createServiceTester()) const isAppveyorTestTotals = Joi.string().regex( /^[0-9]+ passed(, [0-9]+ failed)?(, [0-9]+ skipped)?$/ @@ -19,8 +20,6 @@ const isCompactCustomAppveyorTestTotals = Joi.string().regex( /^💃 [0-9]+( \| 🤦‍♀️ [0-9]+)?( \| 🤷 [0-9]+)?$/ ) -const t = (module.exports = require('../tester').createServiceTester()) - t.create('Test status') .timeout(10000) .get('/NZSmartie/coap-net-iu0to.json') diff --git a/services/azure-devops/azure-devops-build.tester.js b/services/azure-devops/azure-devops-build.tester.js index 2a50302012..8e487895fe 100644 --- a/services/azure-devops/azure-devops-build.tester.js +++ b/services/azure-devops/azure-devops-build.tester.js @@ -2,12 +2,11 @@ const Joi = require('joi') const { isBuildStatus } = require('../../lib/build-status') +const t = (module.exports = require('../tester').createServiceTester()) // https://dev.azure.com/totodem/Shields.io is a public Azure DevOps project // solely created for Shields.io testing. -const t = (module.exports = require('../tester').createServiceTester()) - t.create('default branch') .get('/totodem/8cf3ec0e-d0c2-4fcd-8206-ad204f254a96/2.json') .expectJSONTypes( diff --git a/services/azure-devops/azure-devops-coverage.service.js b/services/azure-devops/azure-devops-coverage.service.js index 73ff5c4d0b..04a53f930c 100644 --- a/services/azure-devops/azure-devops-coverage.service.js +++ b/services/azure-devops/azure-devops-coverage.service.js @@ -1,6 +1,9 @@ 'use strict' const Joi = require('joi') +const { + coveragePercentage: coveragePercentageColor, +} = require('../../lib/color-formatters') const AzureDevOpsBase = require('./azure-devops-base') const { keywords, getHeaders } = require('./azure-devops-helpers') @@ -24,10 +27,6 @@ const documentation = ` https://img.shields.io/azure-devops/coverage/ORGANIZATION/PROJECT/DEFINITION_ID/NAMED_BRANCH.svg.

` -const { - coveragePercentage: coveragePercentageColor, -} = require('../../lib/color-formatters') - const buildCodeCoverageSchema = Joi.object({ coverageData: Joi.array() .items( diff --git a/services/azure-devops/azure-devops-coverage.tester.js b/services/azure-devops/azure-devops-coverage.tester.js index fae2041e9c..0f75e03f3c 100644 --- a/services/azure-devops/azure-devops-coverage.tester.js +++ b/services/azure-devops/azure-devops-coverage.tester.js @@ -2,6 +2,7 @@ const Joi = require('joi') const { isIntegerPercentage } = require('../test-validators') +const t = (module.exports = require('../tester').createServiceTester()) const org = 'swellaby' const project = 'opensource' @@ -53,8 +54,6 @@ const secondLinesCovStat = { const expCoverageSingleReport = '83%' const expCoverageMultipleReports = '77%' -const t = (module.exports = require('../tester').createServiceTester()) - t.create('default branch coverage') .get(`${uriPrefix}/${linuxDefinitionId}.json`) .expectJSONTypes( diff --git a/services/azure-devops/azure-devops-release.tester.js b/services/azure-devops/azure-devops-release.tester.js index 203e951b9d..fe7b0acf6d 100644 --- a/services/azure-devops/azure-devops-release.tester.js +++ b/services/azure-devops/azure-devops-release.tester.js @@ -2,12 +2,11 @@ const Joi = require('joi') const { isBuildStatus } = require('../../lib/build-status') +const t = (module.exports = require('../tester').createServiceTester()) // https://dev.azure.com/totodem/Shields.io is a public Azure DevOps project // solely created for Shields.io testing. -const t = (module.exports = require('../tester').createServiceTester()) - t.create('release status is succeeded') .get('/totodem/8cf3ec0e-d0c2-4fcd-8206-ad204f254a96/1/1.json') .expectJSONTypes( diff --git a/services/azure-devops/azure-devops-tests.service.js b/services/azure-devops/azure-devops-tests.service.js index 1079f83b73..daf5f9e24a 100644 --- a/services/azure-devops/azure-devops-tests.service.js +++ b/services/azure-devops/azure-devops-tests.service.js @@ -1,9 +1,9 @@ 'use strict' const Joi = require('joi') +const { renderTestResultBadge } = require('../../lib/text-formatters') const AzureDevOpsBase = require('./azure-devops-base') const { getHeaders } = require('./azure-devops-helpers') -const { renderTestResultBadge } = require('../../lib/text-formatters') const documentation = `

diff --git a/services/azure-devops/azure-devops-tests.tester.js b/services/azure-devops/azure-devops-tests.tester.js index ed4383659a..fb2bf20fc2 100644 --- a/services/azure-devops/azure-devops-tests.tester.js +++ b/services/azure-devops/azure-devops-tests.tester.js @@ -1,6 +1,7 @@ 'use strict' const Joi = require('joi') +const t = (module.exports = require('../tester').createServiceTester()) const org = 'azuredevops-powershell' const project = 'azuredevops-powershell' @@ -113,8 +114,6 @@ const isCompactCustomAzureDevOpsTestTotals = isAzureDevOpsTestTotals( true ) -const t = (module.exports = require('../tester').createServiceTester()) - t.create('unknown build definition') .get(`${uriPrefix}/${nonExistentDefinitionId}.json`) .expectJSON({ name: 'tests', value: 'build pipeline not found' }) diff --git a/services/beerpay/beerpay.tester.js b/services/beerpay/beerpay.tester.js index 92e6024768..64b83ba222 100644 --- a/services/beerpay/beerpay.tester.js +++ b/services/beerpay/beerpay.tester.js @@ -2,11 +2,10 @@ const Joi = require('joi') const { withRegex } = require('../test-validators') +const t = (module.exports = require('../tester').createServiceTester()) const amountOfMoney = withRegex(/^\$[0-9]+(\.[0-9]+)?/) -const t = (module.exports = require('../tester').createServiceTester()) - t.create('funding') .get('/hashdog/scrapfy-chrome-extension.json') .expectJSONTypes( diff --git a/services/bintray/bintray.service.js b/services/bintray/bintray.service.js index d71465eb16..e04709868d 100644 --- a/services/bintray/bintray.service.js +++ b/services/bintray/bintray.service.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const { renderVersionBadge } = require('../../lib/version') const serverSecrets = require('../../lib/server-secrets') const { BaseJsonService } = require('..') diff --git a/services/bintray/bintray.tester.js b/services/bintray/bintray.tester.js index cf4d75c628..38664c1655 100644 --- a/services/bintray/bintray.tester.js +++ b/services/bintray/bintray.tester.js @@ -4,7 +4,6 @@ const Joi = require('joi') const { isVPlusDottedVersionNClausesWithOptionalSuffix, } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('version') diff --git a/services/bitbucket/bitbucket.tester.js b/services/bitbucket/bitbucket.tester.js index 3923a0de88..83eae86e2b 100644 --- a/services/bitbucket/bitbucket.tester.js +++ b/services/bitbucket/bitbucket.tester.js @@ -2,6 +2,8 @@ const Joi = require('joi') const { ServiceTester } = require('../tester') +const { isMetric, isMetricOpenIssues } = require('../test-validators') +const { isBuildStatus } = require('../../lib/build-status') const { mockBitbucketCreds, mockBitbucketServerCreds, @@ -9,8 +11,6 @@ const { user, pass, } = require('./bitbucket-test-helpers') -const { isMetric, isMetricOpenIssues } = require('../test-validators') -const { isBuildStatus } = require('../../lib/build-status') const t = (module.exports = new ServiceTester({ id: 'bitbucket', diff --git a/services/bower/bower-license.service.js b/services/bower/bower-license.service.js index a4cf4d0a37..3ce517833a 100644 --- a/services/bower/bower-license.service.js +++ b/services/bower/bower-license.service.js @@ -1,7 +1,7 @@ 'use strict' -const BaseBowerService = require('./bower-base') const { renderLicenseBadge } = require('../../lib/licenses') +const BaseBowerService = require('./bower-base') module.exports = class BowerLicense extends BaseBowerService { static get category() { diff --git a/services/bower/bower-version.tester.js b/services/bower/bower-version.tester.js index 5cd2bf6862..447e871f10 100644 --- a/services/bower/bower-version.tester.js +++ b/services/bower/bower-version.tester.js @@ -2,13 +2,12 @@ const Joi = require('joi') const { isVPlusDottedVersionAtLeastOne } = require('../test-validators') +const t = (module.exports = require('../tester').createServiceTester()) const isBowerPrereleaseVersion = Joi.string().regex( /^v\d+(\.\d+)?(\.\d+)?(-?[.\w\d])+?$/ ) -const t = (module.exports = require('../tester').createServiceTester()) - t.create('version') .timeout(10000) .get('/v/bootstrap.json') diff --git a/services/bstats/bstats-players.tester.js b/services/bstats/bstats-players.tester.js index 1337236ca4..b2b4a01bb7 100644 --- a/services/bstats/bstats-players.tester.js +++ b/services/bstats/bstats-players.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Players') diff --git a/services/bstats/bstats-servers.tester.js b/services/bstats/bstats-servers.tester.js index ee16c98760..72137a3067 100644 --- a/services/bstats/bstats-servers.tester.js +++ b/services/bstats/bstats-servers.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Servers') diff --git a/services/cdnjs/cdnjs.tester.js b/services/cdnjs/cdnjs.tester.js index 4618f25a5b..bfda78a78b 100644 --- a/services/cdnjs/cdnjs.tester.js +++ b/services/cdnjs/cdnjs.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isVPlusTripleDottedVersion } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('cdnjs (valid)') diff --git a/services/cii-best-practices/cii-best-practices.tester.js b/services/cii-best-practices/cii-best-practices.tester.js index df1e28f803..bf590eb633 100644 --- a/services/cii-best-practices/cii-best-practices.tester.js +++ b/services/cii-best-practices/cii-best-practices.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { withRegex } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('live: level known project') diff --git a/services/clojars/clojars-downloads.tester.js b/services/clojars/clojars-downloads.tester.js index 06f79a4319..cbfccdd265 100644 --- a/services/clojars/clojars-downloads.tester.js +++ b/services/clojars/clojars-downloads.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('clojars downloads (valid)') diff --git a/services/clojars/clojars-version.tester.js b/services/clojars/clojars-version.tester.js index dd6efccfe1..d61bcc17e2 100644 --- a/services/clojars/clojars-version.tester.js +++ b/services/clojars/clojars-version.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('clojars (valid)') diff --git a/services/cocoapods/cocoapods-docs.tester.js b/services/cocoapods/cocoapods-docs.tester.js index 3edb8992c2..610903b041 100644 --- a/services/cocoapods/cocoapods-docs.tester.js +++ b/services/cocoapods/cocoapods-docs.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isIntegerPercentage } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('doc percent (valid)') diff --git a/services/cocoapods/cocoapods-platform.tester.js b/services/cocoapods/cocoapods-platform.tester.js index 8389e0ccdd..78e2b5ca15 100644 --- a/services/cocoapods/cocoapods-platform.tester.js +++ b/services/cocoapods/cocoapods-platform.tester.js @@ -1,13 +1,12 @@ 'use strict' const Joi = require('joi') +const t = (module.exports = require('../tester').createServiceTester()) const isPlatform = Joi.string().regex( /^(osx|ios|tvos|watchos)( \| (osx|ios|tvos|watchos))*$/ ) -const t = (module.exports = require('../tester').createServiceTester()) - t.create('platform (valid)') .get('/AFNetworking.json') .expectJSONTypes( diff --git a/services/cocoapods/cocoapods-version.tester.js b/services/cocoapods/cocoapods-version.tester.js index 0f884bcc01..624111661c 100644 --- a/services/cocoapods/cocoapods-version.tester.js +++ b/services/cocoapods/cocoapods-version.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isVPlusDottedVersionAtLeastOne } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('version (valid)') diff --git a/services/codacy/codacy-coverage.tester.js b/services/codacy/codacy-coverage.tester.js index 0da5796bf8..9007eb3650 100644 --- a/services/codacy/codacy-coverage.tester.js +++ b/services/codacy/codacy-coverage.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isIntegerPercentage } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Coverage') diff --git a/services/codacy/codacy-grade.tester.js b/services/codacy/codacy-grade.tester.js index 55168e6b10..8a0b4aca6b 100644 --- a/services/codacy/codacy-grade.tester.js +++ b/services/codacy/codacy-grade.tester.js @@ -1,9 +1,8 @@ 'use strict' const Joi = require('joi') -const { codacyGrade } = require('./codacy-helpers') - const t = (module.exports = require('../tester').createServiceTester()) +const { codacyGrade } = require('./codacy-helpers') t.create('Code quality') .get('/grade/e27821fb6289410b8f58338c7e0bc686.json') diff --git a/services/conda/conda-downloads.service.js b/services/conda/conda-downloads.service.js index 4e598c5d18..ab381d8d7a 100644 --- a/services/conda/conda-downloads.service.js +++ b/services/conda/conda-downloads.service.js @@ -1,8 +1,8 @@ 'use strict' -const BaseCondaService = require('./conda-base') const { metric } = require('../../lib/text-formatters') const { downloadCount } = require('../../lib/color-formatters') +const BaseCondaService = require('./conda-base') module.exports = class CondaDownloads extends BaseCondaService { static get category() { diff --git a/services/conda/conda-version.service.js b/services/conda/conda-version.service.js index 175267bca9..69e4ae1edd 100644 --- a/services/conda/conda-version.service.js +++ b/services/conda/conda-version.service.js @@ -1,8 +1,8 @@ 'use strict' -const BaseCondaService = require('./conda-base') const { addv: versionText } = require('../../lib/text-formatters') const { version: versionColor } = require('../../lib/color-formatters') +const BaseCondaService = require('./conda-base') module.exports = class CondaDownloads extends BaseCondaService { static get category() { diff --git a/services/continuousphp/continuousphp.tester.js b/services/continuousphp/continuousphp.tester.js index 5eabd255e8..59516d6efc 100644 --- a/services/continuousphp/continuousphp.tester.js +++ b/services/continuousphp/continuousphp.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isBuildStatus } = require('../../lib/build-status') - const t = (module.exports = require('../tester').createServiceTester()) t.create('build status on default branch') diff --git a/services/cookbook/cookbook.tester.js b/services/cookbook/cookbook.tester.js index fe8f619669..7af720aa58 100644 --- a/services/cookbook/cookbook.tester.js +++ b/services/cookbook/cookbook.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isVPlusDottedVersionAtLeastOne } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('version') diff --git a/services/cpan/cpan-version.service.js b/services/cpan/cpan-version.service.js index 7deac37ac2..f6800b1ef2 100644 --- a/services/cpan/cpan-version.service.js +++ b/services/cpan/cpan-version.service.js @@ -1,7 +1,7 @@ 'use strict' -const BaseCpanService = require('./cpan') const { renderVersionBadge } = require('../../lib/version') +const BaseCpanService = require('./cpan') module.exports = class CpanVersion extends BaseCpanService { static get category() { diff --git a/services/debug/debug.tester.js b/services/debug/debug.tester.js index 6c1aad39d1..efb0cfa086 100644 --- a/services/debug/debug.tester.js +++ b/services/debug/debug.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('start time') diff --git a/services/dependabot/dependabot.tester.js b/services/dependabot/dependabot.tester.js index 59fc2c5f51..7aca941740 100644 --- a/services/dependabot/dependabot.tester.js +++ b/services/dependabot/dependabot.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isIntegerPercentage } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('semver stability (valid)') diff --git a/services/discord/discord.tester.js b/services/discord/discord.tester.js index 6d9a484c80..d4da5cd918 100644 --- a/services/discord/discord.tester.js +++ b/services/discord/discord.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('gets status for Reactiflux') diff --git a/services/docker/docker-automated.tester.js b/services/docker/docker-automated.tester.js index fb14a8820c..48490c7ba4 100644 --- a/services/docker/docker-automated.tester.js +++ b/services/docker/docker-automated.tester.js @@ -1,10 +1,10 @@ 'use strict' const Joi = require('joi') -const { dockerBlue } = require('./docker-helpers') -const isAutomatedBuildStatus = Joi.string().valid('automated', 'manual') - const t = (module.exports = require('../tester').createServiceTester()) +const { dockerBlue } = require('./docker-helpers') + +const isAutomatedBuildStatus = Joi.string().valid('automated', 'manual') t.create('docker automated build (valid, library)') .get('/_/ubuntu.json') diff --git a/services/docker/docker-build.tester.js b/services/docker/docker-build.tester.js index 670d4217d7..c2515fe247 100644 --- a/services/docker/docker-build.tester.js +++ b/services/docker/docker-build.tester.js @@ -1,10 +1,9 @@ 'use strict' const Joi = require('joi') -const { dockerBlue } = require('./docker-helpers') const { isBuildStatus } = require('../../lib/build-status') - const t = (module.exports = require('../tester').createServiceTester()) +const { dockerBlue } = require('./docker-helpers') t.create('docker build status (valid, user)') .get('/jrottenberg/ffmpeg.json') diff --git a/services/docker/docker-pulls.tester.js b/services/docker/docker-pulls.tester.js index 381942a5e8..0b29ca0ce7 100644 --- a/services/docker/docker-pulls.tester.js +++ b/services/docker/docker-pulls.tester.js @@ -1,10 +1,9 @@ 'use strict' const Joi = require('joi') -const { dockerBlue } = require('./docker-helpers') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) +const { dockerBlue } = require('./docker-helpers') t.create('docker pulls (valid, library)') .get('/_/ubuntu.json?style=_shields_test') diff --git a/services/docker/docker-stars.tester.js b/services/docker/docker-stars.tester.js index 61c97b908a..d3a4b57fa5 100644 --- a/services/docker/docker-stars.tester.js +++ b/services/docker/docker-stars.tester.js @@ -2,9 +2,8 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') -const { dockerBlue } = require('./docker-helpers') - const t = (module.exports = require('../tester').createServiceTester()) +const { dockerBlue } = require('./docker-helpers') t.create('docker stars (valid, library)') .get('/_/ubuntu.json?style=_shields_test') diff --git a/services/dub/dub-version.tester.js b/services/dub/dub-version.tester.js index e8e21d56e6..81f045a1ed 100644 --- a/services/dub/dub-version.tester.js +++ b/services/dub/dub-version.tester.js @@ -4,7 +4,6 @@ const Joi = require('joi') const { isVPlusDottedVersionNClausesWithOptionalSuffix, } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('version (valid)') diff --git a/services/dynamic/dynamic-json.tester.js b/services/dynamic/dynamic-json.tester.js index c998d8348c..582b07986f 100644 --- a/services/dynamic/dynamic-json.tester.js +++ b/services/dynamic/dynamic-json.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { expect } = require('chai') - const t = (module.exports = require('../tester').createServiceTester()) t.create('No URL specified') diff --git a/services/dynamic/dynamic-xml.tester.js b/services/dynamic/dynamic-xml.tester.js index 428594198b..ef1bc846d4 100644 --- a/services/dynamic/dynamic-xml.tester.js +++ b/services/dynamic/dynamic-xml.tester.js @@ -3,7 +3,6 @@ const Joi = require('joi') const { expect } = require('chai') const { isSemver } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('No URL specified') diff --git a/services/eclipse-marketplace/eclipse-marketplace-downloads.service.js b/services/eclipse-marketplace/eclipse-marketplace-downloads.service.js index 320cef8665..3c123c1844 100644 --- a/services/eclipse-marketplace/eclipse-marketplace-downloads.service.js +++ b/services/eclipse-marketplace/eclipse-marketplace-downloads.service.js @@ -1,12 +1,12 @@ 'use strict' const Joi = require('joi') -const EclipseMarketplaceBase = require('./eclipse-marketplace-base') const { metric } = require('../../lib/text-formatters') const { downloadCount: downloadCountColor, } = require('../../lib/color-formatters') const { nonNegativeInteger } = require('../validators') +const EclipseMarketplaceBase = require('./eclipse-marketplace-base') const monthlyResponseSchema = Joi.object({ marketplace: Joi.object({ diff --git a/services/eclipse-marketplace/eclipse-marketplace-favorites.service.js b/services/eclipse-marketplace/eclipse-marketplace-favorites.service.js index 4f85e3e15e..0b7f16ee27 100644 --- a/services/eclipse-marketplace/eclipse-marketplace-favorites.service.js +++ b/services/eclipse-marketplace/eclipse-marketplace-favorites.service.js @@ -1,8 +1,8 @@ 'use strict' const Joi = require('joi') -const EclipseMarketplaceBase = require('./eclipse-marketplace-base') const { nonNegativeInteger } = require('../validators') +const EclipseMarketplaceBase = require('./eclipse-marketplace-base') const favoritesResponseSchema = Joi.object({ marketplace: Joi.object({ diff --git a/services/eclipse-marketplace/eclipse-marketplace-favorites.tester.js b/services/eclipse-marketplace/eclipse-marketplace-favorites.tester.js index 392a9262c5..f8aba22ef2 100644 --- a/services/eclipse-marketplace/eclipse-marketplace-favorites.tester.js +++ b/services/eclipse-marketplace/eclipse-marketplace-favorites.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('favorites count') diff --git a/services/eclipse-marketplace/eclipse-marketplace-update.service.js b/services/eclipse-marketplace/eclipse-marketplace-update.service.js index 4bddd1edbd..41ea27e2a6 100644 --- a/services/eclipse-marketplace/eclipse-marketplace-update.service.js +++ b/services/eclipse-marketplace/eclipse-marketplace-update.service.js @@ -1,10 +1,10 @@ 'use strict' const Joi = require('joi') -const EclipseMarketplaceBase = require('./eclipse-marketplace-base') const { formatDate } = require('../../lib/text-formatters') const { age: ageColor } = require('../../lib/color-formatters') const { nonNegativeInteger } = require('../validators') +const EclipseMarketplaceBase = require('./eclipse-marketplace-base') const updateResponseSchema = Joi.object({ marketplace: Joi.object({ diff --git a/services/eclipse-marketplace/eclipse-marketplace-update.tester.js b/services/eclipse-marketplace/eclipse-marketplace-update.tester.js index ddc6cd598f..c33bdc44e9 100644 --- a/services/eclipse-marketplace/eclipse-marketplace-update.tester.js +++ b/services/eclipse-marketplace/eclipse-marketplace-update.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isFormattedDate } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('last update date') diff --git a/services/eclipse-marketplace/eclipse-marketplace-version.service.js b/services/eclipse-marketplace/eclipse-marketplace-version.service.js index 99a7f6040b..d9b5dda00b 100644 --- a/services/eclipse-marketplace/eclipse-marketplace-version.service.js +++ b/services/eclipse-marketplace/eclipse-marketplace-version.service.js @@ -1,8 +1,8 @@ 'use strict' const Joi = require('joi') -const EclipseMarketplaceBase = require('./eclipse-marketplace-base') const { renderVersionBadge } = require('../../lib/version') +const EclipseMarketplaceBase = require('./eclipse-marketplace-base') const versionResponseSchema = Joi.object({ marketplace: Joi.object({ diff --git a/services/eclipse-marketplace/eclipse-marketplace-version.tester.js b/services/eclipse-marketplace/eclipse-marketplace-version.tester.js index bc8bb2c301..d5c29f822f 100644 --- a/services/eclipse-marketplace/eclipse-marketplace-version.tester.js +++ b/services/eclipse-marketplace/eclipse-marketplace-version.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isVPlusDottedVersionAtLeastOne } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('marketplace version') diff --git a/services/elm-package/elm-package.tester.js b/services/elm-package/elm-package.tester.js index a0f2b44c14..4b8ba59399 100644 --- a/services/elm-package/elm-package.tester.js +++ b/services/elm-package/elm-package.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isSemver } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('gets the package version of elm/core') diff --git a/services/endpoint/endpoint.tester.js b/services/endpoint/endpoint.tester.js index 371969bc13..0612a58751 100644 --- a/services/endpoint/endpoint.tester.js +++ b/services/endpoint/endpoint.tester.js @@ -2,7 +2,6 @@ const { expect } = require('chai') const { getShieldsIcon } = require('../../lib/logos') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Valid schema (mocked)') diff --git a/services/gem/gem-downloads.tester.js b/services/gem/gem-downloads.tester.js index 7842477d3e..4073dafa05 100644 --- a/services/gem/gem-downloads.tester.js +++ b/services/gem/gem-downloads.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('total downloads (valid)') diff --git a/services/gem/gem-owner.service.js b/services/gem/gem-owner.service.js index f241ab9271..95a8fbbc09 100644 --- a/services/gem/gem-owner.service.js +++ b/services/gem/gem-owner.service.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const { BaseJsonService } = require('..') const { floorCount: floorCountColor } = require('../../lib/color-formatters') diff --git a/services/gem/gem-owner.tester.js b/services/gem/gem-owner.tester.js index 34b85040c4..8816edeee3 100644 --- a/services/gem/gem-owner.tester.js +++ b/services/gem/gem-owner.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('users (valid)') diff --git a/services/gem/gem-rank.tester.js b/services/gem/gem-rank.tester.js index 22f3b61d12..ed7546ed80 100644 --- a/services/gem/gem-rank.tester.js +++ b/services/gem/gem-rank.tester.js @@ -1,14 +1,13 @@ 'use strict' const Joi = require('joi') +const t = (module.exports = require('../tester').createServiceTester()) const isOrdinalNumber = Joi.string().regex(/^[1-9][0-9]+(ᵗʰ|ˢᵗ|ⁿᵈ|ʳᵈ)$/) const isOrdinalNumberDaily = Joi.string().regex( /^[1-9][0-9]*(ᵗʰ|ˢᵗ|ⁿᵈ|ʳᵈ) daily$/ ) -const t = (module.exports = require('../tester').createServiceTester()) - t.create('total rank (valid)') .get('/rt/rspec-puppet-facts.json') .expectJSONTypes( diff --git a/services/gem/gem-version.tester.js b/services/gem/gem-version.tester.js index 9d650a413d..bef778ccb3 100644 --- a/services/gem/gem-version.tester.js +++ b/services/gem/gem-version.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isVPlusDottedVersionAtLeastOne } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('version (valid)') diff --git a/services/github/github-commit-activity.tester.js b/services/github/github-commit-activity.tester.js index 2c2a909b36..24a0175f64 100644 --- a/services/github/github-commit-activity.tester.js +++ b/services/github/github-commit-activity.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetricOverTimePeriod } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('commit activity (1 year)') diff --git a/services/github/github-commit-status.tester.js b/services/github/github-commit-status.tester.js index 11f6dd3166..e6060dddac 100644 --- a/services/github/github-commit-status.tester.js +++ b/services/github/github-commit-status.tester.js @@ -1,7 +1,6 @@ 'use strict' const { invalidJSON } = require('../response-fixtures') - const t = (module.exports = require('../tester').createServiceTester()) t.create('commit status - commit in branch') diff --git a/services/github/github-commits-since.tester.js b/services/github/github-commits-since.tester.js index 1bcd596a52..9473f8d67d 100644 --- a/services/github/github-commits-since.tester.js +++ b/services/github/github-commits-since.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Commits since') diff --git a/services/github/github-contributors.service.js b/services/github/github-contributors.service.js index 7d859175da..f2b376214f 100644 --- a/services/github/github-contributors.service.js +++ b/services/github/github-contributors.service.js @@ -2,8 +2,8 @@ const Joi = require('joi') const parseLinkHeader = require('parse-link-header') -const { GithubAuthService } = require('./github-auth-service') const { renderContributorBadge } = require('../../lib/contributor-count') +const { GithubAuthService } = require('./github-auth-service') const { documentation, errorMessagesFor } = require('./github-helpers') // All we do is check its length. diff --git a/services/github/github-contributors.tester.js b/services/github/github-contributors.tester.js index e946f28e33..f6977e9312 100644 --- a/services/github/github-contributors.tester.js +++ b/services/github/github-contributors.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) const { isMetric } = require('../test-validators') diff --git a/services/github/github-downloads.tester.js b/services/github/github-downloads.tester.js index 8b2e6a461e..c23d1065dd 100644 --- a/services/github/github-downloads.tester.js +++ b/services/github/github-downloads.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Downloads all releases') diff --git a/services/github/github-followers.tester.js b/services/github/github-followers.tester.js index 087847b36d..e4db41571b 100644 --- a/services/github/github-followers.tester.js +++ b/services/github/github-followers.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Followers') diff --git a/services/github/github-forks.tester.js b/services/github/github-forks.tester.js index 53d9950112..f54079d7fb 100644 --- a/services/github/github-forks.tester.js +++ b/services/github/github-forks.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Forks') diff --git a/services/github/github-issue-detail.tester.js b/services/github/github-issue-detail.tester.js index a6fb65efb2..2ce42efc0e 100644 --- a/services/github/github-issue-detail.tester.js +++ b/services/github/github-issue-detail.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isFormattedDate } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('github issue state') diff --git a/services/github/github-issues.tester.js b/services/github/github-issues.tester.js index fca450d751..aafe57afe0 100644 --- a/services/github/github-issues.tester.js +++ b/services/github/github-issues.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric, isMetricOpenIssues } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('GitHub closed pull requests') diff --git a/services/github/github-last-commit.tester.js b/services/github/github-last-commit.tester.js index 4018b0eb74..1af1f53307 100644 --- a/services/github/github-last-commit.tester.js +++ b/services/github/github-last-commit.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isFormattedDate } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('last commit (recent)') diff --git a/services/github/github-license.tester.js b/services/github/github-license.tester.js index 6d5fcd4a39..f2eb11dd00 100644 --- a/services/github/github-license.tester.js +++ b/services/github/github-license.tester.js @@ -1,14 +1,13 @@ 'use strict' const { licenseToColor } = require('../../lib/licenses') +const t = (module.exports = require('../tester').createServiceTester()) const publicDomainLicenseColor = licenseToColor('CC0-1.0') const permissiveLicenseColor = licenseToColor('MIT') const copyleftLicenseColor = licenseToColor('GPL-3.0') const unknownLicenseColor = licenseToColor() -const t = (module.exports = require('../tester').createServiceTester()) - t.create('Public domain license') .get('/github/gitignore.json?style=_shields_test') .expectJSON({ diff --git a/services/github/github-release.tester.js b/services/github/github-release.tester.js index 7c8f61d795..0e59857f9b 100644 --- a/services/github/github-release.tester.js +++ b/services/github/github-release.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isFormattedDate } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Release') diff --git a/services/github/github-repo-size.tester.js b/services/github/github-repo-size.tester.js index d527e599b5..fde82ee9eb 100644 --- a/services/github/github-repo-size.tester.js +++ b/services/github/github-repo-size.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isFileSize } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('repository size') diff --git a/services/github/github-search.tester.js b/services/github/github-search.tester.js index 06437f5a79..79c3f3af69 100644 --- a/services/github/github-search.tester.js +++ b/services/github/github-search.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('hit counter') diff --git a/services/github/github-size.tester.js b/services/github/github-size.tester.js index e1163e9b35..29cdee0812 100644 --- a/services/github/github-size.tester.js +++ b/services/github/github-size.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isFileSize } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('File size') diff --git a/services/github/github-stars.tester.js b/services/github/github-stars.tester.js index aba67e6377..78983c2b26 100644 --- a/services/github/github-stars.tester.js +++ b/services/github/github-stars.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Stars') diff --git a/services/github/github-tag.tester.js b/services/github/github-tag.tester.js index 0d8946fe44..da587dcd38 100644 --- a/services/github/github-tag.tester.js +++ b/services/github/github-tag.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Tag') diff --git a/services/github/github-watchers.tester.js b/services/github/github-watchers.tester.js index f3eac4db82..60a279c92d 100644 --- a/services/github/github-watchers.tester.js +++ b/services/github/github-watchers.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Watchers') diff --git a/services/gitlab/gitlab-pipeline-status.tester.js b/services/gitlab/gitlab-pipeline-status.tester.js index 5f7e8bbecc..a0cdb600f4 100644 --- a/services/gitlab/gitlab-pipeline-status.tester.js +++ b/services/gitlab/gitlab-pipeline-status.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isBuildStatus } = require('../../lib/build-status') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Pipeline status') diff --git a/services/hackage/hackage-version.tester.js b/services/hackage/hackage-version.tester.js index 2f897fd312..770dfe46fe 100644 --- a/services/hackage/hackage-version.tester.js +++ b/services/hackage/hackage-version.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isVPlusDottedVersionAtLeastOne } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('hackage version (valid)') diff --git a/services/hsts/hsts.service.js b/services/hsts/hsts.service.js index 8816bc6aa3..579abd489d 100644 --- a/services/hsts/hsts.service.js +++ b/services/hsts/hsts.service.js @@ -2,7 +2,6 @@ const label = 'hsts preloaded' const { BaseJsonService } = require('..') - const Joi = require('joi') const schema = Joi.object({ status: Joi.string().required(), diff --git a/services/itunes/itunes.tester.js b/services/itunes/itunes.tester.js index 0888f8a8ab..c1b845536b 100644 --- a/services/itunes/itunes.tester.js +++ b/services/itunes/itunes.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isVPlusDottedVersionAtLeastOne } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('iTunes version (valid)') diff --git a/services/jenkins/jenkins-coverage.service.js b/services/jenkins/jenkins-coverage.service.js index 56dfa237d0..02970666b8 100644 --- a/services/jenkins/jenkins-coverage.service.js +++ b/services/jenkins/jenkins-coverage.service.js @@ -3,7 +3,6 @@ const Joi = require('joi') const { BaseJsonService } = require('..') const serverSecrets = require('../../lib/server-secrets') - const { coveragePercentage: coveragePercentageColor, } = require('../../lib/color-formatters') diff --git a/services/jenkins/jenkins-plugin-installs.service.js b/services/jenkins/jenkins-plugin-installs.service.js index 4f29a0d23a..459b876a7c 100644 --- a/services/jenkins/jenkins-plugin-installs.service.js +++ b/services/jenkins/jenkins-plugin-installs.service.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const { downloadCount: downloadCountColor, } = require('../../lib/color-formatters') diff --git a/services/jenkins/jenkins-plugin-installs.tester.js b/services/jenkins/jenkins-plugin-installs.tester.js index 66c355ef3c..231f7ee1d0 100644 --- a/services/jenkins/jenkins-plugin-installs.tester.js +++ b/services/jenkins/jenkins-plugin-installs.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) // total installs diff --git a/services/jetbrains/jetbrains-downloads.service.js b/services/jetbrains/jetbrains-downloads.service.js index 6d520b812f..7d3cd58b89 100644 --- a/services/jetbrains/jetbrains-downloads.service.js +++ b/services/jetbrains/jetbrains-downloads.service.js @@ -1,12 +1,12 @@ 'use strict' const Joi = require('joi') -const JetbrainsBase = require('./jetbrains-base') const { metric } = require('../../lib/text-formatters') const { downloadCount: downloadCountColor, } = require('../../lib/color-formatters') const { nonNegativeInteger } = require('../validators') +const JetbrainsBase = require('./jetbrains-base') const schema = Joi.object({ 'plugin-repository': Joi.object({ diff --git a/services/jetbrains/jetbrains-version.service.js b/services/jetbrains/jetbrains-version.service.js index 1ca7ff7aca..6c695a9bb0 100644 --- a/services/jetbrains/jetbrains-version.service.js +++ b/services/jetbrains/jetbrains-version.service.js @@ -1,8 +1,8 @@ 'use strict' const Joi = require('joi') -const JetbrainsBase = require('./jetbrains-base') const { renderVersionBadge } = require('../../lib/version') +const JetbrainsBase = require('./jetbrains-base') const schema = Joi.object({ 'plugin-repository': Joi.object({ diff --git a/services/jsdelivr/jsdelivr-hits-github.tester.js b/services/jsdelivr/jsdelivr-hits-github.tester.js index 1260d03a54..b34a89582e 100644 --- a/services/jsdelivr/jsdelivr-hits-github.tester.js +++ b/services/jsdelivr/jsdelivr-hits-github.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetricOverTimePeriod } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('(live) jquery/jquery hits/day') diff --git a/services/jsdelivr/jsdelivr-hits-npm.tester.js b/services/jsdelivr/jsdelivr-hits-npm.tester.js index f9e8809b6d..8ecf7952ac 100644 --- a/services/jsdelivr/jsdelivr-hits-npm.tester.js +++ b/services/jsdelivr/jsdelivr-hits-npm.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetricOverTimePeriod } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('(live) jquery hits/day') diff --git a/services/keybase/keybase-btc.service.js b/services/keybase/keybase-btc.service.js index efdf4235d3..bfce9a35dc 100644 --- a/services/keybase/keybase-btc.service.js +++ b/services/keybase/keybase-btc.service.js @@ -1,8 +1,8 @@ 'use strict' -const KeybaseProfile = require('./keybase-profile') const Joi = require('joi') const { nonNegativeInteger } = require('../validators') +const KeybaseProfile = require('./keybase-profile') const bitcoinAddressSchema = Joi.object({ status: Joi.object({ diff --git a/services/keybase/keybase-btc.tester.js b/services/keybase/keybase-btc.tester.js index a0ad4efa78..c9f4ba48b4 100644 --- a/services/keybase/keybase-btc.tester.js +++ b/services/keybase/keybase-btc.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { withRegex } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('existing bitcoin address') diff --git a/services/keybase/keybase-pgp.service.js b/services/keybase/keybase-pgp.service.js index 42ef69b103..05a78c2082 100644 --- a/services/keybase/keybase-pgp.service.js +++ b/services/keybase/keybase-pgp.service.js @@ -1,8 +1,8 @@ 'use strict' -const KeybaseProfile = require('./keybase-profile') const Joi = require('joi') const { nonNegativeInteger } = require('../validators') +const KeybaseProfile = require('./keybase-profile') const keyFingerprintSchema = Joi.object({ status: Joi.object({ diff --git a/services/keybase/keybase-pgp.tester.js b/services/keybase/keybase-pgp.tester.js index bea3fbabb7..99baecaefb 100644 --- a/services/keybase/keybase-pgp.tester.js +++ b/services/keybase/keybase-pgp.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('existing key fingerprint') diff --git a/services/keybase/keybase-xlm.service.js b/services/keybase/keybase-xlm.service.js index 3a148aacbc..5566b91d09 100644 --- a/services/keybase/keybase-xlm.service.js +++ b/services/keybase/keybase-xlm.service.js @@ -1,8 +1,8 @@ 'use strict' -const KeybaseProfile = require('./keybase-profile') const Joi = require('joi') const { nonNegativeInteger } = require('../validators') +const KeybaseProfile = require('./keybase-profile') const stellarAddressSchema = Joi.object({ status: Joi.object({ diff --git a/services/keybase/keybase-xlm.tester.js b/services/keybase/keybase-xlm.tester.js index 8cec16fc7f..083bdf39f1 100644 --- a/services/keybase/keybase-xlm.tester.js +++ b/services/keybase/keybase-xlm.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { withRegex } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('existing stellar address') diff --git a/services/keybase/keybase-zec.service.js b/services/keybase/keybase-zec.service.js index 76be61f4d0..fd3cd0b688 100644 --- a/services/keybase/keybase-zec.service.js +++ b/services/keybase/keybase-zec.service.js @@ -1,8 +1,8 @@ 'use strict' -const KeybaseProfile = require('./keybase-profile') const Joi = require('joi') const { nonNegativeInteger } = require('../validators') +const KeybaseProfile = require('./keybase-profile') const zcachAddressSchema = Joi.object({ status: Joi.object({ diff --git a/services/keybase/keybase-zec.tester.js b/services/keybase/keybase-zec.tester.js index b63e2c808d..82064ea080 100644 --- a/services/keybase/keybase-zec.tester.js +++ b/services/keybase/keybase-zec.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { withRegex } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('existing zcash address') diff --git a/services/leanpub/leanpub-book-summary.tester.js b/services/leanpub/leanpub-book-summary.tester.js index cc18cf5a1b..0fb5154d86 100644 --- a/services/leanpub/leanpub-book-summary.tester.js +++ b/services/leanpub/leanpub-book-summary.tester.js @@ -1,11 +1,10 @@ 'use strict' const Joi = require('joi') +const t = (module.exports = require('../tester').createServiceTester()) const knownValidBook = 'juice-shop' -const t = (module.exports = require('../tester').createServiceTester()) - t.create('known book pages') .get(`/pages/${knownValidBook}.json`) .expectJSONTypes( diff --git a/services/lgtm/lgtm-alerts.service.js b/services/lgtm/lgtm-alerts.service.js index 12b2ac38f2..60460b1d32 100644 --- a/services/lgtm/lgtm-alerts.service.js +++ b/services/lgtm/lgtm-alerts.service.js @@ -1,7 +1,7 @@ 'use strict' -const LgtmBaseService = require('./lgtm-base') const { metric } = require('../../lib/text-formatters') +const LgtmBaseService = require('./lgtm-base') module.exports = class LgtmAlerts extends LgtmBaseService { static get route() { diff --git a/services/liberapay/liberapay-gives.tester.js b/services/liberapay/liberapay-gives.tester.js index c7c5363cb1..ce47137dfd 100644 --- a/services/liberapay/liberapay-gives.tester.js +++ b/services/liberapay/liberapay-gives.tester.js @@ -1,8 +1,8 @@ 'use strict' const Joi = require('joi') -const { isCurrencyOverTime } = require('./liberapay-base') const t = (module.exports = require('../tester').createServiceTester()) +const { isCurrencyOverTime } = require('./liberapay-base') t.create('Giving (valid)') .get('/Changaco.json') diff --git a/services/liberapay/liberapay-patrons.service.js b/services/liberapay/liberapay-patrons.service.js index f4857a0161..72455543a3 100644 --- a/services/liberapay/liberapay-patrons.service.js +++ b/services/liberapay/liberapay-patrons.service.js @@ -1,8 +1,8 @@ 'use strict' -const { LiberapayBase } = require('./liberapay-base') const { metric } = require('../../lib/text-formatters') const { colorScale } = require('../../lib/color-formatters') +const { LiberapayBase } = require('./liberapay-base') module.exports = class LiberapayPatrons extends LiberapayBase { static get route() { diff --git a/services/liberapay/liberapay-receives.tester.js b/services/liberapay/liberapay-receives.tester.js index eb8977988a..38fdbf8756 100644 --- a/services/liberapay/liberapay-receives.tester.js +++ b/services/liberapay/liberapay-receives.tester.js @@ -1,8 +1,8 @@ 'use strict' const Joi = require('joi') -const { isCurrencyOverTime } = require('./liberapay-base') const t = (module.exports = require('../tester').createServiceTester()) +const { isCurrencyOverTime } = require('./liberapay-base') t.create('Receiving (valid)') .get('/Changaco.json') diff --git a/services/librariesio/librariesio-dependencies.tester.js b/services/librariesio/librariesio-dependencies.tester.js index 2de77af932..289c24017b 100644 --- a/services/librariesio/librariesio-dependencies.tester.js +++ b/services/librariesio/librariesio-dependencies.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isDependencyState } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('dependencies for releases') diff --git a/services/librariesio/librariesio-dependent-repos.tester.js b/services/librariesio/librariesio-dependent-repos.tester.js index 26e703948d..04fc55fd69 100644 --- a/services/librariesio/librariesio-dependent-repos.tester.js +++ b/services/librariesio/librariesio-dependent-repos.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('dependent repo count') diff --git a/services/librariesio/librariesio-dependents.tester.js b/services/librariesio/librariesio-dependents.tester.js index e1f283f9a4..de7065ea29 100644 --- a/services/librariesio/librariesio-dependents.tester.js +++ b/services/librariesio/librariesio-dependents.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('dependent count') diff --git a/services/librariesio/librariesio-sourcerank.tester.js b/services/librariesio/librariesio-sourcerank.tester.js index 9d870e7ead..9a819fa17a 100644 --- a/services/librariesio/librariesio-sourcerank.tester.js +++ b/services/librariesio/librariesio-sourcerank.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { anyInteger } = require('../validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('sourcerank') diff --git a/services/matrix/matrix.tester.js b/services/matrix/matrix.tester.js index 19cd39dd8d..9008e9fa3b 100644 --- a/services/matrix/matrix.tester.js +++ b/services/matrix/matrix.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('get room state as guest') diff --git a/services/nexus/nexus.service.js b/services/nexus/nexus.service.js index c3e769b12e..367c19f46a 100644 --- a/services/nexus/nexus.service.js +++ b/services/nexus/nexus.service.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const { version: versionColor } = require('../../lib/color-formatters') const { addv } = require('../../lib/text-formatters') const serverSecrets = require('../../lib/server-secrets') diff --git a/services/node/node.tester.js b/services/node/node.tester.js index 0796c0d9d6..a7a5ebeb89 100644 --- a/services/node/node.tester.js +++ b/services/node/node.tester.js @@ -3,7 +3,6 @@ const { expect } = require('chai') const Joi = require('joi') const { Range } = require('semver') - const t = (module.exports = require('../tester').createServiceTester()) function expectSemverRange(value) { diff --git a/services/nodeping/nodeping-status.tester.js b/services/nodeping/nodeping-status.tester.js index 17ee03b0b0..25a3a31b8a 100644 --- a/services/nodeping/nodeping-status.tester.js +++ b/services/nodeping/nodeping-status.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('NodePing status - live').get( diff --git a/services/npm/npm-collaborators.service.js b/services/npm/npm-collaborators.service.js index 96ef952c9f..ce341a60f3 100644 --- a/services/npm/npm-collaborators.service.js +++ b/services/npm/npm-collaborators.service.js @@ -1,7 +1,7 @@ 'use strict' -const NpmBase = require('./npm-base') const { renderContributorBadge } = require('../../lib/contributor-count') +const NpmBase = require('./npm-base') const keywords = ['node'] diff --git a/services/npm/npm-license.tester.js b/services/npm/npm-license.tester.js index 20677c6ac5..e714c2d010 100644 --- a/services/npm/npm-license.tester.js +++ b/services/npm/npm-license.tester.js @@ -1,7 +1,6 @@ 'use strict' const Joi = require('joi') - const t = (module.exports = require('../tester').createServiceTester()) t.create('gets the license of express') diff --git a/services/npm/npm-type-definitions.tester.js b/services/npm/npm-type-definitions.tester.js index 747f16cb5b..5d1119d9ac 100644 --- a/services/npm/npm-type-definitions.tester.js +++ b/services/npm/npm-type-definitions.tester.js @@ -1,13 +1,12 @@ 'use strict' const Joi = require('joi') +const t = (module.exports = require('../tester').createServiceTester()) const isTypeDefinition = Joi.string().regex( /^((Flow|TypeScript)|(Flow \| TypeScript))$/ ) -const t = (module.exports = require('../tester').createServiceTester()) - t.create('types (from dev dependencies + files)') .get('/chalk.json') .expectJSONTypes( diff --git a/services/npm/npm-version.tester.js b/services/npm/npm-version.tester.js index e5572e9d9f..9c8c88eaac 100644 --- a/services/npm/npm-version.tester.js +++ b/services/npm/npm-version.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isSemver } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('gets the package version of left-pad') diff --git a/services/nuget/nuget-helpers.spec.js b/services/nuget/nuget-helpers.spec.js index 0026e6b51d..bdfb08148c 100644 --- a/services/nuget/nuget-helpers.spec.js +++ b/services/nuget/nuget-helpers.spec.js @@ -1,7 +1,7 @@ 'use strict' -const { renderVersionBadge, odataToObject } = require('./nuget-helpers') const { test, given } = require('sazerac') +const { renderVersionBadge, odataToObject } = require('./nuget-helpers') describe('NuGet helpers', function() { test(renderVersionBadge, () => { diff --git a/services/readthedocs/readthedocs.tester.js b/services/readthedocs/readthedocs.tester.js index 390abc358b..4ee19c06fb 100644 --- a/services/readthedocs/readthedocs.tester.js +++ b/services/readthedocs/readthedocs.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isBuildStatus } = require('../../lib/build-status') - const t = (module.exports = require('../tester').createServiceTester()) t.create('build status') diff --git a/services/redmine/redmine.service.js b/services/redmine/redmine.service.js index cf3dc4a7cc..840edddad2 100644 --- a/services/redmine/redmine.service.js +++ b/services/redmine/redmine.service.js @@ -2,7 +2,6 @@ const { starRating } = require('../../lib/text-formatters') const { floorCount: floorCountColor } = require('../../lib/color-formatters') - const Joi = require('joi') const { BaseXmlService } = require('..') diff --git a/services/requires/requires.tester.js b/services/requires/requires.tester.js index adc347272d..946bc736d9 100644 --- a/services/requires/requires.tester.js +++ b/services/requires/requires.tester.js @@ -1,13 +1,12 @@ 'use strict' const Joi = require('joi') +const t = (module.exports = require('../tester').createServiceTester()) const isRequireStatus = Joi.string().regex( /^(up to date|outdated|insecure|unknown)$/ ) -const t = (module.exports = require('../tester').createServiceTester()) - t.create('requirements (valid, without branch)') .get('/github/celery/celery.json') .expectJSONTypes( diff --git a/services/shippable/shippable.tester.js b/services/shippable/shippable.tester.js index d425e81396..aa6d19699a 100644 --- a/services/shippable/shippable.tester.js +++ b/services/shippable/shippable.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isBuildStatus } = require('../../lib/build-status') - const t = (module.exports = require('../tester').createServiceTester()) t.create('build status (valid, without branch)') diff --git a/services/sourcegraph/sourcegraph.tester.js b/services/sourcegraph/sourcegraph.tester.js index bed874a9ea..69c4fcc73c 100644 --- a/services/sourcegraph/sourcegraph.tester.js +++ b/services/sourcegraph/sourcegraph.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { withRegex } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) // Matches API responses such as "0 projects", "1 projects", "182 projects", "14.0k projects". diff --git a/services/spiget/spiget-download-size.tester.js b/services/spiget/spiget-download-size.tester.js index 3e81ec514a..2df1792d8f 100644 --- a/services/spiget/spiget-download-size.tester.js +++ b/services/spiget/spiget-download-size.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isFileSize } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('EssentialsX (id 9089)') diff --git a/services/spiget/spiget-downloads.tester.js b/services/spiget/spiget-downloads.tester.js index 885e32b387..50dcd50b77 100644 --- a/services/spiget/spiget-downloads.tester.js +++ b/services/spiget/spiget-downloads.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('EssentialsX (id 9089)') diff --git a/services/spiget/spiget-latest-version.tester.js b/services/spiget/spiget-latest-version.tester.js index e56029b37f..92b15c5bc1 100644 --- a/services/spiget/spiget-latest-version.tester.js +++ b/services/spiget/spiget-latest-version.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { withRegex } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) // Note that Spigot versions can be anything (including just a string), so we'll make sure it's not returning 'not found' diff --git a/services/spiget/spiget-rating.tester.js b/services/spiget/spiget-rating.tester.js index 901c4b679f..e9c8de22f1 100644 --- a/services/spiget/spiget-rating.tester.js +++ b/services/spiget/spiget-rating.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isStarRating, withRegex } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Stars - EssentialsX (id 9089)') diff --git a/services/spiget/spiget-tested-versions.tester.js b/services/spiget/spiget-tested-versions.tester.js index 51da667b6f..a6301fee77 100644 --- a/services/spiget/spiget-tested-versions.tester.js +++ b/services/spiget/spiget-tested-versions.tester.js @@ -2,11 +2,10 @@ const Joi = require('joi') const { withRegex } = require('../test-validators') +const t = (module.exports = require('../tester').createServiceTester()) const multipleVersions = withRegex(/^([+]?\d*\.\d+)(-)([+]?\d*\.\d+)$/) -const t = (module.exports = require('../tester').createServiceTester()) - t.create('EssentialsX - multiple versions supported - (id 9089)') .get('/9089.json') .expectJSONTypes( diff --git a/services/stackexchange/stackexchange-monthlyquestions.tester.js b/services/stackexchange/stackexchange-monthlyquestions.tester.js index ae961c1ce6..ed5b122b03 100644 --- a/services/stackexchange/stackexchange-monthlyquestions.tester.js +++ b/services/stackexchange/stackexchange-monthlyquestions.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetricOverTimePeriod } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Monthly Questions for StackOverflow Momentjs') diff --git a/services/stackexchange/stackexchange-reputation.tester.js b/services/stackexchange/stackexchange-reputation.tester.js index 20ad4685e9..eb2df7a5f5 100644 --- a/services/stackexchange/stackexchange-reputation.tester.js +++ b/services/stackexchange/stackexchange-reputation.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Invalid parameters') diff --git a/services/stackexchange/stackexchange-taginfo.tester.js b/services/stackexchange/stackexchange-taginfo.tester.js index 0fd2f63b87..df159961d3 100644 --- a/services/stackexchange/stackexchange-taginfo.tester.js +++ b/services/stackexchange/stackexchange-taginfo.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isMetric } = require('../test-validators') - const t = (module.exports = require('../tester').createServiceTester()) t.create('JavaScript Questions') diff --git a/services/suggest.integration.js b/services/suggest.integration.js index e615e185c5..ec5bbc8c91 100644 --- a/services/suggest.integration.js +++ b/services/suggest.integration.js @@ -4,9 +4,9 @@ const { expect } = require('chai') const got = require('got') const Camp = require('camp') const portfinder = require('portfinder') +const serverSecrets = require('../lib/server-secrets') const { setRoutes } = require('./suggest') const GithubApiProvider = require('./github/github-api-provider') -const serverSecrets = require('../lib/server-secrets') describe('GitHub badge suggestions', function() { const githubApiBaseUrl = process.env.GITHUB_URL || 'https://api.github.com' diff --git a/services/teamcity/teamcity-build.tester.js b/services/teamcity/teamcity-build.tester.js index 9da972cbba..b16e1c9239 100644 --- a/services/teamcity/teamcity-build.tester.js +++ b/services/teamcity/teamcity-build.tester.js @@ -2,6 +2,7 @@ const Joi = require('joi') const { withRegex } = require('../test-validators') +const t = (module.exports = require('../tester').createServiceTester()) const { mockTeamCityCreds, pass, @@ -12,8 +13,6 @@ const { const buildStatusValues = Joi.equal('passing', 'failure', 'error').required() const buildStatusTextRegex = /^success|failure|error|tests( failed: \d+( \(\d+ new\))?)?(,)?( passed: \d+)?(,)?( ignored: \d+)?(,)?( muted: \d+)?$/ -const t = (module.exports = require('../tester').createServiceTester()) - t.create('live: codebetter unknown build') .get('/codebetter/btabc.json') .expectJSON({ name: 'build', value: 'build not found' }) diff --git a/services/teamcity/teamcity-coverage.tester.js b/services/teamcity/teamcity-coverage.tester.js index 188de37974..21dd95f078 100644 --- a/services/teamcity/teamcity-coverage.tester.js +++ b/services/teamcity/teamcity-coverage.tester.js @@ -2,6 +2,7 @@ const Joi = require('joi') const { isIntegerPercentage } = require('../test-validators') +const t = (module.exports = require('../tester').createServiceTester()) const { mockTeamCityCreds, pass, @@ -9,8 +10,6 @@ const { restore, } = require('./teamcity-test-helpers') -const t = (module.exports = require('../tester').createServiceTester()) - t.create('live: valid buildId') .get('/ReactJSNet_PullRequests.json') .expectJSONTypes( diff --git a/services/uptimerobot/uptimerobot-ratio.tester.js b/services/uptimerobot/uptimerobot-ratio.tester.js index 52f22ceab7..da470198e2 100644 --- a/services/uptimerobot/uptimerobot-ratio.tester.js +++ b/services/uptimerobot/uptimerobot-ratio.tester.js @@ -3,7 +3,6 @@ const Joi = require('joi') const { isPercentage } = require('../test-validators') const { invalidJSON } = require('../response-fixtures') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Uptime Robot: Percentage (valid)') diff --git a/services/uptimerobot/uptimerobot-status.tester.js b/services/uptimerobot/uptimerobot-status.tester.js index 78b49b64af..2b733f43b0 100644 --- a/services/uptimerobot/uptimerobot-status.tester.js +++ b/services/uptimerobot/uptimerobot-status.tester.js @@ -2,6 +2,7 @@ const Joi = require('joi') const { invalidJSON } = require('../response-fixtures') +const t = (module.exports = require('../tester').createServiceTester()) const isUptimeStatus = Joi.string().valid( 'paused', @@ -11,8 +12,6 @@ const isUptimeStatus = Joi.string().valid( 'down' ) -const t = (module.exports = require('../tester').createServiceTester()) - t.create('Uptime Robot: Status (valid)') .get('/m778918918-3e92c097147760ee39d02d36.json') .expectJSONTypes( diff --git a/services/visual-studio-marketplace/visual-studio-marketplace-azure-devops-installs.service.js b/services/visual-studio-marketplace/visual-studio-marketplace-azure-devops-installs.service.js index dae36e02df..212103b6a8 100644 --- a/services/visual-studio-marketplace/visual-studio-marketplace-azure-devops-installs.service.js +++ b/services/visual-studio-marketplace/visual-studio-marketplace-azure-devops-installs.service.js @@ -1,8 +1,8 @@ 'use strict' -const VisualStudioMarketplaceBase = require('./visual-studio-marketplace-base') const { metric } = require('../../lib/text-formatters') const { downloadCount } = require('../../lib/color-formatters') +const VisualStudioMarketplaceBase = require('./visual-studio-marketplace-base') const documentation = `

diff --git a/services/visual-studio-marketplace/visual-studio-marketplace-downloads.service.js b/services/visual-studio-marketplace/visual-studio-marketplace-downloads.service.js index 059b94f92e..3f9594c5ba 100644 --- a/services/visual-studio-marketplace/visual-studio-marketplace-downloads.service.js +++ b/services/visual-studio-marketplace/visual-studio-marketplace-downloads.service.js @@ -1,8 +1,8 @@ 'use strict' -const VisualStudioMarketplaceBase = require('./visual-studio-marketplace-base') const { metric } = require('../../lib/text-formatters') const { downloadCount } = require('../../lib/color-formatters') +const VisualStudioMarketplaceBase = require('./visual-studio-marketplace-base') const documentation = `

diff --git a/services/visual-studio-marketplace/visual-studio-marketplace-rating.service.js b/services/visual-studio-marketplace/visual-studio-marketplace-rating.service.js index 92a1c158a5..158674ae97 100644 --- a/services/visual-studio-marketplace/visual-studio-marketplace-rating.service.js +++ b/services/visual-studio-marketplace/visual-studio-marketplace-rating.service.js @@ -1,8 +1,8 @@ 'use strict' -const VisualStudioMarketplaceBase = require('./visual-studio-marketplace-base') const { starRating } = require('../../lib/text-formatters') const { floorCount } = require('../../lib/color-formatters') +const VisualStudioMarketplaceBase = require('./visual-studio-marketplace-base') module.exports = class VisualStudioMarketplaceRating extends VisualStudioMarketplaceBase { static get category() { diff --git a/services/visual-studio-marketplace/visual-studio-marketplace-version.service.js b/services/visual-studio-marketplace/visual-studio-marketplace-version.service.js index 7bd1c739d9..c17056515a 100644 --- a/services/visual-studio-marketplace/visual-studio-marketplace-version.service.js +++ b/services/visual-studio-marketplace/visual-studio-marketplace-version.service.js @@ -1,7 +1,7 @@ 'use strict' -const VisualStudioMarketplaceBase = require('./visual-studio-marketplace-base') const { renderVersionBadge } = require('../../lib/version') +const VisualStudioMarketplaceBase = require('./visual-studio-marketplace-base') module.exports = class VisualStudioMarketplaceVersion extends VisualStudioMarketplaceBase { static get category() { diff --git a/services/waffle/waffle.tester.js b/services/waffle/waffle.tester.js index 8bed1dff59..a4bdfc6136 100644 --- a/services/waffle/waffle.tester.js +++ b/services/waffle/waffle.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { invalidJSON } = require('../response-fixtures') - const t = (module.exports = require('../tester').createServiceTester()) const fakeData = [ diff --git a/services/wercker/wercker.tester.js b/services/wercker/wercker.tester.js index 750c404a39..e8b6249f6d 100644 --- a/services/wercker/wercker.tester.js +++ b/services/wercker/wercker.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { isBuildStatus } = require('../../lib/build-status') - const t = (module.exports = require('../tester').createServiceTester()) t.create('Build status') diff --git a/services/wheelmap/wheelmap.tester.js b/services/wheelmap/wheelmap.tester.js index 97d5c36a94..4315080adf 100644 --- a/services/wheelmap/wheelmap.tester.js +++ b/services/wheelmap/wheelmap.tester.js @@ -1,7 +1,6 @@ 'use strict' const serverSecrets = require('../../lib/server-secrets') - const t = (module.exports = require('../tester').createServiceTester()) const noToken = !serverSecrets.wheelmap_token diff --git a/services/wordpress/wordpress-downloads.tester.js b/services/wordpress/wordpress-downloads.tester.js index 5033c91bd6..fb224ebd17 100644 --- a/services/wordpress/wordpress-downloads.tester.js +++ b/services/wordpress/wordpress-downloads.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { ServiceTester } = require('../tester') - const { isMetric, isMetricOverTimePeriod } = require('../test-validators') const t = new ServiceTester({ diff --git a/services/wordpress/wordpress-rating.service.js b/services/wordpress/wordpress-rating.service.js index 4e330a9cbb..d160ab95ff 100644 --- a/services/wordpress/wordpress-rating.service.js +++ b/services/wordpress/wordpress-rating.service.js @@ -1,8 +1,8 @@ 'use strict' -const BaseWordpress = require('./wordpress-base') const { starRating, metric } = require('../../lib/text-formatters') const { floorCount } = require('../../lib/color-formatters') +const BaseWordpress = require('./wordpress-base') const extensionData = { plugin: { diff --git a/services/wordpress/wordpress-rating.tester.js b/services/wordpress/wordpress-rating.tester.js index 2a250032a4..675544c271 100644 --- a/services/wordpress/wordpress-rating.tester.js +++ b/services/wordpress/wordpress-rating.tester.js @@ -2,7 +2,6 @@ const Joi = require('joi') const { ServiceTester } = require('../tester') - const { isStarRating } = require('../test-validators') const t = new ServiceTester({ diff --git a/services/wordpress/wordpress-version.service.js b/services/wordpress/wordpress-version.service.js index a5962c35b3..541871e973 100644 --- a/services/wordpress/wordpress-version.service.js +++ b/services/wordpress/wordpress-version.service.js @@ -1,8 +1,8 @@ 'use strict' -const BaseWordpress = require('./wordpress-base') const { addv } = require('../../lib/text-formatters') const { version: versionColor } = require('../../lib/color-formatters') +const BaseWordpress = require('./wordpress-base') function VersionForExtensionType(extensionType) { const { capt, exampleSlug } = {