- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
Configuration:
Add additional configuration in YAML to be added to your
@@ -126,7 +124,6 @@ BranchConfig.propTypes = {
id: PropTypes.number,
branch: PropTypes.string,
context: PropTypes.string.isRequired,
- // eslint-disable-next-line react/forbid-prop-types
config: PropTypes.object,
handleUpdate: PropTypes.func.isRequired,
isExpanded: PropTypes.bool,
diff --git a/frontend/pages/sites/$siteId/settings/ReportConfigs.jsx b/frontend/pages/sites/$siteId/settings/ReportConfigs.jsx
index 47d7cb634..45a7b7477 100644
--- a/frontend/pages/sites/$siteId/settings/ReportConfigs.jsx
+++ b/frontend/pages/sites/$siteId/settings/ReportConfigs.jsx
@@ -158,7 +158,6 @@ function ReportConfigs({ siteId: id }) {
{!isPagesRule && (
<>
- { /* eslint-disable-next-line jsx-a11y/label-has-associated-control */ }
Criteria to match:
- { /* eslint-disable-next-line jsx-a11y/label-has-associated-control */ }
Delete this rule
deleteRule(rule)}>
Delete
diff --git a/frontend/pages/sites/$siteId/settings/index.jsx b/frontend/pages/sites/$siteId/settings/index.jsx
index 3086189d6..7c44d3c5d 100644
--- a/frontend/pages/sites/$siteId/settings/index.jsx
+++ b/frontend/pages/sites/$siteId/settings/index.jsx
@@ -25,9 +25,7 @@ function SiteSettings() {
}
function handleDelete() {
- // eslint-disable-next-line no-alert
if (
- // eslint-disable-next-line no-alert
window.confirm(
`${site.owner}/${site.repository}\nAre you sure you want to delete this site for all users? This action will also delete all site builds and take down the live site, if published.`
)
diff --git a/frontend/pages/sites/new/AddRepoSiteForm.jsx b/frontend/pages/sites/new/AddRepoSiteForm.jsx
index 578fee6f5..9d06d4ea2 100644
--- a/frontend/pages/sites/new/AddRepoSiteForm.jsx
+++ b/frontend/pages/sites/new/AddRepoSiteForm.jsx
@@ -66,7 +66,6 @@ export const AddRepoSiteForm = ({
{showNewSiteAlert()}
- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
Site engine
- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
What GitHub account will own your site?
Name your new site
- {/* eslint-disable-next-line react/jsx-props-no-spreading */}
@@ -86,7 +85,6 @@ function AddSite() {
return (
- {/* eslint-disable-next-line react/jsx-props-no-spreading */}
diff --git a/frontend/shared/Fields/InputWithErrorField.jsx b/frontend/shared/Fields/InputWithErrorField.jsx
index bba2fb1a8..4d85af914 100644
--- a/frontend/shared/Fields/InputWithErrorField.jsx
+++ b/frontend/shared/Fields/InputWithErrorField.jsx
@@ -7,7 +7,6 @@ const InputWithErrorField = ({
label,
help,
meta: { touched, error }, // from the Field component
- // eslint-disable-next-line react/prop-types
input, // from the Field component
type,
...props
@@ -17,9 +16,7 @@ const InputWithErrorField = ({
{ help }
{touched && (error && {error} )}
{ includeEmptyOption && -- }
@@ -39,6 +36,7 @@ Select.propTypes = {
help: PropTypes.node,
id: PropTypes.string.isRequired,
includeEmptyOption: PropTypes.bool,
+ input: PropTypes.object.isRequired,
label: PropTypes.string,
meta: PropTypes.shape({
touched: PropTypes.bool,
diff --git a/frontend/shared/UserOrgSelect.jsx b/frontend/shared/UserOrgSelect.jsx
index 53ce543f0..fc62f3193 100644
--- a/frontend/shared/UserOrgSelect.jsx
+++ b/frontend/shared/UserOrgSelect.jsx
@@ -28,7 +28,6 @@ const UserOrgSelect = ({
value,
}) => (
- {/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
{label}
{touched && (error && {error} )}
{
- // eslint-disable-next-line no-param-reassign
groups[log.source] = (groups[log.source] || []).concat([log.output]);
return groups;
}, {});
diff --git a/frontend/util/scanConfig.js b/frontend/util/scanConfig.js
index 78545ab05..6f4e2fdca 100644
--- a/frontend/util/scanConfig.js
+++ b/frontend/util/scanConfig.js
@@ -2202,6 +2202,6 @@ const BUILD_SCAN_RULES = [
},
];
-module.exports = {
+export default {
BUILD_SCAN_RULES,
};
diff --git a/frontend/util/validators.js b/frontend/util/validators.js
index e49969759..5d638ada2 100644
--- a/frontend/util/validators.js
+++ b/frontend/util/validators.js
@@ -1,5 +1,5 @@
-const yaml = require('js-yaml');
-const { hasOrgs } = require('../selectors/organization');
+import yaml from 'js-yaml';
+import { hasOrgs } from '../selectors/organization';
const validAddRepoSiteForm = ({ repoOrganizationId, repoUrl }, { organizations }) => {
const errors = {};
@@ -24,7 +24,7 @@ const validBasicAuthPassword = s => (/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{4,255}$/.
function isValidYaml(yamlString) {
try {
yaml.load(yamlString);
- } catch (e) {
+ } catch (_) {
// for Sequelize validators, we need to throw an error
// on invalid values
throw new Error('input is not valid YAML');
@@ -33,7 +33,7 @@ function isValidYaml(yamlString) {
return true;
}
-module.exports = {
+export default {
isValidYaml,
validAddRepoSiteForm,
validBranchName,
diff --git a/package.json b/package.json
index 01c496f1b..e915392af 100644
--- a/package.json
+++ b/package.json
@@ -124,6 +124,7 @@
"@babel/preset-react": "^7.23.3",
"@babel/register": "^7.22.15",
"@cfaester/enzyme-adapter-react-18": "^0.6.0",
+ "@eslint/js": "^9.13.0",
"@playwright/test": "^1.42.1",
"@svgr/webpack": "8.1.0",
"@types/node": "^20.9.0",
@@ -140,16 +141,18 @@
"date-fns": "^2.30.0",
"dotenv": "^16.3.1",
"enzyme": "^3.11.0",
- "eslint": "^8.54.0",
- "eslint-config-airbnb": "^19.0.4",
+ "eslint": "^9.13.0",
+ "eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-webpack": "^0.13.9",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jsx-a11y": "^6.8.0",
- "eslint-plugin-no-only-tests": "^3.1.0",
+ "eslint-plugin-mocha": "^10.5.0",
"eslint-plugin-no-unsanitized": "^4.0.2",
- "eslint-plugin-react": "^7.33.2",
- "eslint-plugin-sonarjs": "^0.23.0",
+ "eslint-plugin-react": "^7.37.2",
+ "eslint-plugin-sonarjs": "^2.0.4",
+ "eslint-plugin-testing-library": "^6.4.0",
"fetch-mock": "^9.11.0",
+ "globals": "^15.11.0",
"jsdom": "^23.0.1",
"json-schema-deref-sync": "^0.14.0",
"jsonschema": "^1.4.0",
@@ -164,6 +167,7 @@
"playwright": "^1.42.1",
"postcss": "^8.4.31",
"postcss-loader": "^7.3.3",
+ "prettier": "^3.3.3",
"promise-props": "^1.0.0",
"prop-types": "^15.5.10",
"proxyquire": "^2.1.3",
diff --git a/scripts/create-dev-data.js b/scripts/create-dev-data.js
index 18d94e272..527f92f6f 100644
--- a/scripts/create-dev-data.js
+++ b/scripts/create-dev-data.js
@@ -742,7 +742,7 @@ async function createData() {
console.log('Uploading logs to S3');
try {
await BuildLogs.archiveBuildLogs(nodeSite, nodeSiteBuilds[0]);
- } catch (error) {
+ } catch (_) {
console.error(
'Failed to upload logs to S3, probably because the credentials are not configured locally. This can be ignored.'
);
diff --git a/scripts/echo.js b/scripts/echo.js
index b3ef614cf..17b726e23 100644
--- a/scripts/echo.js
+++ b/scripts/echo.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-restricted-syntax */
/* eslint-disable no-console */
const Http = require('http');
diff --git a/test/.eslintrc.js b/test/.eslintrc.js
deleted file mode 100644
index e06fc2cbc..000000000
--- a/test/.eslintrc.js
+++ /dev/null
@@ -1,15 +0,0 @@
-module.exports = {
- env: {
- mocha: true,
- },
- rules: {
- 'no-unused-expressions': [0], // because chai's expect is weird
- 'no-only-tests/no-only-tests': 'error',
-
- // Ok in tests
- 'react/jsx-props-no-spreading': 0,
- },
- plugins: [
- 'no-only-tests',
- ],
-};
diff --git a/test/api/admin/requests/build.test.js b/test/api/admin/requests/build.test.js
index 0c27baa34..ead66e02a 100644
--- a/test/api/admin/requests/build.test.js
+++ b/test/api/admin/requests/build.test.js
@@ -29,11 +29,10 @@ const buildResponseExpectations = (response, build) => {
} else {
expect(response.completedAt).to.be.undefined;
}
- /* eslint-disable eqeqeq */
+
expect(build.error == response.error).to.be.ok;
expect(build.branch == response.branch).to.be.ok;
expect(build.requestedCommitSha == response.requestedCommitSha).to.be.ok;
- /* eslint-enable eqeqeq */
expect(response.site.id).to.equal(build.site || build.Site.id);
expect(response.user.id).to.equal(build.user || build.User.id);
expect(response.buildLogs).to.be.undefined;
@@ -139,7 +138,7 @@ describe('Admin - Site API', () => {
factory.user(),
factory.build(),
]);
- const logs = await BuildLog.bulkCreate(
+ await BuildLog.bulkCreate(
Array(5).fill(0).map(() => ({
output: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam fringilla, arcu ut ultricies auctor, elit quam consequat neque, eu blandit metus lorem non turpis.',
source: 'ALL',
diff --git a/test/api/admin/requests/domain.test.js b/test/api/admin/requests/domain.test.js
index 32df90414..3bd48d1f2 100644
--- a/test/api/admin/requests/domain.test.js
+++ b/test/api/admin/requests/domain.test.js
@@ -42,8 +42,7 @@ describe('Admin - Domains API', () => {
it('should block all unauthenticated actions', async () => {
await Promise.all(
routes.map(async (route) => {
- const response = await request(app)
- [route.method](route.path)
+ const response = await request(app)[route.method](route.path)
.expect(401);
expect(response.body.message).to.equal('Unauthorized');
})
@@ -53,8 +52,7 @@ describe('Admin - Domains API', () => {
describe('GET /admin/reports/published-sites', () => {
it('should require admin authentication', async () => {
- const response = await request(app)
- ['get']('/reports/published-sites')
+ const response = await request(app)['get']('/reports/published-sites')
.expect(401);
expect(response.body.message).to.equal('Unauthorized');
});
@@ -99,8 +97,7 @@ describe('Admin - Domains API', () => {
describe('GET /admin/reports/published-sites.csv', () => {
it('should require admin authentication', async () => {
- const response = await request(app)
- ['get']('/reports/published-sites.csv')
+ const response = await request(app)['get']('/reports/published-sites.csv')
.expect(401);
expect(response.body.message).to.equal('Unauthorized');
});
@@ -139,7 +136,7 @@ describe('Admin - Domains API', () => {
expect(response.headers['content-disposition']).to.equal(
'attachment; filename="published-sites.csv"'
);
- [header, ...data] = response.text.split(/\n/);
+ const [header, ...data] = response.text.split(/\n/);
expect(header).to.equal(
'"Organization","Agency","Self Authorized","Site","Domain","Engine"'
);
diff --git a/test/api/admin/requests/organization.test.js b/test/api/admin/requests/organization.test.js
index f27a567f9..5607ce47b 100644
--- a/test/api/admin/requests/organization.test.js
+++ b/test/api/admin/requests/organization.test.js
@@ -20,8 +20,7 @@ describe('Admin - Organizations API', () => {
describe('GET /admin/reports/organizations', () => {
it('should require admin authentication', async () => {
- const response = await request(app)
- ['get']('/reports/organizations')
+ const response = await request(app)['get']('/reports/organizations')
.expect(401);
expect(response.body.message).to.equal('Unauthorized');
});
@@ -47,8 +46,7 @@ describe('Admin - Organizations API', () => {
describe('GET /admin/reports/organizations.csv', () => {
it('should require admin authentication', async () => {
- const response = await request(app)
- ['get']('/reports/organizations.csv')
+ const response = await request(app)['get']('/reports/organizations.csv')
.expect(401);
expect(response.body.message).to.equal('Unauthorized');
});
@@ -71,7 +69,7 @@ describe('Admin - Organizations API', () => {
expect(response.headers['content-disposition']).to.equal(
'attachment; filename="organizations.csv"'
);
- [header, ...data] = response.text.split(/\n/);
+ const [header, ...data] = response.text.split(/\n/);
expect(header).to.equal(
'"Organization","Agency","Self Authorized"'
);
diff --git a/test/api/admin/requests/user.test.js b/test/api/admin/requests/user.test.js
index 2ea239b1b..36c639f3d 100644
--- a/test/api/admin/requests/user.test.js
+++ b/test/api/admin/requests/user.test.js
@@ -30,8 +30,7 @@ describe('Admin - Users API', () => {
describe('GET /admin/reports/users', () => {
it('should require admin authentication', async () => {
- const response = await request(app)
- ['get']('/reports/users')
+ const response = await request(app)['get']('/reports/users')
.expect(401);
expect(response.body.message).to.equal('Unauthorized');
});
@@ -55,7 +54,7 @@ describe('Admin - Users API', () => {
.expect(200);
expect(body.data.length).to.equal(2);
- ids = body.data.map(user => user['id']);
+ const ids = body.data.map(user => user['id']);
expect(ids).to.include(user1.id);
expect(ids).to.include(user2.id);
});
@@ -63,8 +62,7 @@ describe('Admin - Users API', () => {
describe('GET /admin/reports/users.csv', () => {
it('should require admin authentication', async () => {
- const response = await request(app)
- ['get']('/reports/users.csv')
+ const response = await request(app)['get']('/reports/users.csv')
.expect(401);
expect(response.body.message).to.equal('Unauthorized');
});
@@ -95,7 +93,7 @@ describe('Admin - Users API', () => {
expect(response.headers['content-disposition']).to.equal(
'attachment; filename="users.csv"'
);
- [header, ...data] = response.text.split(/\n/);
+ const [header, ...data] = response.text.split(/\n/);
expect(header).to.equal(
'"ID","Email","Organizations","Details","Created","Last Signed In"'
);
@@ -111,8 +109,7 @@ describe('Admin - Users API', () => {
describe('GET /admin/reports/active-users', () => {
it('should require admin authentication', async () => {
- const response = await request(app)
- ['get']('/reports/active-users')
+ const response = await request(app)['get']('/reports/active-users')
.expect(401);
expect(response.body.message).to.equal('Unauthorized');
});
@@ -146,7 +143,7 @@ describe('Admin - Users API', () => {
.expect(200);
expect(body.data.length).to.equal(2);
- ids = body.data.map(user => user['id']);
+ const ids = body.data.map(user => user['id']);
expect(ids).to.include(user1.id);
expect(ids).to.include(user2.id);
expect(ids).to.not.include(user3.id);
@@ -156,8 +153,7 @@ describe('Admin - Users API', () => {
describe('GET /admin/reports/active-users.csv', () => {
it('should require admin authentication', async () => {
- const response = await request(app)
- ['get']('/reports/active-users.csv')
+ const response = await request(app)['get']('/reports/active-users.csv')
.expect(401);
expect(response.body.message).to.equal('Unauthorized');
});
@@ -195,7 +191,7 @@ describe('Admin - Users API', () => {
expect(response.headers['content-disposition']).to.equal(
'attachment; filename="users.csv"'
);
- [header, ...data] = response.text.split(/\n/);
+ const [header, ...data] = response.text.split(/\n/);
expect(header).to.equal(
'"ID","Email","Organizations","Details","Created","Last Signed In"'
);
diff --git a/test/api/requests/auth.test.js b/test/api/requests/auth.test.js
index 41c6e066d..62ab29cdc 100644
--- a/test/api/requests/auth.test.js
+++ b/test/api/requests/auth.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-underscore-dangle */
const { expect } = require('chai');
const nock = require('nock');
const request = require('supertest');
diff --git a/test/api/requests/build-logs.test.js b/test/api/requests/build-logs.test.js
index 685ffe5c6..d4ac66e49 100644
--- a/test/api/requests/build-logs.test.js
+++ b/test/api/requests/build-logs.test.js
@@ -18,11 +18,10 @@ function clean() {
describe('Build Log API', () => {
let userRole;
- let managerRole;
before(async () => {
await clean();
- [userRole, managerRole] = await Promise.all([
+ [userRole] = await Promise.all([
Role.findOne({ where: { name: 'user' } }),
Role.findOne({ where: { name: 'manager' } }),
]);
diff --git a/test/api/requests/build.test.js b/test/api/requests/build.test.js
index 68b906f41..a8e24ab66 100644
--- a/test/api/requests/build.test.js
+++ b/test/api/requests/build.test.js
@@ -33,11 +33,10 @@ describe('Build API', () => {
} else {
expect(response.completedAt).to.be.undefined;
}
- /* eslint-disable eqeqeq */
+
expect(build.error == response.error).to.be.ok;
expect(build.branch == response.branch).to.be.ok;
expect(build.requestedCommitSha == response.requestedCommitSha).to.be.ok;
- /* eslint-enable eqeqeq */
expect(response.site.id).to.equal(build.site || build.Site.id);
expect(response.user.id).to.equal(build.user || build.User.id);
expect(response.buildLogs).to.be.undefined;
@@ -423,7 +422,7 @@ describe('Build API', () => {
cookie: authenticatedSession(userPromise),
})
.then((promisedValues) => {
- ({ site, build } = promisedValues);
+ ({ build } = promisedValues);
const cookie = promisedValues.cookie;
return request(app)
@@ -442,8 +441,6 @@ describe('Build API', () => {
});
it('should not return the matching build if it is not associated with the current user', (done) => {
- let build;
-
const userPromise = factory.user();
const sitePromise = factory.site();
const buildPromise = factory.build({ site: sitePromise, user: userPromise });
@@ -455,10 +452,7 @@ describe('Build API', () => {
build: buildPromise,
cookie: authenticatedSession(userPromise),
})
- .then((promisedValues) => {
- build = promisedValues.build;
- const cookie = promisedValues.cookie;
-
+ .then(({ cookie }) => {
return request(app)
.get(`/v0/build/$build.id}`)
.set('Cookie', cookie)
diff --git a/test/api/requests/domain.test.js b/test/api/requests/domain.test.js
index 95904f0e0..63b60365d 100644
--- a/test/api/requests/domain.test.js
+++ b/test/api/requests/domain.test.js
@@ -1,7 +1,6 @@
const { expect } = require('chai');
const request = require('supertest');
const sinon = require('sinon');
-const yaml = require('js-yaml');
const factory = require('../support/factory');
const csrfToken = require('../support/csrfToken');
const { authenticatedSession } = require('../support/session');
@@ -577,7 +576,7 @@ describe('Domain API', () => {
context,
});
- const [_, domain2] = await Promise.all([
+ const [, domain2] = await Promise.all([
factory.domain.create({
siteId: site.id,
siteBranchConfigId: site.SiteBranchConfigs[0].id,
@@ -628,7 +627,7 @@ describe('Domain API', () => {
context,
});
- const [_, domain2] = await Promise.all([
+ const [, domain2] = await Promise.all([
factory.domain.create({
siteId: site.id,
siteBranchConfigId: site.SiteBranchConfigs[0].id,
diff --git a/test/api/requests/published-file.test.js b/test/api/requests/published-file.test.js
index 50f12b255..0880a7c62 100644
--- a/test/api/requests/published-file.test.js
+++ b/test/api/requests/published-file.test.js
@@ -21,14 +21,23 @@ describe('Published Files API', () => {
beforeEach(() => s3Mock.reset());
it('should require authentication', (done) => {
- factory.site()
- .then(site => request(app)
- .get(`/v0/site/${site.id}/published-branch/${site.defaultBranch}`)
- .expect(403))
+ factory
+ .site()
+ .then((site) =>
+ request(app)
+ .get(`/v0/site/${site.id}/published-branch/${site.defaultBranch}`)
+ .expect(403),
+ )
.then((response) => {
- validateAgainstJSONSchema('GET', '/site/{site_id}/published-branch/{branch}/published-file', 403, response.body);
+ validateAgainstJSONSchema(
+ 'GET',
+ '/site/{site_id}/published-branch/{branch}/published-file',
+ 403,
+ response.body,
+ );
done();
- }).catch(done);
+ })
+ .catch(done);
});
it('should list the files published to the branch for the site', (done) => {
@@ -48,50 +57,57 @@ describe('Published Files API', () => {
user: userPromise,
site: sitePromise,
cookie: cookiePromise,
- }).then((promisedValues) => {
- ({ site } = promisedValues);
- prefix = `site/${site.owner}/${site.repository}/`;
-
- s3Mock.on(ListObjectsV2Command).resolvesOnce({
- IsTruncated: true,
- Contents: [
- { Key: `${prefix}abc`, Size: 123 },
- { Key: `${prefix}abc/def`, Size: 456 },
- ],
- ContinuationToken: 'A',
- NextContinuationToken: 'B',
- }).resolvesOnce({
- IsTruncated: false,
- Contents: [
- { Key: `${prefix}ghi`, Size: 789 },
- ],
- ContinuationToken: 'B',
- NextContinuationToken: null,
- });
-
- return request(app)
- .get(`/v0/site/${site.id}/published-branch/main/published-file`)
- .set('Cookie', promisedValues.cookie)
- .expect(200);
- }).then((response) => {
- validateAgainstJSONSchema('GET', '/site/{site_id}/published-branch/{branch}/published-file', 200, response.body);
-
- const { files } = response.body;
- files.forEach((file) => {
- delete file.publishedBranch; // eslint-disable-line no-param-reassign
- });
- expect(files).to.deep.equal([
- { name: 'abc', size: 123, key: `${prefix}abc` },
- { name: 'abc/def', size: 456, key: `${prefix}abc/def` },
- { name: 'ghi', size: 789, key: `${prefix}ghi` },
- ]);
- done();
- }).catch(done);
+ })
+ .then((promisedValues) => {
+ ({ site } = promisedValues);
+ prefix = `site/${site.owner}/${site.repository}/`;
+
+ s3Mock
+ .on(ListObjectsV2Command)
+ .resolvesOnce({
+ IsTruncated: true,
+ Contents: [
+ { Key: `${prefix}abc`, Size: 123 },
+ { Key: `${prefix}abc/def`, Size: 456 },
+ ],
+ ContinuationToken: 'A',
+ NextContinuationToken: 'B',
+ })
+ .resolvesOnce({
+ IsTruncated: false,
+ Contents: [{ Key: `${prefix}ghi`, Size: 789 }],
+ ContinuationToken: 'B',
+ NextContinuationToken: null,
+ });
+
+ return request(app)
+ .get(`/v0/site/${site.id}/published-branch/main/published-file`)
+ .set('Cookie', promisedValues.cookie)
+ .expect(200);
+ })
+ .then((response) => {
+ validateAgainstJSONSchema(
+ 'GET',
+ '/site/{site_id}/published-branch/{branch}/published-file',
+ 200,
+ response.body,
+ );
+
+ const { files } = response.body;
+ files.forEach((file) => {
+ delete file.publishedBranch;
+ });
+ expect(files).to.deep.equal([
+ { name: 'abc', size: 123, key: `${prefix}abc` },
+ { name: 'abc/def', size: 456, key: `${prefix}abc/def` },
+ { name: 'ghi', size: 789, key: `${prefix}ghi` },
+ ]);
+ done();
+ })
+ .catch(done);
});
it('should 404 is site owner is NaN', (done) => {
- let site;
- let prefix;
const userPromise = factory.user();
const sitePromise = factory.site({
defaultBranch: 'main',
@@ -103,23 +119,26 @@ describe('Published Files API', () => {
user: userPromise,
site: sitePromise,
cookie: cookiePromise,
- }).then((promisedValues) => {
- ({ site } = promisedValues);
- prefix = `site/${site.owner}/${site.repository}/`;
-
- return request(app)
- .get('/v0/site/NaN/published-branch/main/published-file')
- .set('Cookie', promisedValues.cookie)
- .expect(404);
- }).then((response) => {
- validateAgainstJSONSchema('GET', '/site/{site_id}/published-branch/{branch}/published-file', 404, response.body);
- done();
- }).catch(done);
+ })
+ .then((promisedValues) => {
+ return request(app)
+ .get('/v0/site/NaN/published-branch/main/published-file')
+ .set('Cookie', promisedValues.cookie)
+ .expect(404);
+ })
+ .then((response) => {
+ validateAgainstJSONSchema(
+ 'GET',
+ '/site/{site_id}/published-branch/{branch}/published-file',
+ 404,
+ response.body,
+ );
+ done();
+ })
+ .catch(done);
});
it('should 404 is site owner is not found', (done) => {
- let site;
- let prefix;
const userPromise = factory.user();
const sitePromise = factory.site({
defaultBranch: 'main',
@@ -131,18 +150,23 @@ describe('Published Files API', () => {
user: userPromise,
site: sitePromise,
cookie: cookiePromise,
- }).then((promisedValues) => {
- ({ site } = promisedValues);
- prefix = `site/${site.owner}/${site.repository}/`;
-
- return request(app)
- .get('/v0/site/-1/published-branch/main/published-file')
- .set('Cookie', promisedValues.cookie)
- .expect(404);
- }).then((response) => {
- validateAgainstJSONSchema('GET', '/site/{site_id}/published-branch/{branch}/published-file', 404, response.body);
- done();
- }).catch(done);
+ })
+ .then((promisedValues) => {
+ return request(app)
+ .get('/v0/site/-1/published-branch/main/published-file')
+ .set('Cookie', promisedValues.cookie)
+ .expect(404);
+ })
+ .then((response) => {
+ validateAgainstJSONSchema(
+ 'GET',
+ '/site/{site_id}/published-branch/{branch}/published-file',
+ 404,
+ response.body,
+ );
+ done();
+ })
+ .catch(done);
});
it('should 403 if the user is not associated with the site', (done) => {
@@ -151,14 +175,24 @@ describe('Published Files API', () => {
const cookie = authenticatedSession(user);
Promise.props({ user, site, cookie })
- .then(promisedValues => request(app)
- .get(`/v0/site/${promisedValues.site.id}/published-branch/main/published-file`)
- .set('Cookie', promisedValues.cookie)
- .expect(403))
+ .then((promisedValues) =>
+ request(app)
+ .get(
+ `/v0/site/${promisedValues.site.id}/published-branch/main/published-file`,
+ )
+ .set('Cookie', promisedValues.cookie)
+ .expect(403),
+ )
.then((response) => {
- validateAgainstJSONSchema('GET', '/site/{site_id}/published-branch/{branch}/published-file', 403, response.body);
+ validateAgainstJSONSchema(
+ 'GET',
+ '/site/{site_id}/published-branch/{branch}/published-file',
+ 403,
+ response.body,
+ );
done();
- }).catch(done);
+ })
+ .catch(done);
});
});
});
diff --git a/test/api/requests/site.test.js b/test/api/requests/site.test.js
index 3f5b9b60f..6e96d4497 100644
--- a/test/api/requests/site.test.js
+++ b/test/api/requests/site.test.js
@@ -3,7 +3,6 @@ const { expect } = require('chai');
const nock = require('nock');
const request = require('supertest');
const sinon = require('sinon');
-const yaml = require('js-yaml');
const app = require('../../../app');
const config = require('../../../config');
@@ -264,11 +263,6 @@ describe('Site API', () => {
function cfMockServices(owner, repository) {
const { bucketGuid, name, s3 } = createMockVariables(owner, repository);
- siteParams = {
- owner: crypto.randomBytes(10).toString('hex'),
- repository: crypto.randomBytes(10).toString('hex'),
- };
-
const keyName = `${name}-key`;
const planName = 'basic-vpc';
const planGuid = 'plan-guid';
diff --git a/test/api/requests/webhook.test.js b/test/api/requests/webhook.test.js
index 9e2eaf33b..5e40cf7d5 100644
--- a/test/api/requests/webhook.test.js
+++ b/test/api/requests/webhook.test.js
@@ -1,16 +1,11 @@
const crypto = require('crypto');
-const { expect } = require('chai');
-const nock = require('nock');
const sinon = require('sinon');
const request = require('supertest');
const app = require('../../../app');
const config = require('../../../config');
const factory = require('../support/factory');
-const githubAPINocks = require('../support/githubAPINocks');
-const { Build, Site, User, Event } = require('../../../api/models');
-const SiteBuildQueue = require('../../../api/services/SiteBuildQueue');
+const { User } = require('../../../api/models');
const EventCreator = require('../../../api/services/EventCreator');
-const GithubBuildHelper = require('../../../api/services/GithubBuildHelper');
const Webhooks = require('../../../api/services/Webhooks');
@@ -42,11 +37,9 @@ describe('Webhook API', () => {
}
});
- let errorStub;
- let auditStub;
beforeEach(() => {
- errorStub = sinon.stub(EventCreator, 'error').resolves();
- auditStub = sinon.stub(EventCreator, 'audit').resolves();
+ sinon.stub(EventCreator, 'error').resolves();
+ sinon.stub(EventCreator, 'audit').resolves();
});
afterEach(() => {
diff --git a/test/api/support/factory/build-task-type.js b/test/api/support/factory/build-task-type.js
index 7de1a8378..ed9125b07 100644
--- a/test/api/support/factory/build-task-type.js
+++ b/test/api/support/factory/build-task-type.js
@@ -1,12 +1,11 @@
const { BuildTaskType } = require('../../../../api/models');
-// eslint-disable-next-line no-underscore-dangle
const _attributes = ({
name, description, metadata, runner, startsWhen,
} = {}) => ({
name: name || 'build task type name',
description: description || 'build task type description',
- metadata: metadata || { appName: 'a11y' }, // we need a default appName for matching scan rules
+ metadata: metadata || { appName: 'a11y' },
runner: runner || 'cf_task',
startsWhen: startsWhen || 'complete',
});
@@ -15,7 +14,6 @@ const buildTaskType = overrides => Promise.props(_attributes(overrides))
.then((attributes) => {
Object.keys(attributes).forEach((key) => {
if (attributes[key].sequelize) {
- // eslint-disable-next-line no-param-reassign
attributes[key] = attributes[key].id;
}
});
diff --git a/test/api/support/factory/build-task.js b/test/api/support/factory/build-task.js
index bd578768a..c828cdfce 100644
--- a/test/api/support/factory/build-task.js
+++ b/test/api/support/factory/build-task.js
@@ -3,7 +3,6 @@ const buildTaskTypeFactory = require('./build-task-type');
const siteBuildTaskFactory = require('./site-build-task');
const { BuildTask } = require('../../../../api/models');
-// eslint-disable-next-line no-underscore-dangle
const _attributes = ({
build,
buildTaskTypeId,
@@ -28,7 +27,6 @@ const buildTask = overrides => Promise.props(_attributes(overrides))
.then((attributes) => {
Object.keys(attributes).forEach((key) => {
if (attributes[key].sequelize) {
- // eslint-disable-next-line no-param-reassign
attributes[key] = attributes[key].id;
}
});
diff --git a/test/api/support/factory/build.js b/test/api/support/factory/build.js
index 219964c5e..e32da40e6 100644
--- a/test/api/support/factory/build.js
+++ b/test/api/support/factory/build.js
@@ -2,7 +2,6 @@ const siteFactory = require('./site');
const userFactory = require('./user');
const { Build } = require('../../../../api/models');
-// eslint-disable-next-line no-underscore-dangle
const _attributes = (overrides = {}) => {
let { user, site, username, branch } = overrides;
@@ -36,7 +35,6 @@ function build(overrides) {
.then((attributes) => {
Object.keys(attributes).forEach((key) => {
if (attributes[key].sequelize) {
- // eslint-disable-next-line no-param-reassign
attributes[key] = attributes[key].id;
}
});
diff --git a/test/api/support/factory/cf-api-response.js b/test/api/support/factory/cf-api-response.js
index bf3a302c2..ad06da574 100644
--- a/test/api/support/factory/cf-api-response.js
+++ b/test/api/support/factory/cf-api-response.js
@@ -1,8 +1,8 @@
const crypto = require('crypto');
const relationshipBuilder = (guid) => {
- guid = guid || crypto.randomUUID()
- return { data: { guid } };
+ const value = guid || crypto.randomUUID()
+ return { data: { guid: value } };
};
const createCFAPIResource = ({
diff --git a/test/api/support/factory/site-build-task.js b/test/api/support/factory/site-build-task.js
index a1371a258..81ea9709b 100644
--- a/test/api/support/factory/site-build-task.js
+++ b/test/api/support/factory/site-build-task.js
@@ -3,7 +3,6 @@ const siteFactory = require('./site');
const { SiteBuildTask } = require('../../../../api/models');
-// eslint-disable-next-line no-underscore-dangle
const _attributes = ({
siteId, buildTaskTypeId, branch, metadata,
} = {}) => ({
@@ -17,7 +16,6 @@ const siteBuildTask = overrides => Promise.props(_attributes(overrides))
.then((attributes) => {
Object.keys(attributes).forEach((key) => {
if (attributes[key]?.sequelize) {
- // eslint-disable-next-line no-param-reassign
attributes[key] = attributes[key].id;
}
});
diff --git a/test/api/support/factory/site.js b/test/api/support/factory/site.js
index 58df6baa2..cec49d266 100644
--- a/test/api/support/factory/site.js
+++ b/test/api/support/factory/site.js
@@ -77,13 +77,13 @@ async function addSiteBranchConfigs(site) {
}
function site(overrides, options = {}) {
- let site; // eslint-disable-line no-shadow
+ let site;
let users;
return Promise.props(makeAttributes(overrides))
.then((attributes) => {
users = attributes.users.slice();
- delete attributes.users; // eslint-disable-line no-param-reassign
+ delete attributes.users;
return Site.create(attributes);
})
diff --git a/test/api/support/githubAPINocks.js b/test/api/support/githubAPINocks.js
index d6e363067..2261dbd1f 100644
--- a/test/api/support/githubAPINocks.js
+++ b/test/api/support/githubAPINocks.js
@@ -1,10 +1,10 @@
+/* eslint no-param-reassign: 0 */
const nock = require('nock');
const config = require('../../../config');
const withAuth = (nok, accessToken) => nok.matchHeader('authorization', `token ${accessToken}`);
const getAccessToken = ({ authorizationCode, accessToken, scope } = {}) => {
- /* eslint-disable no-param-reassign */
authorizationCode = authorizationCode || 'auth-code-123abc';
accessToken = accessToken || 'access-token-123abc';
@@ -13,7 +13,6 @@ const getAccessToken = ({ authorizationCode, accessToken, scope } = {}) => {
} else {
scope = 'user,repo';
}
- /* eslint-enable no-param-reassign */
return nock('https://github.com')
.post('/login/oauth/access_token', (body) => {
@@ -142,13 +141,11 @@ const createRepoUsingTemplate = ({
const user = ({
accessToken, githubUserID, username, email,
} = {}) => {
- /* eslint-disable no-param-reassign */
accessToken = accessToken || 'access-token-123abc';
const userID = githubUserID || Math.floor(Math.random() * 10000);
username = (username || `user-${userID}`).toUpperCase();
email = email || `${username}@example.com`.toLowerCase();
- /* eslint-enable no-param-reassign */
const expectedHeaders = {
reqheaders: { authorization: `Bearer ${accessToken}` },
@@ -164,10 +161,8 @@ const user = ({
};
const userOrganizations = ({ accessToken, organizations, response } = {}) => {
- /* eslint-disable no-param-reassign */
accessToken = accessToken || 'access-token-123abc';
organizations = organizations || [{ id: 123456 }];
- /* eslint-enable no-param-reassign */
let orgsNock = nock('https://api.github.com');
@@ -186,7 +181,6 @@ const githubAuth = (username, organizations) => {
};
const repo = ({
- // eslint-disable-next-line no-shadow
accessToken, owner, repo, username, defaultBranch, response,
} = {}) => {
let webhookNock = nock('https://api.github.com');
@@ -227,7 +221,6 @@ const repo = ({
};
const status = ({
- // eslint-disable-next-line no-shadow
accessToken, owner, repo, sha, state, targetURL, response,
} = {}) => {
let path;
@@ -238,7 +231,7 @@ const status = ({
}
let statusNock = nock('https://api.github.com').post(path, (body) => {
- if (state && body.state != state) { return false; }// eslint-disable-line eqeqeq
+ if (state && body.state != state) { return false; }
if (targetURL && body.target_url !== targetURL) { return false; }
@@ -272,7 +265,6 @@ const status = ({
const webhook = (
{
- // eslint-disable-next-line no-shadow
accessToken,
owner,
repo,
@@ -329,7 +321,6 @@ function listWebhooks({
}
const getBranch = ({
- // eslint-disable-next-line no-shadow
accessToken, owner, repo, branch, expected,
}) => {
let branchNock = nock('https://api.github.com');
@@ -353,17 +344,14 @@ const getBranch = ({
return branchNock.reply(200, output);
};
-/* eslint-disable camelcase */
const getOrganizationMembers = ({
accessToken, organization, role, per_page, page, response, responseCode,
}) => {
- /* eslint-disable no-param-reassign */
accessToken = accessToken || 'access-token-123abc';
organization = organization || 'test-org';
per_page = per_page || 100;
page = page || 1;
role = role || 'all';
- /* eslint-enable no-param-reassign */
const orgMembers = [];
for (let i = 0; i < (per_page + 1); i += 1) {
@@ -387,12 +375,10 @@ const getOrganizationMembers = ({
const getTeamMembers = ({
accessToken, org, team_slug, per_page, page, response,
} = {}) => {
- /* eslint-disable no-param-reassign */
accessToken = accessToken || 'access-token-123abc';
team_slug = team_slug || 'test-team';
per_page = per_page || 100;
page = page || 1;
- /* eslint-enable no-param-reassign */
const teamMembers = [];
for (let i = 0; i < (per_page + 2); i += 1) {
@@ -407,11 +393,9 @@ const getTeamMembers = ({
const getRepositories = ({
accessToken, per_page, page, response,
}) => {
- /* eslint-disable no-param-reassign */
accessToken = accessToken || 'access-token-123abc';
per_page = per_page || 100;
page = page || 1;
- /* eslint-enable no-param-reassign */
const repos = [];
for (let i = 0; i < (per_page + 1); i += 1) {
@@ -430,13 +414,11 @@ const getRepositories = ({
const getCollaborators = ({
accessToken, owner, repository, per_page, page, response,
}) => {
- /* eslint-disable no-param-reassign */
accessToken = accessToken || 'access-token-123abc';
per_page = per_page || 100;
page = page || 1;
owner = owner || 'owner';
repository = repository || 'repo';
- /* eslint-enable no-param-reassign */
const collabs = [];
for (let i = 0; i < (per_page + 1); i += 1) {
@@ -447,7 +429,6 @@ const getCollaborators = ({
.get(`/repos/${owner}/${repository}/collaborators?per_page=${per_page}&page=${page}`)
.reply(response || 200, collabs.slice(((page - 1) * per_page), (page * per_page)));
};
-/* eslint-enable camelcase */
const getMembershipForUserInOrg = ({
accessToken = 'access-token-123abc',
@@ -476,10 +457,9 @@ const getMembershipForUserInOrg = ({
const getContent = ({
accessToken, owner, repo, path, ref, content, encoding, type, responseCode,
}) => {
- /* eslint-disable no-param-reassign */
accessToken = accessToken || 'access-token-123abc';
responseCode = responseCode || 200;
- /* eslint-enable no-param-reassign */
+
let requestPath = `/repos/${owner}/${repo}/contents/${path}`;
if (ref) {
requestPath = `${requestPath}?ref=${ref}`;
diff --git a/test/api/support/queues.js b/test/api/support/queues.js
index ebfe3606a..80d3f08fe 100644
--- a/test/api/support/queues.js
+++ b/test/api/support/queues.js
@@ -43,7 +43,6 @@ function promisedQueueAllEvents(queueEvents) {
return new Promise((resolve) => {
events.forEach((event) =>
queueEvents.on(event, (x) => {
- console.log(event);
return resolve(x);
})
);
diff --git a/test/api/support/session.js b/test/api/support/session.js
index e9fd0c0fa..61630f718 100644
--- a/test/api/support/session.js
+++ b/test/api/support/session.js
@@ -33,7 +33,7 @@ function unauthenticatedSession({ oauthState, authRedirectPath, cfg = sessionCon
});
}
-function authenticatedSession(user, cfg = sessionConfig, role = 'pages.admin') {
+function authenticatedSession(user, cfg = sessionConfig) {
const sessionKey = crypto.randomBytes(8).toString('hex');
return Promise.resolve(user || factory.user())
diff --git a/test/api/unit/models/build-task.test.js b/test/api/unit/models/build-task.test.js
index 7c9c6b28f..58eea5093 100644
--- a/test/api/unit/models/build-task.test.js
+++ b/test/api/unit/models/build-task.test.js
@@ -47,7 +47,7 @@ describe('Build Task model', () => {
// add N extra for the same site
const N = 5;
- // eslint-disable-next-line no-unused-vars
+
await Promise.all(Array(N).fill(0).map(async (_) => {
build = await factory.build({ site });
return factory.buildTask({ build, buildTaskTypeId: buildTaskType.id });
diff --git a/test/api/unit/models/build.test.js b/test/api/unit/models/build.test.js
index fd40e3ba1..8af07fe12 100644
--- a/test/api/unit/models/build.test.js
+++ b/test/api/unit/models/build.test.js
@@ -3,7 +3,7 @@ const sinon = require('sinon');
const { DatabaseError, ValidationError } = require('sequelize');
const QueueJobs = require('../../../../api/queue-jobs');
const factory = require('../../support/factory');
-const { Build, Site, BuildTask } = require('../../../../api/models');
+const { Build, Site } = require('../../../../api/models');
const config = require('../../../../config');
describe('Build model', () => {
@@ -380,18 +380,18 @@ describe('Build model', () => {
expect(buildQuery.id).to.equal(build.id);
});
- it('throws when pk is Nan', () => {
+ it('throws when pk is Nan', async () => {
const pk = NaN;
- const buildQuery = Build.findByPk(pk);
+ const buildQuery = await Build.findByPk(pk);
return expect(buildQuery).to.be.rejectedWith(DatabaseError);
});
- it('throws when pk is non-number string', () => {
+ it('throws when pk is non-number string', async () => {
const pk = 'foobar';
- const buildQuery = Build.findByPk(pk);
+ const buildQuery = await Build.findByPk(pk);
return expect(buildQuery).to.be.rejectedWith(DatabaseError);
});
diff --git a/test/api/unit/models/site-build-task.test.js b/test/api/unit/models/site-build-task.test.js
index 8acadc42c..ded921701 100644
--- a/test/api/unit/models/site-build-task.test.js
+++ b/test/api/unit/models/site-build-task.test.js
@@ -1,7 +1,7 @@
const { expect } = require('chai');
const sinon = require('sinon');
const factory = require('../../support/factory');
-const { SiteBuildTask, BuildTask } = require('../../../../api/models');
+const { BuildTask } = require('../../../../api/models');
describe('Build Task model', () => {
afterEach(() => {
diff --git a/test/api/unit/models/user-environment-variable.test.js b/test/api/unit/models/user-environment-variable.test.js
index 2af4df350..47ee478dc 100644
--- a/test/api/unit/models/user-environment-variable.test.js
+++ b/test/api/unit/models/user-environment-variable.test.js
@@ -1,6 +1,5 @@
const { expect } = require('chai');
const factories = require('../../support/factory');
-const { UserEnvironmentVariable } = require('../../../../api/models');
describe('UserEnvironmentVariable model', () => {
describe('requires unique name per site', () => {
diff --git a/test/api/unit/queue-jobs/mailer.test.js b/test/api/unit/queue-jobs/mailer.test.js
index 436d934d9..ef53edc98 100644
--- a/test/api/unit/queue-jobs/mailer.test.js
+++ b/test/api/unit/queue-jobs/mailer.test.js
@@ -118,7 +118,7 @@ describe('mailer', () => {
jobs.forEach((job) => {
expect(job.name).to.eq('sandbox-reminder');
expect(org.Users.find(u => job.data.to.includes(u.UAAIdentity.email))).to.not.be.null;
- expect(job.data.subject).to.eq(`Your Pages sandbox organization\'s sites will be removed in ${expiryDays} days`);
+ expect(job.data.subject).to.eq(`Your Pages sandbox organization's sites will be removed in ${expiryDays} days`);
expect(job.data.html).to.eq(Templates.sandboxReminder({
organizationId: org.id, dateStr, organizationName: org.name, hostname, sites: org.Sites,
}));
diff --git a/test/api/unit/serializers/site.test.js b/test/api/unit/serializers/site.test.js
index ca34ebd6c..941f16c6c 100644
--- a/test/api/unit/serializers/site.test.js
+++ b/test/api/unit/serializers/site.test.js
@@ -68,7 +68,7 @@ describe('SiteSerializer', () => {
it('includes URL editability when associated to domain', async () => {
const site = await factory.site({ domain: 'https://www.agency.gov', demoDomain: null });
- const domain = await factory.domain.create({ siteId: site.id, names: 'www.agency.gov', context: Domain.Contexts.Site });
+ await factory.domain.create({ siteId: site.id, names: 'www.agency.gov', context: Domain.Contexts.Site });
await site.reload({ include: [ Domain ] });
const object = await SiteSerializer.serializeObject(site);
diff --git a/test/api/unit/services/EventCreator.test.js b/test/api/unit/services/EventCreator.test.js
index 9b9ed9e98..a101e32ba 100644
--- a/test/api/unit/services/EventCreator.test.js
+++ b/test/api/unit/services/EventCreator.test.js
@@ -5,7 +5,6 @@ const { audit, error } = require('../../../../api/services/EventCreator');
const { logger } = require('../../../../winston');
describe('EventCreator', () => {
- let infoSpy;
let errorSpy;
beforeEach(() => {
errorSpy = sinon.spy(logger, 'error');
diff --git a/test/api/unit/services/FailStuckBuilds.test.js b/test/api/unit/services/FailStuckBuilds.test.js
index 705afd6ad..17d198c4f 100644
--- a/test/api/unit/services/FailStuckBuilds.test.js
+++ b/test/api/unit/services/FailStuckBuilds.test.js
@@ -36,16 +36,16 @@ describe('FailStuckBuilds', () => {
factory.build({ state: Created })
.then(build => setBuildUpdatedAt(build, now.clone().subtract(20, 'minutes').toDate())),
factory.build({ state: Tasked })
- .then(build => setBuildUpdatedAt(build, now.clone().subtract(20, 'minutes').toDate())), ,
+ .then(build => setBuildUpdatedAt(build, now.clone().subtract(20, 'minutes').toDate())),
// should be ignored
factory.build({ state: Created }),
factory.build({ state: Tasked }),
factory.build({ state: Processing }),
factory.build({ state: Processing })
- .then(build => setBuildUpdatedAt(build, now.clone().subtract(20, 'minutes').toDate())), ,
+ .then(build => setBuildUpdatedAt(build, now.clone().subtract(20, 'minutes').toDate())),
factory.build({ state: Queued })
- .then(build => setBuildUpdatedAt(build, now.clone().subtract(20, 'minutes').toDate())), ,
+ .then(build => setBuildUpdatedAt(build, now.clone().subtract(20, 'minutes').toDate())),
]);
const results = await runFailStuckBuilds();
diff --git a/test/api/unit/services/GitHub.test.js b/test/api/unit/services/GitHub.test.js
index 8da4e69a3..c3c7c887c 100644
--- a/test/api/unit/services/GitHub.test.js
+++ b/test/api/unit/services/GitHub.test.js
@@ -636,7 +636,6 @@ describe('GitHub', () => {
});
describe('.getTeamMembers', () => {
- /* eslint-disable camelcase */
it('returns a branch based on the supplied parameters', (done) => {
const accessToken = 'token';
const org = 'federalist-users';
@@ -669,7 +668,6 @@ describe('GitHub', () => {
done();
});
});
- /* eslint-enable camelcase */
});
describe('.sendCreateGithubStatusRequest', () => {
@@ -778,7 +776,7 @@ describe('GitHub', () => {
const repo = 'repo-name';
const path = 'file-path.json';
const ref = 'theRef';
- /* eslint-disable camelcase */
+
it('returns a file based on the supplied parameters', async () => {
const content = 'helloworld';
@@ -821,6 +819,5 @@ describe('GitHub', () => {
expect(err.status).to.equal(403);
expect(err.message).to.equal('Error Encountered');
});
- /* eslint-enable camelcase */
});
});
diff --git a/test/api/unit/services/GithubBuildHelper.test.js b/test/api/unit/services/GithubBuildHelper.test.js
index 9214fd5ed..58424c442 100644
--- a/test/api/unit/services/GithubBuildHelper.test.js
+++ b/test/api/unit/services/GithubBuildHelper.test.js
@@ -2,14 +2,12 @@ const { expect } = require('chai');
const sinon = require('sinon');
const nock = require('nock');
const config = require('../../../../config');
-const { logger } = require('../../../../winston');
const { Domain, Site, SiteBranchConfig, User } = require('../../../../api/models');
const factory = require('../../support/factory');
const githubAPINocks = require('../../support/githubAPINocks');
const { buildViewLink } = require('../../../../api/utils/build');
const GitHub = require('../../../../api/services/GitHub');
const GithubBuildHelper = require('../../../../api/services/GithubBuildHelper');
-const EventCreator = require('../../../../api/services/EventCreator');
const requestedCommitSha = 'a172b66c31e19d456a448041a5b3c2a70c32d8b7';
const clonedCommitSha = '7b8d23c07a2c3b5a140844a654d91e13c66b271a';
@@ -157,13 +155,11 @@ describe('GithubBuildHelper', () => {
it("should report that the status if the build user has invalid token'", async() => {
const repoNocks = [];
- const errorEventSpy = sinon.spy(EventCreator, 'error');
await user.update({ signedInAt: '1999-01-01'});
const otherUser = await factory.user();
await site.addUser(otherUser);
users = await site.getUsers();
- let i;
repoNocks.push(githubAPINocks.repo({
owner: site.owner,
repo: site.repository,
@@ -175,7 +171,7 @@ describe('GithubBuildHelper', () => {
repo: site.repository,
username: otherUser.username,
}));
-
+
const statusNock = githubAPINocks.status({
owner: site.owner,
repo: site.repository,
@@ -191,13 +187,11 @@ describe('GithubBuildHelper', () => {
it("should report that the status if the build user does not have write permissions'", async() => {
const repoNocks = [];
- const errorEventSpy = sinon.spy(EventCreator, 'error');
await user.update({ signedInAt: '1999-01-01'});
const otherUser = await factory.user();
await site.addUser(otherUser);
users = await site.getUsers();
- let i;
repoNocks.push(githubAPINocks.repo({
owner: site.owner,
repo: site.repository,
@@ -209,7 +203,7 @@ describe('GithubBuildHelper', () => {
repo: site.repository,
username: otherUser.username,
}));
-
+
const statusNock = githubAPINocks.status({
owner: site.owner,
repo: site.repository,
@@ -248,7 +242,7 @@ describe('GithubBuildHelper', () => {
username: recentUser.username,
response: [403, { permissions: {} }],
}));
-
+
await build.reload({ include: [{ model: Site, include: [{ model: User }] }]});
const err = await GithubBuildHelper.reportBuildStatus(build).catch(e => e);
repoNocks.forEach(repoNock => expect(repoNock.isDone()).to.be.true);
@@ -281,7 +275,7 @@ describe('GithubBuildHelper', () => {
username: recentUser.username,
response: [201, { permissions: {} }],
}));
-
+
await build.reload({ include: [{ model: Site, include: [{ model: User }] }]});
const err = await GithubBuildHelper.reportBuildStatus(build).catch(e => e);
repoNocks.forEach(repoNock => expect(repoNock.isDone()).to.be.true);
@@ -313,7 +307,7 @@ describe('GithubBuildHelper', () => {
let user;
let site;
let build;
- let users;
+
beforeEach(async() => {
user = await factory.user();
site = await factory.site({ owner: 'test-owner', repository: 'test-repo', users: [user] });
@@ -323,7 +317,7 @@ describe('GithubBuildHelper', () => {
requestedCommitSha,
user,
});
- users = await site.getUsers();
+ await site.getUsers();
})
it("should report that the status is 'pending'", async() => {
@@ -365,7 +359,7 @@ describe('GithubBuildHelper', () => {
await GithubBuildHelper.reportBuildStatus(build);
expect(repoNock.isDone()).to.be.true;
expect(statusNock.isDone()).to.be.true;
-
+
});
});
@@ -373,7 +367,7 @@ describe('GithubBuildHelper', () => {
let user;
let site;
let build;
- let users;
+
beforeEach(async() => {
user = await factory.user();
site = await factory.site({ owner: 'test-owner', repository: 'test-repo', users: [user] });
@@ -383,7 +377,7 @@ describe('GithubBuildHelper', () => {
requestedCommitSha,
user,
});
- users = await site.getUsers();
+ await site.getUsers();
})
it("should report that the status is 'pending'", async() => {
const repoNock = githubAPINocks.repo({
@@ -432,7 +426,7 @@ describe('GithubBuildHelper', () => {
let user;
let site;
let build;
- let users;
+
after(() => {
// reset config.app.appEnv to its original value
config.app.appEnv = origAppEnv;
@@ -448,7 +442,7 @@ describe('GithubBuildHelper', () => {
clonedCommitSha,
user,
});
- users = await site.getUsers();
+ await site.getUsers();
})
it('should set status context to "federalist/build" when APP_ENV is "production"', async() => {
@@ -477,7 +471,7 @@ describe('GithubBuildHelper', () => {
let user;
let site;
let build;
- let users;
+
beforeEach(async() => {
user = await factory.user();
site = await factory.site({ users: [user] })
@@ -488,7 +482,7 @@ describe('GithubBuildHelper', () => {
user,
site,
});
- users = await site.getUsers();
+ await site.getUsers();
})
it("should report that the status is 'success'", async() => {
const repoNock = githubAPINocks.repo({
@@ -536,7 +530,7 @@ describe('GithubBuildHelper', () => {
let user;
let site;
let build;
- let users;
+
beforeEach(async() => {
user = await factory.user();
site = await factory.site({ users: [user] })
@@ -546,9 +540,9 @@ describe('GithubBuildHelper', () => {
user,
site,
});
- users = await site.getUsers();
+ await site.getUsers();
});
- it("should report that the status is 'error' with requestedCommitSha", async () => {
+ it("should report that the status is 'error' with requestedCommitSha", async () => {
const repoNock = githubAPINocks.repo({
accessToken: user.githubAccessToken,
owner: site.owner,
@@ -570,7 +564,7 @@ describe('GithubBuildHelper', () => {
it("should report that the status is 'error' with clonedCommitSha", async () => {
await build.update({ clonedCommitSha });
-
+
const repoNock = githubAPINocks.repo({
accessToken: user.githubAccessToken,
owner: site.owner,
@@ -594,7 +588,7 @@ describe('GithubBuildHelper', () => {
it("should use the GitHub access token of the build's user not a site user", async () => {
const nonSiteUser = await factory.user();
await build.update({ user: nonSiteUser.id });
-
+
const repoNock = githubAPINocks.repo({
accessToken: nonSiteUser.githubAccessToken,
owner: site.owner,
@@ -611,7 +605,7 @@ describe('GithubBuildHelper', () => {
await build.reload({ include: [{ model: Site, include: [{ model: User }] }]});
await GithubBuildHelper.reportBuildStatus(build);
-
+
expect(statusNock.isDone()).to.be.true;
expect(repoNock.isDone()).to.be.true;
});
@@ -622,7 +616,7 @@ describe('GithubBuildHelper', () => {
let user;
let site;
let build;
- let users;
+
const path = 'filePath.txt';
beforeEach(async() => {
user = await factory.user();
@@ -634,12 +628,12 @@ describe('GithubBuildHelper', () => {
user,
site,
});
- users = await site.getUsers();
+ await site.getUsers();
});
it('should fetch the content requested', async () => {
- const fetchContentGitStub = sinon.stub(GitHub, 'getContent').resolves('testContent');
- const checkPermissionsGitStub = sinon.stub(GitHub, 'checkPermissions').resolves({ push: true });
+ sinon.stub(GitHub, 'getContent').resolves('testContent');
+ sinon.stub(GitHub, 'checkPermissions').resolves({ push: true });
await build.reload({ include: [{ model: Site, include: [{ model: User }] }]});
const content = await GithubBuildHelper.fetchContent(build, path);
expect(content).to.equal('testContent');
@@ -657,7 +651,7 @@ describe('GithubBuildHelper', () => {
let user;
let site;
let build;
- let users;
+
beforeEach(async () => {
user = await factory.user({ signedInAt: '1999-12-31'});
site = await factory.site({ users: [user] });
@@ -665,7 +659,7 @@ describe('GithubBuildHelper', () => {
site,
user,
});
- users = await site.getUsers();
+ await site.getUsers();
})
it('should fetch buildUser token', async () => {
@@ -684,7 +678,7 @@ describe('GithubBuildHelper', () => {
it('should fetch a siteUser token - build user no access to private repo', async () => {
const siteUser = await factory.user();
await site.addUser(siteUser);
- users = await site.getUsers();
+ await site.getUsers();
const repoNocks = [];
repoNocks.push(githubAPINocks.repo({
accessToken: user.githubAccessToken,
@@ -708,7 +702,7 @@ describe('GithubBuildHelper', () => {
it('should fetch a siteUser token - build user no permission', async () => {
const siteUser = await factory.user();
await site.addUser(siteUser);
- users = await site.getUsers();
+ await site.getUsers();
const repoNocks = [];
repoNocks.push(githubAPINocks.repo({
accessToken: user.githubAccessToken,
@@ -732,7 +726,7 @@ describe('GithubBuildHelper', () => {
it('all site user w/o permissions to private repo', async () => {
const siteUser = await factory.user();
await site.addUser(siteUser);
- users = await site.getUsers();
+ await site.getUsers();
const repoNocks = [];
repoNocks.push(githubAPINocks.repo({
accessToken: user.githubAccessToken,
@@ -764,7 +758,7 @@ describe('GithubBuildHelper', () => {
it('all site users withouth write access', async () => {
const siteUser = await factory.user();
await site.addUser(siteUser);
- users = await site.getUsers();
+ await site.getUsers();
const repoNocks = [];
repoNocks.push(githubAPINocks.repo({
accessToken: user.githubAccessToken,
diff --git a/test/api/unit/services/SandboxHelper.test.js b/test/api/unit/services/SandboxHelper.test.js
index 762d10eb9..070f2b6b7 100644
--- a/test/api/unit/services/SandboxHelper.test.js
+++ b/test/api/unit/services/SandboxHelper.test.js
@@ -89,6 +89,7 @@ describe('notifyOrganizations', () => {
const sandboxNotices = 5;
let i;
for (i = 0; i < sandboxNotices; i += 1) {
+ // eslint-disable-next-line
org = await createSandboxOrgDaysRemaining();
orgsToNotify.push(org.id);
}
diff --git a/test/api/unit/services/SiteBuildQueue.test.js b/test/api/unit/services/SiteBuildQueue.test.js
index 0bf2725e1..47595b061 100644
--- a/test/api/unit/services/SiteBuildQueue.test.js
+++ b/test/api/unit/services/SiteBuildQueue.test.js
@@ -117,7 +117,6 @@ describe('SiteBuildQueue', () => {
})
)
.then((build) => {
- // eslint-disable-line
return SiteBuildQueue.messageBodyForBuild(build).then((message) => {
const uevs = build.Site.UserEnvironmentVariables.map((uev) => ({
name: uev.name,
@@ -147,7 +146,6 @@ describe('SiteBuildQueue', () => {
})
)
.then((build) => {
- // eslint-disable-line
return SiteBuildQueue.messageBodyForBuild(build).then((message) => {
expect(
JSON.parse(messageEnv(message, 'USER_ENVIRONMENT_VARIABLES'))
@@ -832,10 +830,10 @@ describe('SiteBuildQueue', () => {
],
});
const creds = {
- access_key_id: 'access_key_id', // eslint-disable-line
+ access_key_id: 'access_key_id',
bucket: build.bucket,
region: 'region',
- secret_access_key: 'secret', // eslint-disable-line
+ secret_access_key: 'secret',
};
stubCreds.resolves(creds);
stubS3.resolves();
diff --git a/test/api/unit/services/SiteRepoMigrator.test.js b/test/api/unit/services/SiteRepoMigrator.test.js
index c6fd609df..d2947593e 100644
--- a/test/api/unit/services/SiteRepoMigrator.test.js
+++ b/test/api/unit/services/SiteRepoMigrator.test.js
@@ -3,7 +3,6 @@ const { expect } = require('chai');
const {
getUserGHCredentials,
setRepoWebhook,
- siteRepoMigrator,
} = require('../../../../api/services/SiteRepoMigrator');
const { Site, User, UAAIdentity } = require('../../../../api/models');
const githubAPINocks = require('../../support/githubAPINocks');
diff --git a/test/api/unit/services/Webhooks.test.js b/test/api/unit/services/Webhooks.test.js
index 5dfa63364..5940568e4 100644
--- a/test/api/unit/services/Webhooks.test.js
+++ b/test/api/unit/services/Webhooks.test.js
@@ -34,10 +34,8 @@ describe('Webhooks Service', () => {
}
});
- let errorStub;
let auditStub;
beforeEach(() => {
- errorStub = sinon.stub(EventCreator, 'error').resolves();
auditStub = sinon.stub(EventCreator, 'audit').resolves();
});
diff --git a/test/api/unit/utils/build.test.js b/test/api/unit/utils/build.test.js
index 58d375cb6..dca9999f8 100644
--- a/test/api/unit/utils/build.test.js
+++ b/test/api/unit/utils/build.test.js
@@ -47,14 +47,13 @@ describe('build utils', () => {
describe('buildUrl with other site branch context and s3Key', () => {
let site;
- let siteBranchConfig;
const branch = 'other-branch';
const context = 'other';
const s3Key = 'test/other';
before(async () => {
const interimSite = await factory.site({}, { noSiteBranchConfig: true });
- siteBranchConfig = await SiteBranchConfig.create({
+ await SiteBranchConfig.create({
siteId: interimSite.id,
context,
branch,
diff --git a/test/api/unit/utils/utils.test.js b/test/api/unit/utils/utils.test.js
index 64a76d6a5..ccba18f51 100644
--- a/test/api/unit/utils/utils.test.js
+++ b/test/api/unit/utils/utils.test.js
@@ -276,7 +276,6 @@ describe('utils', () => {
const spy = sinon.spy();
const error = new Error('foobar');
- // eslint-disable-next-line no-unused-vars
const handler = async (_req, _res, _next) => {
throw error;
};
@@ -295,7 +294,6 @@ describe('utils', () => {
const error = new Error('foobar');
const handlers = {
- // eslint-disable-next-line no-unused-vars
foo: async (_req, _res, _next) => {
throw error;
},
diff --git a/test/api/workers/QueueWorker.test.js b/test/api/workers/QueueWorker.test.js
index f8e52e8cb..3b57a8fc4 100644
--- a/test/api/workers/QueueWorker.test.js
+++ b/test/api/workers/QueueWorker.test.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-underscore-dangle */
const { expect } = require('chai');
const { connection } = require('../support/queues');
diff --git a/test/api/workers/jobProcessors/siteBuildRunner.test.js b/test/api/workers/jobProcessors/siteBuildRunner.test.js
index d48af496c..7486d5d30 100644
--- a/test/api/workers/jobProcessors/siteBuildRunner.test.js
+++ b/test/api/workers/jobProcessors/siteBuildRunner.test.js
@@ -12,10 +12,6 @@ const {
} = require('../../../../api/models');
const CloudFoundryAPIClient = require('../../../../api/utils/cfApiClient');
const SiteBuildQueue = require('../../../../api/services/SiteBuildQueue');
-const {
- SiteBuildsQueue,
- SiteBuildsQueueName,
-} = require('../../../../api/queues');
const jobProcessors = require('../../../../api/workers/jobProcessors');
const SiteBuildQueueService = require('../../../../api/services/SiteBuildQueue');
const factory = require('../../support/factory');
diff --git a/test/frontend/actions/siteActionsTest.js b/test/frontend/actions/siteActionsTest.js
index b1a8b514f..6468c7628 100644
--- a/test/frontend/actions/siteActionsTest.js
+++ b/test/frontend/actions/siteActionsTest.js
@@ -12,7 +12,6 @@ describe('siteActions', () => {
let addUserToSite;
let removeUserFromSite;
let updateSite;
- let updateSiteUser;
let deleteSite;
let saveBasicAuthToSite;
let removeBasicAuthFromSite;
@@ -23,7 +22,6 @@ describe('siteActions', () => {
let dispatchSitesReceivedAction;
let dispatchSiteAddedAction;
let dispatchSiteUpdatedAction;
- let dispatchSiteUserUpdatedAction;
let dispatchSiteDeletedAction;
let dispatchSiteBranchesReceivedAction;
let dispatchShowAddNewSiteFieldsAction;
@@ -63,7 +61,6 @@ describe('siteActions', () => {
addUserToSite = stub();
removeUserFromSite = stub();
updateSite = stub();
- updateSiteUser = stub();
deleteSite = stub();
saveBasicAuthToSite = stub();
removeBasicAuthFromSite = stub();
@@ -357,8 +354,6 @@ describe('siteActions', () => {
});
describe('removeBasicAuthFromSite', () => {
- const basicAuth = { username: 'username', password: 'password' };
-
it('triggers the updating of a site and dispatches a site updated action to the store when successful', () => {
// const basicAuthSite = {...site, config: { basicAuth } }
const sitePromise = Promise.resolve(site);
diff --git a/test/frontend/components/Fields/Select.test.jsx b/test/frontend/components/Fields/Select.test.jsx
deleted file mode 100644
index 30210406a..000000000
--- a/test/frontend/components/Fields/Select.test.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import React from 'react';
-import { shallow } from 'enzyme';
-import { expect } from 'chai';
-
-import Select from '../../../../frontend/components/Fields/Select';
-
-describe('