Actually use ospec

dead-claudia · Mar 16, 2020 · 39f6fa9 · 39f6fa9
1 parent 481fe6a
commit 39f6fa9
Show file tree

Hide file tree

Showing 56 changed files with 59 additions and 55 deletions.
diff --git a/api/tests/test-mountRedraw.js b/api/tests/test-mountRedraw.js
@@ -1,7 +1,7 @@
 "use strict"
 
 // Low-priority TODO: remove the dependency on the renderer here.
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var throttleMocker = require("../../test-utils/throttleMock")

diff --git a/api/tests/test-router.js b/api/tests/test-router.js
@@ -1,7 +1,7 @@
 "use strict"
 
 // Low-priority TODO: remove the dependency on the renderer here.
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var browserMock = require("../../test-utils/browserMock")
 var throttleMocker = require("../../test-utils/throttleMock")
 

diff --git a/api/tests/test-routerGetSet.js b/api/tests/test-routerGetSet.js
@@ -1,7 +1,7 @@
 "use strict"
 
 // Low-priority TODO: remove the dependency on the renderer here.
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 var browserMock = require("../../test-utils/browserMock")
 var throttleMocker = require("../../test-utils/throttleMock")

diff --git a/ospec/tests/test-ospec.js b/ospec/tests/test-ospec.js
@@ -6,7 +6,11 @@ var o, callAsync
 if (typeof require !== "undefined") {
 	/* eslint-disable global-require */
 	callAsync = require("../../test-utils/callAsync")
+	var warn = console.warn
+	// Let's drop the warning to leave the console a little less noisy.
+	console.warn = function() {}
 	o = require("../ospec")
+	console.warn = warn
 	/* eslint-enable global-require */
 } else {
 	callAsync = typeof setImmediate === "function" ? setImmediate : setTimeout

diff --git a/pathname/tests/test-buildPathname.js b/pathname/tests/test-buildPathname.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var buildPathname = require("../../pathname/build")
 
 o.spec("buildPathname", function() {

diff --git a/pathname/tests/test-compileTemplate.js b/pathname/tests/test-compileTemplate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var parsePathname = require("../../pathname/parse")
 var compileTemplate = require("../../pathname/compileTemplate")
 

diff --git a/pathname/tests/test-parsePathname.js b/pathname/tests/test-parsePathname.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var parsePathname = require("../../pathname/parse")
 
 o.spec("parsePathname", function() {

diff --git a/promise/tests/test-promise.js b/promise/tests/test-promise.js
@@ -6,7 +6,7 @@ var o, callAsync, Promise
 if (typeof require !== "undefined") {
 	/* eslint-disable global-require */
 	callAsync = require("../../test-utils/callAsync")
-	o = require("../../ospec/ospec")
+	o = require("ospec")
 	Promise = require("../../promise/polyfill")
 	/* eslint-enable global-require */
 } else {

diff --git a/querystring/tests/test-buildQueryString.js b/querystring/tests/test-buildQueryString.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var buildQueryString = require("../../querystring/build")
 
 o.spec("buildQueryString", function() {

diff --git a/querystring/tests/test-parseQueryString.js b/querystring/tests/test-parseQueryString.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var parseQueryString = require("../../querystring/parse")
 
 o.spec("parseQueryString", function() {

diff --git a/render/tests/test-attributes.js b/render/tests/test-attributes.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-component.js b/render/tests/test-component.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")

diff --git a/render/tests/test-createElement.js b/render/tests/test-createElement.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-createFragment.js b/render/tests/test-createFragment.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-createHTML.js b/render/tests/test-createHTML.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-createNodes.js b/render/tests/test-createNodes.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-createText.js b/render/tests/test-createText.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-event.js b/render/tests/test-event.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-fragment.js b/render/tests/test-fragment.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var fragment = require("../../render/fragment")
 var m = require("../../render/hyperscript")
 

diff --git a/render/tests/test-hyperscript.js b/render/tests/test-hyperscript.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var m = require("../../render/hyperscript")
 
 o.spec("hyperscript", function() {

diff --git a/render/tests/test-input.js b/render/tests/test-input.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-normalize.js b/render/tests/test-normalize.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var Vnode = require("../../render/vnode")
 
 o.spec("normalize", function() {

diff --git a/render/tests/test-normalizeChildren.js b/render/tests/test-normalizeChildren.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var Vnode = require("../../render/vnode")
 
 o.spec("normalizeChildren", function() {

diff --git a/render/tests/test-normalizeComponentChildren.js b/render/tests/test-normalizeComponentChildren.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var m = require("../../render/hyperscript")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")

diff --git a/render/tests/test-onbeforeremove.js b/render/tests/test-onbeforeremove.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")

diff --git a/render/tests/test-onbeforeupdate.js b/render/tests/test-onbeforeupdate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")

diff --git a/render/tests/test-oncreate.js b/render/tests/test-oncreate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-oninit.js b/render/tests/test-oninit.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-onremove.js b/render/tests/test-onremove.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")

diff --git a/render/tests/test-onupdate.js b/render/tests/test-onupdate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-render-hyperscript-integration.js b/render/tests/test-render-hyperscript-integration.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var m = require("../../render/hyperscript")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")

diff --git a/render/tests/test-render.js b/render/tests/test-render.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-textContent.js b/render/tests/test-textContent.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-trust.js b/render/tests/test-trust.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var trust = require("../../render/trust")
 
 o.spec("trust", function() {

diff --git a/render/tests/test-updateElement.js b/render/tests/test-updateElement.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-updateFragment.js b/render/tests/test-updateFragment.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-updateHTML.js b/render/tests/test-updateHTML.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-updateNodes.js b/render/tests/test-updateNodes.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")

diff --git a/render/tests/test-updateNodesFuzzer.js b/render/tests/test-updateNodesFuzzer.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/render/tests/test-updateText.js b/render/tests/test-updateText.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 

diff --git a/request/tests/test-jsonp.js b/request/tests/test-jsonp.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var xhrMock = require("../../test-utils/xhrMock")
 var Request = require("../../request/request")
 var PromisePolyfill = require("../../promise/promise")

diff --git a/request/tests/test-request.js b/request/tests/test-request.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 var xhrMock = require("../../test-utils/xhrMock")
 var Request = require("../../request/request")

diff --git a/scripts/tests/test-bundler.js b/scripts/tests/test-bundler.js
@@ -6,7 +6,7 @@ const access = util.promisify(fs.access)
 const writeFile = util.promisify(fs.writeFile)
 const unlink = util.promisify(fs.unlink)
 
-const o = require("../../ospec/ospec")
+const o = require("ospec")
 const bundle = require("../_bundler-impl")
 
 o.spec("bundler", async () => {

diff --git a/stream/tests/test-scan.js b/stream/tests/test-scan.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var stream = require("../stream")
 
 o.spec("scan", function() {

diff --git a/stream/tests/test-scanMerge.js b/stream/tests/test-scanMerge.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var stream = require("../stream")
 
 o.spec("scanMerge", function() {

diff --git a/stream/tests/test-stream.js b/stream/tests/test-stream.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var Stream = require("../stream")
 
 o.spec("stream", function() {

diff --git a/test-utils/tests/test-browserMock.js b/test-utils/tests/test-browserMock.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var browserMock = require("../../test-utils/browserMock")
 var callAsync = require("../../test-utils/callAsync")
 o.spec("browserMock", function() {

diff --git a/test-utils/tests/test-callAsync.js b/test-utils/tests/test-callAsync.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 
 o.spec("callAsync", function() {