AQ update

This commit is contained in:
peter
2020-08-13 12:03:35 +02:00
parent bd5b33e4a1
commit 7c1b0b73ed
35 changed files with 1343 additions and 881 deletions
+32 -29
View File
@@ -5,6 +5,7 @@ import { T2, Tiers } from "../src/backend/Types/Items";
import { RPCSocket, ConnectedSocket } from "rpclibrary";
import { FrontcraftIfc, Auth, User, FrontcraftFeatureIfc, Raid, Character, Rank, Class, Race, Spec, Signup } from "../src/backend/Types/Types";
import { SpecT } from "../src/backend/Types/PlayerSpecs";
import { ItemManager } from "src/backend/Components/Item/ItemManager";
type protoAccount<C extends Class = Class> = {
@@ -166,7 +167,6 @@ describe('Frontcraft', () => {
username: 'a',
MC: 2
}).then(adminUser => {
client.UserManager.login(adminUser.username, 'ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb').then(auth => {
const sock = new RPCSocket<FrontcraftFeatureIfc>(
auth.port,
@@ -194,8 +194,8 @@ describe('Frontcraft', () => {
})
after(() => {
client.destroy()
adminClient.destroy()
client.close()
adminClient.close()
server.stop()
})
@@ -240,8 +240,8 @@ describe('Frontcraft', () => {
it('should sign up', (done) => {
Promise.all(Object.values(users).map((user) =>
adminClient.signup.sign(user.auth.token.value, user.character, raids[0], false, ""+Math.floor(Math.random()*10000)).catch(done)
)).then(x => {
adminClient.signup.sign(user.auth.token.value, user.character, raids[0], false, true, ""+Math.floor(Math.random()*10000)).catch(done)
)).then(_ => {
adminClient.signup.getSignups(raids[0]).then(s => {
if (s.length == testAccounts.length) {
s.forEach(sign => {
@@ -539,7 +539,7 @@ describe('Frontcraft', () => {
users[user.account.username].item = itemname
if (!token) return false
return modifier + 1 === token.level
return modifier + 2 === token.level
})).then(success => {
if (success.reduce((prev, curr) => prev && curr, true)) done()
})
@@ -564,16 +564,8 @@ describe('Frontcraft', () => {
await adminClient.softreserveCurrency.incrementCurrency(user.account, item!.tier, 2)
const before = await client.ItemManager.getToken(user.character, item!)
if (!before || before.level !== 4) {
console.log("expected level to be 4", before ? before.level : '?');
return
}
await client.ItemManager.buyToken(user.auth.token.value, user.character.charactername, itemname, user.signup!)
const after = await client.ItemManager.buyToken(user.auth.token.value, user.character.charactername, itemname, user.signup!)
if (!after || after.level !== 6) {
console.log("expected level after to be 6", after ? after.level : '?');
if (!before || before.level !== 5) {
console.log("expected level to be 5", before ? before.level : '?');
return
}
done()
@@ -625,7 +617,7 @@ describe('Frontcraft', () => {
adminClient.reset.wipeCurrencyAndItems().then(() => {
client.UserManager.getUser(testAccounts[0].name).then(user => {
if (user && user.MC === 1) {
client.ItemManager.getTokens(users[testAccounts[0].name.toLowerCase()].character, ['BWL']).then(tokens => {
client.ItemManager.getTokens(users[testAccounts[0].name.toLowerCase()].character, ['BWL'], true).then(tokens => {
if (tokens!.length === 0) {
done()
} else {
@@ -652,7 +644,7 @@ describe('Frontcraft', () => {
}
const user = Object.values(users)[0]
const createRaid = adminClient.manageRaid.createRaid
const sign = async (raid: Raid, late = false) => await adminClient.signup.sign(user.auth.token.value, user.character, raid, late)
const sign = async (raid: Raid, late = false) => await adminClient.signup.sign(user.auth.token.value, user.character, raid, late, false)
const buyToken = async (signup: Signup, itemname: string) => await client.ItemManager.buyToken(user.auth.token.value, user.character.charactername, itemname, signup)
const getCurrency = async (tier: Tiers) => {
const dbUser = await client.UserManager.getUser(user.account.username)
@@ -661,7 +653,6 @@ describe('Frontcraft', () => {
createRaid(Raid(0, 'BWL')).then(async (BWL0: Raid) => {
const T2_0 = await client.ItemManager.getItem(T2[0])
//const BWL0 = await createRaid(Raid(0, 'BWL'))
const signupBWL0 = await sign(BWL0)
let BWL = await getCurrency(BWL0.tier)
let token = await buyToken(signupBWL0, T2[0])
@@ -676,14 +667,26 @@ describe('Frontcraft', () => {
let reserves = await client.ItemManager.getTokens(user.character, [BWL0.tier], true)
let streaks = await client.ItemManager.getTokens(user.character, [BWL0.tier], false)
if (reserves!.length != 1
|| streaks!.length != 0
|| reserves![0].itemname !== T2_0!.itemname
|| reserves![0].level !== 1) {
console.log("Bad Token status 1", reserves, streaks);
done(new Error("Bad Token status"))
return
if (reserves!.length != 1){
console.log("Expected reserves to be of length 1", reserves);
done(new Error("Bad token status"))
}
if(streaks!.length != 0){
console.log("Expected streaks to be of length 0", streaks);
done(new Error("Bad token status"))
}
if(reserves![0].itemname !== T2_0!.itemname){
console.log("Expected reserve to to be of item "+T2_0!.itemname, reserves![0]);
done(new Error("Bad token status"))
}
if(reserves![0].level !== 2){
console.log("Expected reserve to to be of level "+2, reserves![0].level);
done(new Error("Bad Token status"))
}
await adminClient.manageRaid.startRaid(BWL0)
reserves = await client.ItemManager.getTokens(user.character, [BWL0.tier], true)
streaks = await client.ItemManager.getTokens(user.character, [BWL0.tier], false)
@@ -691,7 +694,7 @@ describe('Frontcraft', () => {
|| streaks!.length != 1
|| streaks![0].itemname !== T2[0]
|| streaks![0].level !== 1) {
console.log("Bad Token status", reserves, streaks);
console.log("Bad Token status 2", reserves, streaks);
done(new Error("Bad Token status 2"))
return
}
@@ -726,8 +729,8 @@ describe('Frontcraft', () => {
if (reserves!.length != 1
|| streaks!.length != 0
|| reserves![0].itemname !== T2[1]
|| reserves![0].level !== 1) {
console.log("Bad Token status", reserves, streaks);
|| reserves![0].level !== 2) {
console.log("Bad Token status 3", reserves, streaks);
done(new Error("Bad Token status 3"))
return
}