Remove variable shadowing

Refactor to remove all no-shadow warnings.
This commit is contained in:
Hornwitser committed 2020-10-23 21:22:45 +02:00
1 parent e5e82ba2fb
commit 00a1f6aea7
14 files changed
+87 -86

No files matched your search

+15 -12
View File
@@ -249,8 +249,11 @@ describe("Integration of Clusterio", function() {
let args = "--description \"A temp role\" --permissions core.control.connect";
await execCtl(`role create temp ${args}`);
let result = await libLink.messages.listRoles.send(getControl());
let role = result.list.find(role => role.name === "temp");
assert.deepEqual(role, { id: 5, name: "temp", description: "A temp role", permissions: ["core.control.connect"] });
let tempRole = result.list.find(role => role.name === "temp");
assert.deepEqual(
tempRole,
{ id: 5, name: "temp", description: "A temp role", permissions: ["core.control.connect"] }
);
});
});
@@ -259,8 +262,8 @@ describe("Integration of Clusterio", function() {
let args = "--name new --description \"A new role\" --permissions";
await execCtl(`role edit temp ${args}`);
let result = await libLink.messages.listRoles.send(getControl());
let role = result.list.find(role => role.name === "new");
assert.deepEqual(role, { id: 5, name: "new", description: "A new role", permissions: [] });
let newRole = result.list.find(role => role.name === "new");
assert.deepEqual(newRole, { id: 5, name: "new", description: "A new role", permissions: [] });
});
});
@@ -268,8 +271,8 @@ describe("Integration of Clusterio", function() {
it("should modify the given role", async function() {
await execCtl("role delete new");
let result = await libLink.messages.listRoles.send(getControl());
let role = result.list.find(role => role.name === "new");
assert(!role, "Role was not deleted");
let newRole = result.list.find(role => role.name === "new");
assert(!newRole, "Role was not deleted");
});
});
@@ -283,8 +286,8 @@ describe("Integration of Clusterio", function() {
it("should create the given user", async function() {
await execCtl("user create temp");
let result = await libLink.messages.listUsers.send(getControl());
let user = result.list.find(user => user.name === "temp");
assert(user, "user was not created");
let tempUser = result.list.find(user => user.name === "temp");
assert(tempUser, "user was not created");
});
});
@@ -292,8 +295,8 @@ describe("Integration of Clusterio", function() {
it("should set the roles on the user", async function() {
await execCtl("user set-roles temp Admin");
let result = await libLink.messages.listUsers.send(getControl());
let user = result.list.find(user => user.name === "temp");
assert.deepEqual(user.roles, [0]);
let tempUser = result.list.find(user => user.name === "temp");
assert.deepEqual(tempUser.roles, [0]);
});
});
@@ -301,8 +304,8 @@ describe("Integration of Clusterio", function() {
it("should delete the user", async function() {
await execCtl("user delete temp");
let result = await libLink.messages.listUsers.send(getControl());
let user = result.list.find(user => user.name === "temp");
assert(!user, "user was note deleted");
let tempUser = result.list.find(user => user.name === "temp");
assert(!tempUser, "user was note deleted");
});
});
});
+2 -2
View File
@@ -44,10 +44,10 @@ function slowTest(test) {
test.timeout(20000);
}
async function get(path) {
async function get(urlPath) {
let res = await phin({
method: "GET",
url: `https://localhost:4443${path}`,
url: `https://localhost:4443${urlPath}`,
core: { rejectUnauthorized: false },
});
if (res.statusCode !== 200) {
+3 -3
View File
@@ -415,14 +415,14 @@ describe("lib/config/classes", function() {
describe(".registerGroup()", function() {
it("should throw if the class is finalized", function() {
class TestConfig extends classes.Config { }
TestConfig.finalize();
class FinalizedConfig extends classes.Config { }
FinalizedConfig.finalize();
class TestGroup extends classes.ConfigGroup { }
TestGroup.groupName = "test";
TestGroup.finalize();
assert.throws(
() => TestConfig.registerGroup(TestGroup),
() => FinalizedConfig.registerGroup(TestGroup),
new Error("Cannot register group on finalized config")
);
});
-1
View File
@@ -2,7 +2,6 @@
const assert = require("assert").strict;
const fs = require("fs");
const path = require("path");
const stream = require("stream");
const libHash = require("@clusterio/lib/hash");