Skip to content

Commit 08549a1

Browse files
halkeyeniekcandaele
halkeye
authored and
niekcandaele
committed
fix let/const (eslint --fix) and make sure everything is imported to do type checks
1 parent e772245 commit 08549a1

15 files changed

Lines changed: 63 additions & 84 deletions

‎test/executeConsoleCommand.test.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
'use strict';
22
import * as chai from 'chai'
33
import * as chaiAsPromised from 'chai-as-promised'
4-
import { SdtdServer } from '../lib/index'
5-
let SdtdApi = require('../lib/index');
4+
import { executeConsoleCommand, SdtdServer } from '../lib/index'
65

76
require('dotenv').config()
87

98
chai.use(chaiAsPromised)
109

11-
let testServer: SdtdServer = {
10+
const testServer: SdtdServer = {
1211
ip: process.env.TESTIP as string,
1312
port: process.env.TESTPORT as string,
1413
adminUser: process.env.TESTADMINUSER as string,
@@ -17,13 +16,13 @@ let testServer: SdtdServer = {
1716

1817
describe('/api/executeconsolecommand', async () => {
1918
it('Returns command, parameters and result', async () => {
20-
let response = await SdtdApi.executeConsoleCommand(testServer, "help");
19+
const response = await executeConsoleCommand(testServer, "help");
2120
chai.expect(response.command).to.be.a('string');
2221
chai.expect(response.parameters).to.be.a('string');
2322
});
2423

2524
it('Executes a command correctly', async () => {
26-
let response = await SdtdApi.executeConsoleCommand(testServer, "help");
25+
const response = await executeConsoleCommand(testServer, "help");
2726
chai.expect(response.command).to.eq('help')
2827
chai.expect(response.parameters).to.eq('');
2928
chai.expect(response.result).to.include("*** Generic Console Help ***")

‎test/getAllowedCommands.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
'use strict';
22
import * as chai from 'chai'
33
import * as chaiAsPromised from 'chai-as-promised'
4-
import { SdtdServer } from '../lib/index'
5-
let SdtdApi = require('../lib/index');
4+
import { getAllowedCommands, SdtdServer } from '../lib/index'
65

76
require('dotenv').config()
87

98
chai.use(chaiAsPromised)
109

11-
let testServer: SdtdServer = {
10+
const testServer: SdtdServer = {
1211
ip: process.env.TESTIP as string,
1312
port: process.env.TESTPORT as string,
1413
adminUser: process.env.TESTADMINUSER as string,
@@ -17,7 +16,7 @@ let testServer: SdtdServer = {
1716

1817
describe('/api/getAllowedCommands', async () => {
1918
it('Returns an array', async () => {
20-
let response = await SdtdApi.getAllowedCommands(testServer);
19+
const response = await getAllowedCommands(testServer);
2120
chai.expect(response.commands).to.be.a('array');
2221
});
2322
});

‎test/getAnimalsLocation.test.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
'use strict';
22
import * as chai from 'chai'
33
import * as chaiAsPromised from 'chai-as-promised'
4-
import { SdtdServer } from '../lib/index'
5-
let SdtdApi = require('../lib/index');
4+
import { getAnimalsLocation, SdtdServer } from '../lib/index'
65

76
require('dotenv').config()
87

98
chai.use(chaiAsPromised)
109

11-
let testServer: SdtdServer = {
10+
const testServer: SdtdServer = {
1211
ip: process.env.TESTIP as string,
1312
port: process.env.TESTPORT as string,
1413
adminUser: process.env.TESTADMINUSER as string,
@@ -17,15 +16,15 @@ let testServer: SdtdServer = {
1716

1817
describe('/api/getAnimalsLocation', async () => {
1918
it('Returns an array of animal info', async () => {
20-
let response = await SdtdApi.getAnimalsLocation(testServer);
19+
const response = await getAnimalsLocation(testServer);
2120
chai.expect(response).to.be.an('array');
2221
});
2322

2423

2524
it('Contains expected information', async () => {
26-
let response = await SdtdApi.getAnimalsLocation(testServer);
25+
const response = await getAnimalsLocation(testServer);
2726
if (response.length > 0) {
28-
let animal = response[0];
27+
const animal = response[0];
2928
chai.expect(animal.id).to.be.a('number');
3029
chai.expect(animal.name).to.be.a('string');
3130
chai.expect(animal.position.x).to.be.a('number');

‎test/getBaseUrl.test.ts‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
'use strict';
22
import * as chai from 'chai'
33
import * as chaiAsPromised from 'chai-as-promised'
4-
import { getBaseUrl, SdtdServer } from '../lib/index'
4+
import { getBaseUrl } from '../lib/index'
55

66
chai.use(chaiAsPromised)
77

8-
let testServer: SdtdServer = {
9-
ip: process.env.TESTIP as string,
10-
port: process.env.TESTPORT as string,
11-
adminUser: process.env.TESTADMINUSER as string,
12-
adminToken: process.env.TESTADMINTOKEN as string
13-
}
14-
158
describe('getBaseUrl', async () => {
169
it('standard returns http', async () => {
1710
chai.expect(

‎test/getHostileLocation.test.ts‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
'use strict';
22
import * as chai from 'chai'
33
import * as chaiAsPromised from 'chai-as-promised'
4-
import { SdtdServer } from '../lib/index'
5-
let SdtdApi = require('../lib/index');
4+
import { getHostileLocation, SdtdServer } from '../lib/index'
65

76
require('dotenv').config()
87

98
chai.use(chaiAsPromised)
109

11-
let testServer: SdtdServer = {
10+
const testServer: SdtdServer = {
1211
ip: process.env.TESTIP as string,
1312
port: process.env.TESTPORT as string,
1413
adminUser: process.env.TESTADMINUSER as string,
@@ -17,15 +16,15 @@ let testServer: SdtdServer = {
1716

1817
describe('/api/getHostileLocation', async () => {
1918
it('Returns an array of hostile info', async () => {
20-
let response = await SdtdApi.getHostileLocation(testServer);
19+
const response = await getHostileLocation(testServer);
2120
chai.expect(response).to.be.an('array');
2221
});
2322

2423

2524
it('Contains expected information', async () => {
26-
let response = await SdtdApi.getHostileLocation(testServer);
25+
const response = await getHostileLocation(testServer);
2726
if (response.length > 0) {
28-
let animal = response[0];
27+
const animal = response[0];
2928
chai.expect(animal.id).to.be.a('number');
3029
chai.expect(animal.name).to.be.a('string');
3130
chai.expect(animal.position.x).to.be.a('number');

‎test/getLandClaims.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
'use strict';
22
import * as chai from 'chai'
33
import * as chaiAsPromised from 'chai-as-promised'
4-
import { SdtdServer } from '../lib/index'
5-
let SdtdApi = require('../lib/index');
4+
import { getLandClaims, SdtdServer } from '../lib/index'
65

76
require('dotenv').config()
87

98
chai.use(chaiAsPromised)
109

11-
let testServer: SdtdServer = {
10+
const testServer: SdtdServer = {
1211
ip: process.env.TESTIP as string,
1312
port: process.env.TESTPORT as string,
1413
adminUser: process.env.TESTADMINUSER as string,
@@ -17,7 +16,7 @@ let testServer: SdtdServer = {
1716

1817
describe('/api/getLandClaims', async () => {
1918
it('Returns an array of animal info', async () => {
20-
let response = await SdtdApi.getLandClaims(testServer);
19+
const response = await getLandClaims(testServer);
2120
chai.expect(response.claimowners).to.be.a('array');
2221
chai.expect(response.claimsize).to.be.a('number');
2322
});

‎test/getLog.test.ts‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
'use strict';
22
import * as chai from 'chai'
33
import * as chaiAsPromised from 'chai-as-promised'
4-
import { SdtdServer } from '../lib/index'
5-
const SdtdApi = require('../lib/index');
4+
import { getWebUIUpdates, getLog, SdtdServer } from '../lib/index'
65

76
require('dotenv').config()
87

@@ -17,7 +16,7 @@ const testServer: SdtdServer = {
1716

1817
describe('/api/getLog', async () => {
1918
it('Returns expected output', async () => {
20-
const response = await SdtdApi.getLog(testServer);
19+
const response = await getLog(testServer);
2120
chai.expect(response.firstLine).to.be.a('number');
2221
chai.expect(response.lastLine).to.be.a('number');
2322
chai.expect(response.entries).to.be.a('array');
@@ -26,18 +25,18 @@ describe('/api/getLog', async () => {
2625
// Obsolete to test this in here
2726
// This is a test to see if allocs is working properly, we should assume it does
2827
xit('Cycles through logs when firstLine is given', async () => {
29-
const webUiUpdates = await SdtdApi.getWebUIUpdates(testServer);
28+
const webUiUpdates = await getWebUIUpdates(testServer);
3029
const firstLine = webUiUpdates.newlogs - 75;
31-
const response = await SdtdApi.getLog(testServer, firstLine);
30+
const response = await getLog(testServer, firstLine);
3231
chai.expect(response.firstLine).to.eq(firstLine);
3332
});
3433

3534
xit('Supports the count parameter', async () => {
36-
const webUiUpdates = await SdtdApi.getWebUIUpdates(testServer);
35+
const webUiUpdates = await getWebUIUpdates(testServer);
3736
const count = 100;
3837
const firstLine = webUiUpdates.newlogs - (count + 20);
3938

40-
const response = await SdtdApi.getLog(testServer, firstLine, count);
39+
const response = await getLog(testServer, firstLine, count);
4140
chai.expect(response.entries).to.have.lengthOf(count);
4241
});
4342
});

‎test/getOnlinePlayers.test.ts‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
'use strict';
22
import * as chai from 'chai'
33
import * as chaiAsPromised from 'chai-as-promised'
4-
import { SdtdServer } from '../lib/index'
5-
let SdtdApi = require('../lib/index');
4+
import { getOnlinePlayers, SdtdServer } from '../lib/index'
65

76
require('dotenv').config()
87

98
chai.use(chaiAsPromised)
109

11-
let testServer: SdtdServer = {
10+
const testServer: SdtdServer = {
1211
ip: process.env.TESTIP as string,
1312
port: process.env.TESTPORT as string,
1413
adminUser: process.env.TESTADMINUSER as string,
@@ -17,15 +16,15 @@ let testServer: SdtdServer = {
1716

1817
describe('/api/getOnlinePlayers', async () => {
1918
it('Returns an array of player info', async () => {
20-
let response = await SdtdApi.getOnlinePlayers(testServer);
19+
const response = await getOnlinePlayers(testServer);
2120
chai.expect(response).to.be.an('array');
2221
});
2322

2423
it('Contains identifying information for players', async () => {
25-
let response = await SdtdApi.getOnlinePlayers(testServer);
24+
const response = await getOnlinePlayers(testServer);
2625

2726
if (response.length > 0) {
28-
let playerStats = response[0];
27+
const playerStats = response[0];
2928

3029
chai.expect(playerStats.steamid).to.be.a('string').and.to.be.not.empty;
3130
chai.expect(playerStats.name).to.be.a('string').and.to.be.not.empty;
@@ -34,10 +33,10 @@ describe('/api/getOnlinePlayers', async () => {
3433
});
3534

3635
it('Contains location data', async () => {
37-
let response = await SdtdApi.getOnlinePlayers(testServer);
36+
const response = await getOnlinePlayers(testServer);
3837

3938
if (response.length > 0) {
40-
let playerStats = response[0];
39+
const playerStats = response[0];
4140

4241
chai.expect(playerStats.position.x).to.be.a('number');
4342
chai.expect(playerStats.position.y).to.be.a('number');
@@ -46,10 +45,10 @@ describe('/api/getOnlinePlayers', async () => {
4645
});
4746

4847
it('Contains kills deaths score experience and level data', async () => {
49-
let response = await SdtdApi.getOnlinePlayers(testServer);
48+
const response = await getOnlinePlayers(testServer);
5049

5150
if (response.length > 0) {
52-
let playerStats = response[0];
51+
const playerStats = response[0];
5352

5453
chai.expect(playerStats.experience).to.be.a('number');
5554
chai.expect(playerStats.level).to.be.a('number');

‎test/getPlayerInventories.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
'use strict';
22
import * as chai from 'chai'
33
import * as chaiAsPromised from 'chai-as-promised'
4-
import { SdtdServer } from '../lib/index'
5-
let SdtdApi = require('../lib/index');
4+
import { getPlayerInventories, SdtdServer } from '../lib/index'
65

76
require('dotenv').config()
87

98
chai.use(chaiAsPromised)
109

11-
let testServer: SdtdServer = {
10+
const testServer: SdtdServer = {
1211
ip: process.env.TESTIP as string,
1312
port: process.env.TESTPORT as string,
1413
adminUser: process.env.TESTADMINUSER as string,
@@ -17,7 +16,7 @@ let testServer: SdtdServer = {
1716

1817
describe('/api/getPlayerInventories', async () => {
1918
it('Returns expected info', async () => {
20-
let response = await SdtdApi.getPlayerInventories(testServer);
19+
const response = await getPlayerInventories(testServer);
2120
chai.expect(response).to.be.a('array');
2221
});
2322
});

‎test/getPlayerInventory.test.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
'use strict';
22
import * as chai from 'chai'
33
import * as chaiAsPromised from 'chai-as-promised'
4-
import { SdtdServer } from '../lib/index'
5-
let SdtdApi = require('../lib/index');
4+
import { getPlayerInventory, SdtdServer } from '../lib/index'
65

76
require('dotenv').config()
87

98
chai.use(chaiAsPromised)
109

11-
let testServer: SdtdServer = {
10+
const testServer: SdtdServer = {
1211
ip: process.env.TESTIP as string,
1312
port: process.env.TESTPORT as string,
1413
adminUser: process.env.TESTADMINUSER as string,
1514
adminToken: process.env.TESTADMINTOKEN as string
1615
}
1716
describe('/api/getPlayerInventory', async () => {
1817
it('Returns a playername, bag, belt and equipment', async () => {
19-
let response = await SdtdApi.getPlayerInventory(testServer, process.env.TESTPLAYER);
18+
const response = await getPlayerInventory(testServer, process.env.TESTPLAYER);
2019
chai.expect(response.playername).to.be.a('string');
2120
chai.expect(response.bag).to.be.a('array');
2221
chai.expect(response.belt).to.be.a('array');

0 commit comments

Comments
 (0)