Skip to content

Commit

Permalink
Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@Half-Shot
Half-Shot committed Jul 25, 2022
1 parent baf91a6 commit 492ede4
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 32 deletions.
50 changes: 24 additions & 26 deletions spec/integ/user-bridge-store.spec.js → spec/integ/user-bridge-store.spec.ts
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
"use strict";
var Datastore = require("nedb");
var fs = require("fs");
import Datastore from "nedb";
import * as fs from "fs";
import { UserBridgeStore, MatrixUser, RemoteUser } from "../../src/index";

var UserBridgeStore = require("../..").UserBridgeStore;
var MatrixUser = require("../..").MatrixUser;
var RemoteUser = require("../..").RemoteUser;
var TEST_DB_PATH = __dirname + "/test.db";
const TEST_DB_PATH = __dirname + "/test.db";

describe("UserBridgeStore", function() {
var store, db;
let store: UserBridgeStore;
let db: Datastore;

beforeEach(
/** @this TestCase */
async function(done) {
function(done) {
db = new Datastore({
filename: TEST_DB_PATH,
autoload: true,
Expand Down Expand Up @@ -45,8 +43,8 @@ describe("UserBridgeStore", function() {
const userFromStore = await store.setMatrixUser(user).then(function() {
return store.getMatrixUser(userId);
});
expect(userFromStore.getId()).toEqual(userId);
expect(userFromStore.getDisplayName()).toEqual("Foo");
expect(userFromStore?.getId()).toEqual(userId);
expect(userFromStore?.getDisplayName()).toEqual("Foo");
});
});

Expand All @@ -58,7 +56,7 @@ describe("UserBridgeStore", function() {
const userFromStore = await store.setRemoteUser(user).then(function() {
return store.getRemoteUser(remoteId);
});
expect(userFromStore.getId()).toEqual(remoteId);
expect(userFromStore?.getId()).toEqual(remoteId);
});

it("should fully persist all types of primitive data", async function() {
Expand All @@ -76,11 +74,11 @@ describe("UserBridgeStore", function() {
const userFromStore = await store.setRemoteUser(user).then(function() {
return store.getRemoteUser(remoteId);
});
expect(userFromStore.getId()).toEqual(remoteId);
expect(userFromStore.get("int")).toEqual(42);
expect(userFromStore.get("str")).toEqual("the answer");
expect(userFromStore.get("bool")).toEqual(true);
expect(userFromStore.get("obj")).toEqual({
expect(userFromStore?.getId()).toEqual(remoteId);
expect(userFromStore?.get<number>("int")).toEqual(42);
expect(userFromStore?.get<string>("str")).toEqual("the answer");
expect(userFromStore?.get<boolean>("bool")).toEqual(true);
expect(userFromStore?.get<object>("obj")).toEqual({
foo: "bar",
baz: {
buzz: true
Expand All @@ -91,14 +89,14 @@ describe("UserBridgeStore", function() {
it("should not persist functions", async function() {
var remoteId = "some_unique_id";
var user = new RemoteUser(remoteId);
user.set("fn", function(foo) {
user.set("fn", function() {
return 42;
});
const userFromStore = await store.setRemoteUser(user).then(function() {
return store.getRemoteUser(remoteId);
});
expect(userFromStore.getId()).toEqual(remoteId);
expect(userFromStore.get("fn")).toBeUndefined();
expect(userFromStore?.getId()).toEqual(remoteId);
expect(userFromStore?.get("fn")).toBeUndefined();
});
});

Expand Down Expand Up @@ -157,7 +155,7 @@ describe("UserBridgeStore", function() {

it("should throw if the data query isn't an object", function() {
expect(function() {
store.getByRemoteData("nested.key");
store.getByRemoteData("nested.key" as any);
}).toThrow();
});
});
Expand Down Expand Up @@ -201,7 +199,7 @@ describe("UserBridgeStore", function() {
const mx = new MatrixUser("@foo:bar");
await store.setMatrixUser(mx);
const m = await store.getByMatrixLocalpart("foo");
expect(m.getId()).toEqual("@foo:bar");
expect(m?.getId()).toEqual("@foo:bar");
});
});

Expand Down Expand Up @@ -262,8 +260,8 @@ describe("UserBridgeStore", function() {
it("should return a single element list for a single match",
async function() {
const res = await store.getMatrixLinks("a_1");
expect(res.length).toEqual(1);
expect(res[0]).toEqual("@a:bar");
expect(res?.length).toEqual(1);
expect(res?.[0]).toEqual("@a:bar");
});
});
});
Expand Down Expand Up @@ -317,8 +315,8 @@ describe("UserBridgeStore", function() {
it("should return a single element list for a single match",
async function() {
const res = await store.getRemoteLinks("@b:bar");
expect(res.length).toEqual(1);
expect(res[0]).toEqual("b_1");
expect(res?.length).toEqual(1);
expect(res?.[0]).toEqual("b_1");
});
});
});
Expand Down
4 changes: 2 additions & 2 deletions spec/unit/activity-tracker.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ function createTracker(canUseWhois: boolean = false, presence?: PresenceEventCon
}
throw {statusCode: 403}; // 403 - not an admin
}
if (method === "GET" && path.startsWith("/_matrix/client/r0/presence/")) {
if (method === "GET" && path.startsWith("/_matrix/client/v3/presence/")) {
if (!presence) {
throw Error("Presence is disabled");
}
return presence;
}
if (method === "GET" && path.startsWith("/_matrix/client/r0/admin/whois")) {
if (method === "GET" && path.startsWith("/_matrix/client/v3/admin/whois")) {
if (!whois) {
throw Error("Whois is disabled");
}
Expand Down
9 changes: 5 additions & 4 deletions spec/unit/room-upgrade-handler.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,21 +119,22 @@ describe("RoomUpgradeHandler", () => {
room_id: "!abc:def",
})).toEqual(false);
});
it("should handle a expected invite", async (done) => {
it("should handle a expected invite", async () => {
const ruh = new RoomUpgradeHandler({}, {});
let newRoomId = false;
ruh.waitingForInvite.set("!new:def", "!abc:def");
ruh.joinNewRoom = (_newRoomId) => {
newRoomId = _newRoomId;
return Promise.resolve();
}
ruh.onJoinedNewRoom = () => {
const p = new Promise(r => ruh.onJoinedNewRoom = () => {
expect(newRoomId).toEqual("!new:def");
done();
}
r();
});
expect(await ruh.onInvite({
room_id: "!new:def",
})).toEqual(true);
await p;
});
});
});

0 comments on commit 492ede4

Please sign in to comment.