vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/next' into patch-2

Browse source
This commit is contained in:
impinball 2015-11-19 18:12:43 -05:00
commit f673306d6c
4 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/mithril.deferred.js
View file

@ -118,7 +118,7 @@ describe("m.deferred()", function () {
}) })
// FIXME: this is a bug. // FIXME: this is a bug.
xit("synchronously throws subclasses of Errors on creation", function () { it("synchronously throws subclasses of Errors on creation", function () {
expect(function () { expect(function () {
m.deferred().reject(new TypeError()) m.deferred().reject(new TypeError())
}).to.throw() }).to.throw()

2
test/mithril.render.js
View file

@ -1317,7 +1317,7 @@ describe("m.render()", function () {
// FIXME: implement document.createRange().createContextualFragment() in the // FIXME: implement document.createRange().createContextualFragment() in the
// mock document to fix this test // mock document to fix this test
xit("keeps unkeyed identity if mixed with elements/trusted text and identity can be inferred", function () { // eslint-disable-line it("keeps unkeyed identity if mixed with elements/trusted text and identity can be inferred", function () { // eslint-disable-line
var root = mock.document.createElement("div") var root = mock.document.createElement("div")
m.render(root, m("div", [ m.render(root, m("div", [

9
test/mithril.route.js
View file

@ -39,7 +39,6 @@ describe("m.route()", function () {
// Use these instead of `it` and `xit` in this set of tests if you need a // Use these instead of `it` and `xit` in this set of tests if you need a
// root element. // root element.
var dit = makeIt(it) var dit = makeIt(it)
var xdit = makeIt(xit)
// Wraps the `it` function for dependency injection that doesn't require // Wraps the `it` function for dependency injection that doesn't require
// `this` // `this`
@ -103,7 +102,7 @@ describe("m.route()", function () {
}) })
// FIXME: this causes others to fail // FIXME: this causes others to fail
xdit("skips route change if component ctrl.onunload calls preventDefault", function (root) { // eslint-disable-line dit("skips route change if component ctrl.onunload calls preventDefault", function (root) { // eslint-disable-line
mode("search") mode("search")
var spy = sinon.spy() var spy = sinon.spy()
@ -131,7 +130,7 @@ describe("m.route()", function () {
}) })
// FIXME: this causes others to fail // FIXME: this causes others to fail
xdit("skips route change if subcomponent ctrl.onunload calls preventDefault", function (root) { // eslint-disable-line dit("skips route change if subcomponent ctrl.onunload calls preventDefault", function (root) { // eslint-disable-line
mode("search") mode("search")
var spy = sinon.spy() var spy = sinon.spy()
@ -162,7 +161,7 @@ describe("m.route()", function () {
}) })
// FIXME: this causes others to fail // FIXME: this causes others to fail
xdit("skips route change if non-curried component ctrl.onunload calls preventDefault", function (root) { // eslint-disable-line dit("skips route change if non-curried component ctrl.onunload calls preventDefault", function (root) { // eslint-disable-line
mode("search") mode("search")
var spy = sinon.spy() var spy = sinon.spy()
@ -191,7 +190,7 @@ describe("m.route()", function () {
}) })
// FIXME: this causes others to fail // FIXME: this causes others to fail
xdit("skips route change if non-curried subcomponent ctrl.onunload calls preventDefault", function (root) { // eslint-disable-line dit("skips route change if non-curried subcomponent ctrl.onunload calls preventDefault", function (root) { // eslint-disable-line
mode("search") mode("search")
var spy = sinon.spy() var spy = sinon.spy()

2
test/mithril.trust.js
View file

@ -43,7 +43,7 @@ describe("m.trust()", function () {
// FIXME: this is a bug (trusted string's contents rendered as just // FIXME: this is a bug (trusted string's contents rendered as just
// textual contents) // textual contents)
xit("works with mixed trusted content in td", function () { it("works with mixed trusted content in td", function () {
var root = document.createElement("table") var root = document.createElement("table")
root.appendChild(root = document.createElement("tr")) root.appendChild(root = document.createElement("tr"))