Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
niekcandaele committed Mar 20, 2019
1 parent 30e4552 commit 9b8dc62
Show file tree
Hide file tree
Showing 15 changed files with 10 additions and 145 deletions.
3 changes: 0 additions & 3 deletions .mocharc.js

This file was deleted.

11 changes: 10 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
language: node_js
node_js:
- "lts/*"
- node
- 8
- 9
- 10

before_script:
- npm install
Expand Down Expand Up @@ -42,4 +46,9 @@ deploy:
on:
tags: true
all_branches: true
repo: CatalysmsServerManager/7-Days-to-Die-API-wrapper
repo: CatalysmsServerManager/7-Days-to-Die-API-wrapper

after_failure:
- wget https://raw.githubusercontent.com/DiscordHooks/travis-ci-discord-webhook/master/send.sh
- chmod +x send.sh
- ./send.sh failure $WEBHOOK_URL
10 changes: 0 additions & 10 deletions test/executeConsoleCommand.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ let testServer: SdtdServer = {
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}
describe('/api/executeconsolecommand', async () => {
it('Returns command, parameters and result', async () => {
let response = await SdtdApi.executeConsoleCommand(testServer, "help");
Expand All @@ -34,8 +28,4 @@ describe('/api/executeconsolecommand', async () => {
chai.expect(response.parameters).to.eq('');
chai.expect(response.result).to.include("*** Generic Console Help ***")
});

it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.executeConsoleCommand(badTestServer)).to.be.rejectedWith(Error);
});
});
10 changes: 0 additions & 10 deletions test/getAllowedCommands.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,9 @@ let testServer: SdtdServer = {
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}
describe('/api/getAllowedCommands', async () => {
it('Returns an array', async () => {
let response = await SdtdApi.getAllowedCommands(testServer);
chai.expect(response.commands).to.be.a('array');
});
it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getAllowedCommands(badTestServer)).to.be.rejectedWith(Error);
});

});
11 changes: 0 additions & 11 deletions test/getAnimalsLocation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ let testServer: SdtdServer = {
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

describe('/api/getAnimalsLocation', async () => {
it('Returns an array of animal info', async () => {
let response = await SdtdApi.getAnimalsLocation(testServer);
Expand All @@ -40,8 +33,4 @@ describe('/api/getAnimalsLocation', async () => {
chai.expect(animal.position.z).to.be.a('number');
}
});
it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getAnimalsLocation(badTestServer)).to.be.rejectedWith(Error);
});

});
12 changes: 0 additions & 12 deletions test/getHostileLocation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ let testServer: SdtdServer = {
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

describe('/api/getHostileLocation', async () => {
it('Returns an array of hostile info', async () => {
let response = await SdtdApi.getHostileLocation(testServer);
Expand All @@ -40,9 +33,4 @@ describe('/api/getHostileLocation', async () => {
chai.expect(animal.position.z).to.be.a('number');
}
});

it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getHostileLocation(badTestServer)).to.be.rejectedWith(Error);
});

});
11 changes: 0 additions & 11 deletions test/getLandClaims.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,10 @@ let testServer: SdtdServer = {
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

describe('/api/getLandClaims', async () => {
it('Returns an array of animal info', async () => {
let response = await SdtdApi.getLandClaims(testServer);
chai.expect(response.claimowners).to.be.a('array');
chai.expect(response.claimsize).to.be.a('number');
});
it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getLandClaims(badTestServer)).to.be.rejectedWith(Error);
});

});
12 changes: 0 additions & 12 deletions test/getOnlinePlayers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ let testServer: SdtdServer = {
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

describe('/api/getOnlinePlayers', async () => {
it('Returns an array of player info', async () => {
let response = await SdtdApi.getOnlinePlayers(testServer);
Expand Down Expand Up @@ -68,9 +61,4 @@ describe('/api/getOnlinePlayers', async () => {
chai.expect(playerStats.score).to.be.a('number');
}
});

it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getOnlinePlayers(badTestServer)).to.be.rejectedWith(Error);
});

});
11 changes: 0 additions & 11 deletions test/getPlayerInventories.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,9 @@ let testServer: SdtdServer = {
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

describe('/api/getPlayerInventories', async () => {
it('Returns expected info', async () => {
let response = await SdtdApi.getPlayerInventories(testServer);
chai.expect(response).to.be.a('array');
});

it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getPlayerInventories(badTestServer)).to.be.rejectedWith(Error);
});
});
12 changes: 0 additions & 12 deletions test/getPlayerInventory.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,11 @@ let testServer: SdtdServer = {
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

describe('/api/getPlayerInventory', async () => {
it('Returns a playername, bag, belt and equipment', async () => {
let response = await SdtdApi.getPlayerInventory(testServer, process.env.TESTPLAYER);
chai.expect(response.playername).to.be.a('string');
chai.expect(response.bag).to.be.a('array');
chai.expect(response.belt).to.be.a('array');
});
it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getPlayerInventory(badTestServer)).to.be.rejectedWith(Error);
});

});
10 changes: 0 additions & 10 deletions test/getPlayerList.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@ let testServer: SdtdServer = {
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}
describe('/api/getPlayerList', async () => {
it('Returns expected output', async () => {
let response = await SdtdApi.getPlayerList(testServer);
Expand All @@ -34,7 +27,4 @@ describe('/api/getPlayerList', async () => {
chai.expect(response.players).to.be.a('array');
chai.expect(response.players).to.have.length(1);
});
it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getPlayerList(badTestServer)).to.be.rejectedWith(Error);
});
});
10 changes: 0 additions & 10 deletions test/getPlayersLocation.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ let testServer: SdtdApi.SdtdServer = {
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdApi.SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

describe('/api/getPlayersLocation', async () => {
it('Returns an array', async () => {
let response = await SdtdApi.getPlayersLocation(testServer, false);
Expand All @@ -35,7 +28,4 @@ describe('/api/getPlayersLocation', async () => {
chai.expect(response[0].name).to.be.a("string");
chai.expect(response[0].online).to.be.a("boolean");
});
it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getPlayersLocation(badTestServer, false)).to.be.rejectedWith(Error);
});
});
11 changes: 0 additions & 11 deletions test/getServerInfo.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,6 @@ let testServer: SdtdServer = {
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}
describe('/api/getServerInfo', async () => {
it('Returns expected output', async () => {
let response = await SdtdApi.getServerInfo(testServer);
Expand Down Expand Up @@ -77,8 +70,4 @@ describe('/api/getServerInfo', async () => {
chai.expect(response.EnemySpawnMode.value).to.be.a('boolean');
chai.expect(response.IsPublic.value).to.be.a('boolean');
});

it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getServerInfo(badTestServer)).to.be.rejectedWith(Error);
});
});
11 changes: 0 additions & 11 deletions test/getStats.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ let testServer: SdtdServer = {
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

describe('/api/getstats', async () => {
it('Returns expected info', async () => {
let response = await SdtdApi.getStats(testServer);
Expand All @@ -32,8 +25,4 @@ describe('/api/getstats', async () => {
chai.expect(response.gametime.hours).to.be.a('number');
chai.expect(response.gametime.minutes).to.be.a('number');
});

it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getStats(badTestServer)).to.be.rejectedWith(Error);
});
});
10 changes: 0 additions & 10 deletions test/getWebUIUpdates.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,6 @@ let testServer: SdtdServer = {
adminToken: process.env.TESTADMINTOKEN as String
}

let badTestServer: SdtdServer = {
ip: "Not an IP address",
port: process.env.TESTPORT as String,
adminUser: process.env.TESTADMINUSER as String,
adminToken: process.env.TESTADMINTOKEN as String
}

describe('/api/getWebUIUpdates', async () => {
it('Returns expected output', async () => {
let response = await SdtdApi.getWebUIUpdates(testServer);
Expand All @@ -43,7 +36,4 @@ describe('/api/getWebUIUpdates', async () => {

chai.expect(secondResponse.newlogs).to.eq(logsOffset);
});
it('Errors when incorrect server info is given', async () => {
return chai.expect(SdtdApi.getWebUIUpdates(badTestServer)).to.be.rejectedWith(Error);
});
});

0 comments on commit 9b8dc62

Please sign in to comment.