Skip to content
This repository has been archived by the owner on Mar 6, 2024. It is now read-only.

Commit

Permalink
ESLint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@JamesMessinger
JamesMessinger committed Jul 19, 2020
1 parent 7420392 commit 314236f
Show file tree
Hide file tree
Showing 30 changed files with 278 additions and 384 deletions.
10 changes: 10 additions & 0 deletions .eslintrc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,13 @@ extends: "@jsdevtools"

env:
node: true

rules:
# Prevent warnings about req, res, next params in middleware
no-unused-vars: off

# Prevent warnings about the CORS() middleware and express.Router()
new-cap: off

# Allow shadowing variables like err and req, res, next
no-shadow: off
36 changes: 18 additions & 18 deletions test/specs/cors.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ for (let spec of specs) {
expect(res.get("Access-Control-Allow-Headers")).to.equal("");
expect(res.get("Access-Control-Allow-Credentials")).to.equal("false");
expect(res.get("Access-Control-Max-Age")).to.equal("0");
expect(res.get("Vary")).to.be.undefined;
expect(res.get("Vary")).to.equal(undefined);
}));
});
});
Expand All @@ -47,7 +47,7 @@ for (let spec of specs) {
expect(res.get("Access-Control-Allow-Headers")).to.equal("");
expect(res.get("Access-Control-Allow-Credentials")).to.equal("false");
expect(res.get("Access-Control-Max-Age")).to.equal("0");
expect(res.get("Vary")).to.be.undefined;
expect(res.get("Vary")).to.equal(undefined);
}));
});
});
Expand All @@ -66,7 +66,7 @@ for (let spec of specs) {
expect(res.get("Access-Control-Allow-Headers")).to.equal("");
expect(res.get("Access-Control-Allow-Credentials")).to.equal("false");
expect(res.get("Access-Control-Max-Age")).to.equal("0");
expect(res.get("Vary")).to.be.undefined;
expect(res.get("Vary")).to.equal(undefined);
}));
});
});
Expand All @@ -85,7 +85,7 @@ for (let spec of specs) {
expect(res.get("Access-Control-Allow-Headers")).to.equal("");
expect(res.get("Access-Control-Allow-Credentials")).to.equal("false");
expect(res.get("Access-Control-Max-Age")).to.equal("0");
expect(res.get("Vary")).to.be.undefined;
expect(res.get("Vary")).to.equal(undefined);
}));
});
});
Expand Down Expand Up @@ -296,7 +296,7 @@ for (let spec of specs) {
expect(res.get("Access-Control-Allow-Headers")).to.equal("");
expect(res.get("Access-Control-Allow-Credentials")).to.equal("false");
expect(res.get("Access-Control-Max-Age")).to.equal("0");
expect(res.get("Vary")).to.be.undefined;
expect(res.get("Vary")).to.equal(undefined);
}));
});
});
Expand Down Expand Up @@ -327,7 +327,7 @@ for (let spec of specs) {
expect(res.get("Access-Control-Allow-Headers")).to.equal("");
expect(res.get("Access-Control-Allow-Credentials")).to.equal("false");
expect(res.get("Access-Control-Max-Age")).to.equal("0");
expect(res.get("Vary")).to.be.undefined;
expect(res.get("Vary")).to.equal(undefined);
}));
});
});
Expand Down Expand Up @@ -422,12 +422,12 @@ for (let spec of specs) {

// This happens before the CORS middleware, so none of the headers are set
express.options("/api/pets/:name", (req, res, next) => {
expect(res.get("Access-Control-Allow-Origin")).to.be.undefined;
expect(res.get("Access-Control-Allow-Methods")).to.be.undefined;
expect(res.get("Access-Control-Allow-Headers")).to.be.undefined;
expect(res.get("Access-Control-Allow-Credentials")).to.be.undefined;
expect(res.get("Access-Control-Max-Age")).to.be.undefined;
expect(res.get("Vary")).to.be.undefined;
expect(res.get("Access-Control-Allow-Origin")).to.equal(undefined);
expect(res.get("Access-Control-Allow-Methods")).to.equal(undefined);
expect(res.get("Access-Control-Allow-Headers")).to.equal(undefined);
expect(res.get("Access-Control-Allow-Credentials")).to.equal(undefined);
expect(res.get("Access-Control-Max-Age")).to.equal(undefined);
expect(res.get("Vary")).to.equal(undefined);
next();
});

Expand Down Expand Up @@ -457,12 +457,12 @@ for (let spec of specs) {

// This happens before the CORS middleware, so none of the headers are set
express.options("/api/pets/:name", (req, res, next) => {
expect(res.get("Access-Control-Allow-Origin")).to.be.undefined;
expect(res.get("Access-Control-Allow-Methods")).to.be.undefined;
expect(res.get("Access-Control-Allow-Headers")).to.be.undefined;
expect(res.get("Access-Control-Allow-Credentials")).to.be.undefined;
expect(res.get("Access-Control-Max-Age")).to.be.undefined;
expect(res.get("Vary")).to.be.undefined;
expect(res.get("Access-Control-Allow-Origin")).to.equal(undefined);
expect(res.get("Access-Control-Allow-Methods")).to.equal(undefined);
expect(res.get("Access-Control-Allow-Headers")).to.equal(undefined);
expect(res.get("Access-Control-Allow-Credentials")).to.equal(undefined);
expect(res.get("Access-Control-Max-Age")).to.equal(undefined);
expect(res.get("Vary")).to.equal(undefined);
next();
});

Expand Down
14 changes: 7 additions & 7 deletions test/specs/data-store/data-store.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ describe("DataStore", () => {
if (err) {
return done(err);
}
expect(retrieved).to.be.undefined;
expect(retrieved).to.equal(undefined);
done();
});
});
Expand Down Expand Up @@ -320,8 +320,8 @@ describe("DataStore", () => {
let now = new Date(Date.now() - 5); // 5 milliseconds ago

// The timestamps are null to start out with
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);

// I can set them if I want
resource.createdOn = new Date(2010, 5, 8);
Expand Down Expand Up @@ -485,7 +485,7 @@ describe("DataStore", () => {
dataStore.save(updatedResource, () => {
// The resource should now be empty
dataStore.get(resource, (err, retrieved) => {
expect(retrieved.data).to.be.undefined;
expect(retrieved.data).to.equal(undefined);
done(err);
});
});
Expand Down Expand Up @@ -733,7 +733,7 @@ describe("DataStore", () => {
if (err) {
return done(err);
}
expect(deleted).to.be.undefined;
expect(deleted).to.equal(undefined);
done();
});
});
Expand All @@ -756,7 +756,7 @@ describe("DataStore", () => {
if (err) {
return done(err);
}
expect(retrieved).to.be.undefined;
expect(retrieved).to.equal(undefined);
done();
});
});
Expand Down Expand Up @@ -938,7 +938,7 @@ describe("DataStore", () => {
if (err) {
return done(err);
}
expect(deleted).to.be.undefined;
expect(deleted).to.equal(undefined);
done();
});
});
Expand Down
16 changes: 8 additions & 8 deletions test/specs/data-store/file-data-store.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ describe("FileDataStore", () => {
if (err) {
return done(err);
}
expect(fs.existsSync(file)).to.be.true;
expect(fs.existsSync(file)).to.equal(true);
done();
});
});
Expand All @@ -43,7 +43,7 @@ describe("FileDataStore", () => {
if (err) {
return done(err);
}
expect(fs.existsSync(file)).to.be.true;
expect(fs.existsSync(file)).to.equal(true);
done();
});
});
Expand All @@ -57,7 +57,7 @@ describe("FileDataStore", () => {
if (err) {
return done(err);
}
expect(fs.existsSync(file)).to.be.true;
expect(fs.existsSync(file)).to.equal(true);
done();
});
});
Expand All @@ -71,7 +71,7 @@ describe("FileDataStore", () => {
if (err) {
return done(err);
}
expect(fs.existsSync(file)).to.be.true;
expect(fs.existsSync(file)).to.equal(true);
done();
});
});
Expand All @@ -85,7 +85,7 @@ describe("FileDataStore", () => {
if (err) {
return done(err);
}
expect(fs.existsSync(file)).to.be.true;
expect(fs.existsSync(file)).to.equal(true);
done();
});
});
Expand All @@ -100,7 +100,7 @@ describe("FileDataStore", () => {

function assert (err, data) {
expect(err).to.be.an.instanceOf(Error);
expect(data).to.be.undefined;
expect(data).to.equal(undefined);
}

dataStore.get(resource, (err, data) => {
Expand Down Expand Up @@ -142,7 +142,7 @@ describe("FileDataStore", () => {

function assert (err, data) {
expect(err).to.be.an.instanceOf(Error);
expect(data).to.be.undefined;
expect(data).to.equal(undefined);
}

dataStore.save(resource, (err, data) => {
Expand Down Expand Up @@ -181,7 +181,7 @@ describe("FileDataStore", () => {

function assert (err, data) {
expect(err).to.be.an.instanceOf(Error);
expect(data).to.be.undefined;
expect(data).to.equal(undefined);
}

dataStore.save(resource, (err, data) => {
Expand Down
63 changes: 32 additions & 31 deletions test/specs/data-store/resource.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,49 +11,49 @@ describe("Resource class", () => {

expect(resource.collection).to.equal("");
expect(resource.name).to.equal("/");
expect(resource.data).to.be.undefined;
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.data).to.equal(undefined);
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("can be called with just a path", () => {
let resource = new swagger.Resource("/users/jdoe/orders");

expect(resource.collection).to.equal("/users/jdoe");
expect(resource.name).to.equal("/orders");
expect(resource.data).to.be.undefined;
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.data).to.equal(undefined);
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("can be called with a non-string path", () => {
let resource = new swagger.Resource(12345);

expect(resource.collection).to.equal("");
expect(resource.name).to.equal("/12345");
expect(resource.data).to.be.undefined;
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.data).to.equal(undefined);
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("can be called with just a single-depth collection path", () => {
let resource = new swagger.Resource("/users");

expect(resource.collection).to.equal("");
expect(resource.name).to.equal("/users");
expect(resource.data).to.be.undefined;
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.data).to.equal(undefined);
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("can be called with just a single-depth path, with no slash", () => {
let resource = new swagger.Resource("users");

expect(resource.collection).to.equal("");
expect(resource.name).to.equal("/users");
expect(resource.data).to.be.undefined;
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.data).to.equal(undefined);
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("can be called with just a path and data", () => {
Expand All @@ -63,8 +63,8 @@ describe("Resource class", () => {
expect(resource.collection).to.equal("/users/jdoe/orders");
expect(resource.name).to.equal("/12345");
expect(resource.data).to.equal(data);
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("can be called with a non-string path and data", () => {
Expand All @@ -74,8 +74,8 @@ describe("Resource class", () => {
expect(resource.collection).to.equal("");
expect(resource.name).to.equal("/12345");
expect(resource.data).to.equal(data);
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("can be called with just a path and a Resource", () => {
Expand All @@ -85,8 +85,8 @@ describe("Resource class", () => {
expect(resource.collection).to.equal("/users/jdoe/orders");
expect(resource.name).to.equal("/12345");
expect(resource.data).to.equal(otherResource.data);
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("can be called with a collection path, resource name, and data", () => {
Expand All @@ -96,8 +96,8 @@ describe("Resource class", () => {
expect(resource.collection).to.equal("/users/jdoe/orders");
expect(resource.name).to.equal("/12345");
expect(resource.data).to.equal(data);
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("can be called with a non-string collection path, resource name, and data", () => {
Expand All @@ -107,8 +107,8 @@ describe("Resource class", () => {
expect(resource.collection).to.equal("/12345");
expect(resource.name).to.equal("/67890");
expect(resource.data).to.equal(data);
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("can be called with a non-string collection path, non-string resource name, and data", () => {
Expand All @@ -118,8 +118,8 @@ describe("Resource class", () => {
expect(resource.collection).to.equal("/12345");
expect(resource.name).to.equal("/67890");
expect(resource.data).to.equal(data);
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("can be called with a collection path, resource name, and a Resource", () => {
Expand All @@ -129,12 +129,13 @@ describe("Resource class", () => {
expect(resource.collection).to.equal("/users/jdoe/orders");
expect(resource.name).to.equal("/12345");
expect(resource.data).to.equal(otherResource.data);
expect(resource.createdOn).to.be.null;
expect(resource.modifiedOn).to.be.null;
expect(resource.createdOn).to.equal(null);
expect(resource.modifiedOn).to.equal(null);
});

it("should throw an error if the resource name contains slashes", () => {
function throws () {
// eslint-disable-next-line no-new
new swagger.Resource("/users", "/jdoe/orders", "foo");
}

Expand Down Expand Up @@ -223,7 +224,7 @@ describe("Resource class", () => {

resource.merge();

expect(resource.data).to.be.undefined;
expect(resource.data).to.equal(undefined);
});

it("replaces the resource's existing data with null", () => {
Expand All @@ -233,7 +234,7 @@ describe("Resource class", () => {

resource.merge(null);

expect(resource.data).to.be.null;
expect(resource.data).to.equal(null);
});

it("replaces undefined resource data with a value", () => {
Expand Down
Loading

0 comments on commit 314236f

Please sign in to comment.