tiddlywiki 5.3.8 → 5.4.1

package/editions/test/tiddlers/tests/test-tags.js

@@ -11,168 +11,168 @@ Tests the tagging mechanism.
 
 describe("Tag tests", function() {
 
-describe("With no indexers", function() {
-	var wikiOptions = {enableIndexers: []},
-		wiki = setupWiki(wikiOptions);
-	runTests(wiki,wikiOptions);
-});
-
-describe("With all indexers", function() {
-	var wikiOptions = {},
-		wiki = setupWiki();
-	runTests(wiki,wikiOptions);
-});
-
-function setupWiki(wikiOptions) {
-	// Create a wiki
-	var wiki = new $tw.Wiki(wikiOptions);
-
-	// Add a few  tiddlers
-	wiki.addTiddler({
-		title: "TiddlerOne",
-		text: "The quick brown fox in $:/TiddlerTwo",
-		tags: ["one","TiddlerSeventh"],
-		modifier: "JoeBloggs",
-		modified: "201304152222"});
-	wiki.addTiddler({
-		title: "$:/TiddlerTwo",
-		text: "The rain in Spain\nfalls mainly on the plain and [[a fourth tiddler]]",
-		tags: ["two"],
-		modifier: "JohnDoe",
-		modified: "201304152211"});
-	wiki.addTiddler({
-		title: "Tiddler Three",
-		text: "The speed of sound in light\n\nThere is no TiddlerZero but TiddlerSix",
-		tags: ["one","two","TiddlerSeventh"],
-		modifier: "JohnDoe",
-		modified: "201304162202"});
-	wiki.addTiddler({
-		title: "a fourth tiddler",
-		text: "The quality of mercy is not drained by [[Tiddler Three]]",
-		tags: ["TiddlerSeventh"],
-		modifier: "JohnDoe"});
-	wiki.addTiddler({
-		title: "one",
-		text: "This is the text of tiddler [[one]]",
-		list: "[[Tiddler Three]] [[TiddlerOne]]",
-		modifier: "JohnDoe"});
-	wiki.addTiddler({
-		title: "$:/TiddlerFive",
-		text: "Everything in federation",
-		tags: ["two"]});
-	wiki.addTiddler({
-		title: "TiddlerSix",
-		text: "Missing inaction from TiddlerOne",
-		tags: []});
-	wiki.addTiddler({
-		title: "TiddlerSeventh",
-		text: "",
-		list: "TiddlerOne [[Tiddler Three]] [[a fourth tiddler]] MissingTiddler",
-		tags: []});
-	wiki.addTiddler({
-		title: "Tiddler8",
-		text: "Tidd",
-		tags: [],
-		"test-field": "JoeBloggs"});
-	wiki.addTiddler({
-		title: "Tiddler9",
-		text: "Another tiddler",
-		tags: ["TiddlerSeventh"],
-		"list-before": "a fourth tiddler"});
-	wiki.addTiddler({
-		title: "Tiddler10",
-		text: "Another tiddler",
-		tags: ["TiddlerSeventh"],
-		"list-before": ""});
-	wiki.addTiddler({
-		title: "Tiddler11",
-		text: "Another tiddler",
-		tags: ["TiddlerSeventh"],
-		"list-after": "Tiddler Three"});
-	return wiki;
-}
-
-	// Our tests
-function runTests(wiki,wikiOptions) {
-
-	it("should handle custom tag ordering", function() {
-		expect(wiki.filterTiddlers("[tag[TiddlerSeventh]]").join(",")).toBe("Tiddler10,TiddlerOne,Tiddler Three,Tiddler11,Tiddler9,a fourth tiddler");
-	});
-
-	it("should apply identical tag ordering irrespective of tag creation order", function () {
-		var wiki;
-		wiki = new $tw.Wiki(wikiOptions);
-		wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
-		wiki.addTiddler({ title: "B", text: "", tags: "sortTag"});
-		wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
-		expect(wiki.filterTiddlers("[tag[sortTag]]").join(',')).toBe("A,B,C");
-		wiki = new $tw.Wiki(wikiOptions);
-		wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
-		wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
-		wiki.addTiddler({ title: "B", text: "", tags: "sortTag"});
-		expect(wiki.filterTiddlers("[tag[sortTag]]").join(',')).toBe("A,B,C");
-		wiki = new $tw.Wiki(wikiOptions);
-		wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
-		wiki.addTiddler({ title: "B", text: "", tags: "sortTag"});
-		wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
-		expect(wiki.filterTiddlers("[tag[sortTag]]").join(',')).toBe("A,B,C");
-	});
-
-	// Tests for issue (#3296)
-	it("should apply tag ordering in order of dependency", function () {
-		var wiki = new $tw.Wiki(wikiOptions);
-
-		wiki.addTiddler({ title: "A", text: "", tags: "sortTag", "list-after": "B"});
-		wiki.addTiddler({ title: "B", text: "", tags: "sortTag", "list-after": "C"});
-		wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
-
-		expect(wiki.filterTiddlers("[tag[sortTag]]").join(',')).toBe("C,B,A");
-	});
-
-	it("should handle self-referencing dependency without looping infinitely", function() {
-		var wiki = new $tw.Wiki(wikiOptions);
-
-		wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
-		wiki.addTiddler({ title: "B", text: "", tags: "sortTag", "list-after": "B"});
-		wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
-
-		expect(wiki.filterTiddlers("[tag[sortTag]]").join(',')).toBe("A,B,C");
-	});
-
-	it("should handle empty list-after ordering", function() {
-		var wiki = new $tw.Wiki(wikiOptions);
-
-		wiki.addTiddler({ title: "A", text: "", tags: "sortTag", "list-after": ""});
-		wiki.addTiddler({ title: "B", text: "", tags: "sortTag"});
-		wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
-
-		expect(wiki.filterTiddlers("[tag[sortTag]]").join(',')).toBe("B,C,A");
+	describe("With no indexers", function() {
+		var wikiOptions = {enableIndexers: []},
+			wiki = setupWiki(wikiOptions);
+		runTests(wiki,wikiOptions);
 	});
 
-	// If a tiddler in the tag references a tiddler OUTSIDE of the tag
-	// with list-after/before, we need to make sure we don't accidentally
-	// handle that external tiddler, or that reference.
-	it("should gracefully handle dependencies that aren't in the tag list", function() {
-		var wiki = new $tw.Wiki(wikiOptions);
-
-		wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
-		wiki.addTiddler({ title: "B", text: "", tags: "sortTag", "list-after": "Z"});
-		wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
-		wiki.addTiddler({ title: "Z", text: "", tags: "EXCLUDED", "list-before": ""});
-
-		expect(wiki.filterTiddlers("[tag[sortTag]]").join(',')).toBe("A,B,C");
+	describe("With all indexers", function() {
+		var wikiOptions = {},
+			wiki = setupWiki();
+		runTests(wiki,wikiOptions);
 	});
 
-	it("should handle javascript-specific titles", function() {
+	function setupWiki(wikiOptions) {
+	// Create a wiki
 		var wiki = new $tw.Wiki(wikiOptions);
 
-		wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
-		wiki.addTiddler({ title: "__proto__", text: "", tags: "sortTag", "list-before": ""});
-
-		expect(wiki.filterTiddlers("[tag[sortTag]]").join(',')).toBe("__proto__,A");
-	});
+		// Add a few  tiddlers
+		wiki.addTiddler({
+			title: "TiddlerOne",
+			text: "The quick brown fox in $:/TiddlerTwo",
+			tags: ["one","TiddlerSeventh"],
+			modifier: "JoeBloggs",
+			modified: "201304152222"});
+		wiki.addTiddler({
+			title: "$:/TiddlerTwo",
+			text: "The rain in Spain\nfalls mainly on the plain and [[a fourth tiddler]]",
+			tags: ["two"],
+			modifier: "JohnDoe",
+			modified: "201304152211"});
+		wiki.addTiddler({
+			title: "Tiddler Three",
+			text: "The speed of sound in light\n\nThere is no TiddlerZero but TiddlerSix",
+			tags: ["one","two","TiddlerSeventh"],
+			modifier: "JohnDoe",
+			modified: "201304162202"});
+		wiki.addTiddler({
+			title: "a fourth tiddler",
+			text: "The quality of mercy is not drained by [[Tiddler Three]]",
+			tags: ["TiddlerSeventh"],
+			modifier: "JohnDoe"});
+		wiki.addTiddler({
+			title: "one",
+			text: "This is the text of tiddler [[one]]",
+			list: "[[Tiddler Three]] [[TiddlerOne]]",
+			modifier: "JohnDoe"});
+		wiki.addTiddler({
+			title: "$:/TiddlerFive",
+			text: "Everything in federation",
+			tags: ["two"]});
+		wiki.addTiddler({
+			title: "TiddlerSix",
+			text: "Missing inaction from TiddlerOne",
+			tags: []});
+		wiki.addTiddler({
+			title: "TiddlerSeventh",
+			text: "",
+			list: "TiddlerOne [[Tiddler Three]] [[a fourth tiddler]] MissingTiddler",
+			tags: []});
+		wiki.addTiddler({
+			title: "Tiddler8",
+			text: "Tidd",
+			tags: [],
+			"test-field": "JoeBloggs"});
+		wiki.addTiddler({
+			title: "Tiddler9",
+			text: "Another tiddler",
+			tags: ["TiddlerSeventh"],
+			"list-before": "a fourth tiddler"});
+		wiki.addTiddler({
+			title: "Tiddler10",
+			text: "Another tiddler",
+			tags: ["TiddlerSeventh"],
+			"list-before": ""});
+		wiki.addTiddler({
+			title: "Tiddler11",
+			text: "Another tiddler",
+			tags: ["TiddlerSeventh"],
+			"list-after": "Tiddler Three"});
+		return wiki;
+	}
 
-}
+	// Our tests
+	function runTests(wiki,wikiOptions) {
+
+		it("should handle custom tag ordering", function() {
+			expect(wiki.filterTiddlers("[tag[TiddlerSeventh]]").join(",")).toBe("Tiddler10,TiddlerOne,Tiddler Three,Tiddler11,Tiddler9,a fourth tiddler");
+		});
+
+		it("should apply identical tag ordering irrespective of tag creation order", function () {
+			var wiki;
+			wiki = new $tw.Wiki(wikiOptions);
+			wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
+			wiki.addTiddler({ title: "B", text: "", tags: "sortTag"});
+			wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
+			expect(wiki.filterTiddlers("[tag[sortTag]]").join(",")).toBe("A,B,C");
+			wiki = new $tw.Wiki(wikiOptions);
+			wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
+			wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
+			wiki.addTiddler({ title: "B", text: "", tags: "sortTag"});
+			expect(wiki.filterTiddlers("[tag[sortTag]]").join(",")).toBe("A,B,C");
+			wiki = new $tw.Wiki(wikiOptions);
+			wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
+			wiki.addTiddler({ title: "B", text: "", tags: "sortTag"});
+			wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
+			expect(wiki.filterTiddlers("[tag[sortTag]]").join(",")).toBe("A,B,C");
+		});
+
+		// Tests for issue (#3296)
+		it("should apply tag ordering in order of dependency", function () {
+			var wiki = new $tw.Wiki(wikiOptions);
+
+			wiki.addTiddler({ title: "A", text: "", tags: "sortTag", "list-after": "B"});
+			wiki.addTiddler({ title: "B", text: "", tags: "sortTag", "list-after": "C"});
+			wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
+
+			expect(wiki.filterTiddlers("[tag[sortTag]]").join(",")).toBe("C,B,A");
+		});
+
+		it("should handle self-referencing dependency without looping infinitely", function() {
+			var wiki = new $tw.Wiki(wikiOptions);
+
+			wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
+			wiki.addTiddler({ title: "B", text: "", tags: "sortTag", "list-after": "B"});
+			wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
+
+			expect(wiki.filterTiddlers("[tag[sortTag]]").join(",")).toBe("A,B,C");
+		});
+
+		it("should handle empty list-after ordering", function() {
+			var wiki = new $tw.Wiki(wikiOptions);
+
+			wiki.addTiddler({ title: "A", text: "", tags: "sortTag", "list-after": ""});
+			wiki.addTiddler({ title: "B", text: "", tags: "sortTag"});
+			wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
+
+			expect(wiki.filterTiddlers("[tag[sortTag]]").join(",")).toBe("B,C,A");
+		});
+
+		// If a tiddler in the tag references a tiddler OUTSIDE of the tag
+		// with list-after/before, we need to make sure we don't accidentally
+		// handle that external tiddler, or that reference.
+		it("should gracefully handle dependencies that aren't in the tag list", function() {
+			var wiki = new $tw.Wiki(wikiOptions);
+
+			wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
+			wiki.addTiddler({ title: "B", text: "", tags: "sortTag", "list-after": "Z"});
+			wiki.addTiddler({ title: "C", text: "", tags: "sortTag"});
+			wiki.addTiddler({ title: "Z", text: "", tags: "EXCLUDED", "list-before": ""});
+
+			expect(wiki.filterTiddlers("[tag[sortTag]]").join(",")).toBe("A,B,C");
+		});
+
+		it("should handle javascript-specific titles", function() {
+			var wiki = new $tw.Wiki(wikiOptions);
+
+			wiki.addTiddler({ title: "A", text: "", tags: "sortTag"});
+			wiki.addTiddler({ title: "__proto__", text: "", tags: "sortTag", "list-before": ""});
+
+			expect(wiki.filterTiddlers("[tag[sortTag]]").join(",")).toBe("__proto__,A");
+		});
+
+	}
 
 });
 

package/editions/test/tiddlers/tests/test-utils-copyObjectProperiesSafe.js

@@ -0,0 +1,240 @@
+/*\
+title: test-utils-copyObjectPropertiesSafe.js
+type: application/javascript
+tags: [[$:/tags/test-spec]]
+
+Tests $tw.utils.copyObjectPropertiesSafe, the root cause of #9869.
+
+$eventcatcher serialises DOM events via JSON.stringify(copyObjectPropertiesSafe(event)).
+
+The original bug was caused by instanceof Node/Window being realm-specific.
+When an event originated from a different browser window, DOM objects from that
+window were not detected and JSON.stringify() could throw "Illegal invocation".
+
+The implementation must:
+- skip DOM nodes and Window objects from other realms
+- preserve normal event data
+- preserve CustomEvent.detail payloads
+- continue copying enumerable properties from non-DOM objects
+- preserve arrays and break circular references
+
+The tests use substitutes for foreign DOM objects because headless Node does not
+provide a second browser realm. These objects model the important characteristics:
+DOM nodes have nodeType/nodeName, and Window objects have window/self/document.
+\*/
+
+"use strict";
+
+describe("copyObjectPropertiesSafe (#9869)", function() {
+
+	var cops = $tw.utils.copyObjectPropertiesSafe;
+
+	// Simulates a DOM node from another realm.
+	// The important characteristics are:
+	// - nodeType/nodeName identify it as a DOM node
+	// - circular parentNode references resemble real DOM trees
+	function fakeElement(tagName,extra) {
+		var node = $tw.utils.extend({
+			nodeType: 1,
+			nodeName: tagName,
+			tagName: tagName
+		},extra || {});
+
+		node.parentNode = node;
+		return node;
+	}
+
+	// Simulates a Window object from another realm.
+	function fakeWindow() {
+		var win = {
+			document: {},
+			location: {}
+		};
+
+		win.window = win;
+		win.self = win;
+
+		return win;
+	}
+
+	// An event carrying foreign DOM nodes and a Window.
+	function fakeEvent(type,target,extra) {
+		return $tw.utils.extend({
+			type: type,
+			target: target,
+			currentTarget: target,
+			view: fakeWindow(),
+			detail: 0,
+			isTrusted: true
+		},extra || {});
+	}
+
+
+	it("does not throw serialising any event type from a secondary window", function() {
+		var events = [
+			fakeEvent("focusin",fakeElement("INPUT")),
+			fakeEvent("change",fakeElement("SELECT")),
+			fakeEvent("click",fakeElement("BUTTON"),{
+				button: 0,
+				clientX: 5,
+				clientY: 9,
+				relatedTarget: null
+			}),
+			fakeEvent("mouseover",fakeElement("DIV"),{
+				relatedTarget: fakeElement("SPAN")
+			})
+		];
+
+		events.forEach(function(event) {
+			expect(function() {
+				JSON.stringify(cops(event));
+			}).not.toThrow();
+		});
+	});
+
+
+	it("drops DOM nodes and Window but keeps serialisable event data", function() {
+		var event = fakeEvent("click",fakeElement("BUTTON"),{
+			button: 0,
+			clientX: 5,
+			clientY: 9
+		});
+
+		var result = JSON.parse(JSON.stringify(cops(event)));
+
+		expect(result.target).toBeUndefined();
+		expect(result.currentTarget).toBeUndefined();
+		expect(result.view).toBeUndefined();
+
+		expect(result.type).toBe("click");
+		expect(result.detail).toBe(0);
+		expect(result.isTrusted).toBe(true);
+		expect(result.button).toBe(0);
+		expect(result.clientX).toBe(5);
+		expect(result.clientY).toBe(9);
+	});
+
+
+	it("preserves nested objects, arrays and circular reference handling", function() {
+		var event = fakeEvent("custom",fakeElement("DIV"),{
+			detail: {
+				nested: {
+					a: 1,
+					b: [2,3]
+				}
+			},
+			path: [
+				fakeElement("DIV"),
+				fakeWindow(),
+				42
+			]
+		});
+
+		event.self = event;
+
+		var result = JSON.parse(JSON.stringify(cops(event)));
+
+		expect(result.detail).toEqual({
+			nested: {
+				a: 1,
+				b: [2,3]
+			}
+		});
+
+		expect(result.path).toEqual([
+			null,
+			null,
+			42
+		]);
+
+		expect(result.self).toBeUndefined();
+	});
+
+
+	it("preserves CustomEvent.detail objects including custom object instances", function() {
+		function DetailObject() {
+			this.name = "example";
+			this.values = [1,2,3];
+		}
+
+		var event = fakeEvent("custom",fakeElement("DIV"),{
+			detail: new DetailObject()
+		});
+
+		var result = JSON.parse(JSON.stringify(cops(event)));
+
+		expect(result.detail).toEqual({
+			name: "example",
+			values: [1,2,3]
+		});
+	});
+
+
+	it("preserves CustomEvent.detail objects while dropping DOM objects inside them", function() {
+		var event = fakeEvent("custom",fakeElement("DIV"),{
+			detail: {
+				value: 123,
+				nested: {
+					target: fakeElement("SPAN"),
+					kept: "yes"
+				},
+				items: [
+					fakeElement("BUTTON"),
+					42
+				]
+			}
+		});
+
+		var result = JSON.parse(JSON.stringify(cops(event)));
+
+		expect(result.detail.value).toBe(123);
+
+		expect(result.detail.nested.target).toBeUndefined();
+		expect(result.detail.nested.kept).toBe("yes");
+
+		expect(result.detail.items).toEqual([
+			null,
+			42
+		]);
+	});
+
+
+	it("accepts primitive, array and object arguments", function() {
+		var nullProto = Object.create(null);
+		nullProto.kept = true;
+
+		expect(cops(42)).toBe(42);
+		expect(cops(null)).toBe(null);
+
+		expect(cops([
+			1,
+			"two",
+			{three: 3}
+		])).toEqual([
+			1,
+			"two",
+			{three: 3}
+		]);
+
+		expect(cops({
+			a: 1,
+			b: {
+				c: 2
+			}
+		})).toEqual({
+			a: 1,
+			b: {
+				c: 2
+			}
+		});
+
+		expect(JSON.parse(JSON.stringify(cops({
+			nullProto: nullProto
+		})))).toEqual({
+			nullProto: {
+				kept: true
+			}
+		});
+	});
+
+});

package/editions/test/tiddlers/tests/test-utils.js

@@ -82,7 +82,7 @@ describe("Utility tests", function() {
 	});
 
 	it("stringifyList shouldn't interfere with setting variables to negative numbers", function() {
-		var wiki = new $tw.Wiki();
+		var wiki = $tw.test.wiki();
 		wiki.addTiddler({title: "test", text: "<$set name=X filter='\"-7\"'>{{{ [<X>add[2]] }}}</$set>"});
 		// X shouldn't be wrapped in brackets. If it is, math filters will treat it as zero.
 		expect(wiki.renderTiddler("text/plain","test")).toBe("-5");
@@ -100,9 +100,9 @@ describe("Utility tests", function() {
 		expect(fds(d,"MM0\\D\\D")).toBe("110DD");
 		expect(fds(d,"TIMESTAMP")).toBe(d.getTime().toString());
 		const day = d.getUTCDate();
-		const dayStr = ("" + day).padStart(2, '0');
+		const dayStr = ("" + day).padStart(2, "0");
 		const hours = d.getUTCHours();
-		const hoursStr = ("" + hours).padStart(2, '0');
+		const hoursStr = ("" + hours).padStart(2, "0");
 		const expectedUtcStr = `201411${dayStr}${hoursStr}4128542`;
 		expect(fds(d,"[UTC]YYYY0MM0DD0hh0mm0ssXXX")).toBe(expectedUtcStr);
 
@@ -149,25 +149,25 @@ describe("Utility tests", function() {
 	it("should parse text references", function() {
 		var ptr = $tw.utils.parseTextReference;
 		expect(ptr("title")).toEqual(
-			{ title : 'title' }
+			{ title : "title" }
 		);
 		expect(ptr("ti#tle")).toEqual(
-			{ title : 'ti#tle' }
+			{ title : "ti#tle" }
 		);
 		expect(ptr("ti!tle")).toEqual(
-			{ title : 'ti!tle' }
+			{ title : "ti!tle" }
 		);
 		expect(ptr("ti#tle##index")).toEqual(
-			{ title : 'ti#tle', index : 'index' }
+			{ title : "ti#tle", index : "index" }
 		);
 		expect(ptr("ti!tle!!field")).toEqual(
-			{ title : 'ti!tle', field : 'field' }
+			{ title : "ti!tle", field : "field" }
 		);
 		expect(ptr("title##index!!field")).toEqual(
-			{ title : 'title##index', field : 'field' }
+			{ title : "title##index", field : "field" }
 		);
 		expect(ptr("title!!field##index")).toEqual(
-			{ title : 'title', field : 'field##index' }
+			{ title : "title", field : "field##index" }
 		);
 
 	});

package/editions/test/tiddlers/tests/test-widget-event.js

@@ -19,7 +19,7 @@ describe("Widget Event Listeners", function() {
 
 	it("should call all added event listeners on dispatchEvent", function() {
 		var calls = [];
-		var wiki = new $tw.Wiki();
+		var wiki = $tw.test.wiki();
 		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
 
 		// Add a function listener.
@@ -44,7 +44,7 @@ describe("Widget Event Listeners", function() {
 
 	it("should remove an event listener correctly", function() {
 		var calls = [];
-		var wiki = new $tw.Wiki();
+		var wiki = $tw.test.wiki();
 		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
 
 		function listener(e) {
@@ -70,7 +70,7 @@ describe("Widget Event Listeners", function() {
 
 	it("stop further propagation by returns false won't block other listeners on the same level.", function() {
 		var calls = [];
-		var wiki = new $tw.Wiki();
+		var wiki = $tw.test.wiki();
 		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
 
 		widget.addEventListener("stopEvent", function(e) {
@@ -92,7 +92,7 @@ describe("Widget Event Listeners", function() {
 
 	it("should dispatch event to parent widget if not handled on child", function() {
 		var parentCalls = [];
-		var wiki = new $tw.Wiki();
+		var wiki = $tw.test.wiki();
 		var parentWidget = createWidgetNode({type:"widget", text:"text"}, wiki);
 		parentWidget.addEventListener("parentEvent", function(e) {
 			parentCalls.push("parentListener");
@@ -110,7 +110,7 @@ describe("Widget Event Listeners", function() {
 
 	it("should not dispatch event to parent if child's listener stops propagation", function() {
 		var parentCalls = [];
-		var wiki = new $tw.Wiki();
+		var wiki = $tw.test.wiki();
 		var parentWidget = createWidgetNode({type:"widget", text:"text"}, wiki);
 		parentWidget.addEventListener("bubbleTest", function(e) {
 			parentCalls.push("parentListener");
@@ -128,7 +128,7 @@ describe("Widget Event Listeners", function() {
 
 	it("should call multiple listeners in proper order across child and parent", function() {
 		var calls = [];
-		var wiki = new $tw.Wiki();
+		var wiki = $tw.test.wiki();
 		var parentWidget = createWidgetNode({type:"widget", text:"text"}, wiki);
 		parentWidget.addEventListener("chainEvent", function(e) {
 			calls.push("parentListener");
@@ -152,7 +152,7 @@ describe("Widget Event Listeners", function() {
 	it("should handle events of different types separately", function() {
 		var callsA = [];
 		var callsB = [];
-		var wiki = new $tw.Wiki();
+		var wiki = $tw.test.wiki();
 		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
 		widget.addEventListener("eventA", function(e) {
 			callsA.push("A1");
@@ -171,7 +171,7 @@ describe("Widget Event Listeners", function() {
 	// Test using $tw.utils.each in removeEventListener internally (behavior verified via dispatch)
 	it("should remove listeners using $tw.utils.each without affecting other listeners", function() {
 		var calls = [];
-		var wiki = new $tw.Wiki();
+		var wiki = $tw.test.wiki();
 		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
 		function listener1(e) {
 			calls.push("listener1");
@@ -192,7 +192,7 @@ describe("Widget Event Listeners", function() {
 
 	it("should prevent adding the same event listener multiple times", function() {
 		var calls = 0;
-		var wiki = new $tw.Wiki();
+		var wiki = $tw.test.wiki();
 		var widget = createWidgetNode({type:"widget", text:"text"}, wiki);
 		
 		function listener(e) {