Merge pull request #487 from foretagsplatsen/32129139/Improve_some_un…

…it_tests

32129139: Improve some unit tests

src/test/htmlCanvasTest.js

@@ -219,15 +219,10 @@ describe("htmlCanvas", () => {
 	it("can omit nested tags", () => {
 		withCanvas((html) => {
 			// Arrange: a inner and outer div with a span as inner child
-			// where the child is omited based on a flag
-			let hasSomeText = false;
-
+			// where the child is omitted
 			html.div(
 				{ id: "outer_div" },
-				html.div(
-					{ id: "inner_div" },
-					hasSomeText ? html.span("Some text") : html.omit(),
-				),
+				html.div({ id: "inner_div" }, html.omit()),
 			);
 
 			// Assert: that outer div rendered
@@ -292,11 +287,15 @@ describe("htmlCanvas", () => {
 		withCanvas((html) => {
 			expect(() => {
 				html.render(null);
-			}).toThrowError();
+			}).toThrowError(
+				"Cannot read properties of null (reading 'appendToBrush')",
+			);
 
 			expect(() => {
 				html.render(undefined);
-			}).toThrowError();
+			}).toThrowError(
+				"Cannot read properties of undefined (reading 'appendToBrush')",
+			);
 		});
 	});
 

src/test/router/routerTest.js

@@ -133,7 +133,7 @@ describe("router", () => {
 		aRouter.resolveUrl("/user/");
 
 		// Assert that callback was executed
-		expect(spy).toHaveBeenCalled();
+		expect(spy).toHaveBeenCalledWith(jasmine.anything());
 	});
 
 	it("resolveUrl triggers routeMatched event", (done) => {
@@ -183,15 +183,17 @@ describe("router", () => {
 		aRouter.resolveUrl("/user/");
 
 		// Assert that callback was executed
-		expect(spy).toHaveBeenCalled();
+		expect(spy).toHaveBeenCalledWith(jasmine.anything());
 	});
 
 	it("resolveUrl pass values to action", (done) => {
 		// Arrange a route that have two mandatory parameters
 		aRouter.addRoute({
 			pattern: "/user/#userid/order/#orderid",
 			action: function (userid, orderid) {
-				expect(userid === "john" && orderid === "1").toBeTruthy();
+				expect(userid).toEqual("john");
+				expect(orderid).toEqual("1");
+
 				this.unbind(); // clean-up
 				done(); // execute asserts
 			},
@@ -352,7 +354,7 @@ describe("router", () => {
 		aRouter.resolveUrl("APathNotInDefaultRouterButInPipedRouter");
 
 		// Assert that second router matched the route
-		expect(spy).toHaveBeenCalled();
+		expect(spy).toHaveBeenCalledWith({});
 		anotherRouter.stop();
 	});
 
@@ -371,7 +373,7 @@ describe("router", () => {
 		aRouter.resolveUrl("/a/b/c");
 
 		// Assert that second router matched the route
-		expect(spy).toHaveBeenCalled();
+		expect(spy).toHaveBeenCalledTimes(1);
 		anotherRouter.stop();
 	});