Skip to content

Commit 03579e1

Browse files
mweststratemweststrate
committed
Fixed some issues with tests
1 parent 657bf00 commit 03579e1

File tree

8 files changed

+24
-26
lines changed

8 files changed

+24
-26
lines changed

‎package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
"url": "https://github.com/mobxjs/mobx-react.git"
1111
},
1212
"scripts": {
13-
"test": "npm run build && npm run test:console",
13+
"test": "npm run build && npm run test:console && npm run test:ts",
1414
"test:ts": "tsc -p test/ts",
15-
"test:build": "browserify -x react/addons -x react-native -x react/lib/ReactContext -x react/lib/ExecutionEnvironment test/*.js -o ./test/browser/test_bundle.js -t [ babelify --presets [ es2015 react ] --plugins [ transform-decorators-legacy transform-class-properties ] ]",
16-
"test:travis": "npm run build && browserify -x react-native -x react/addons -x react/lib/ReactContext -x react/lib/ExecutionEnvironment test/*.js -t [ babelify --presets [ es2015 react ] --plugins [ transform-decorators-legacy transform-class-properties ] ] | tape-run && npm run test:ts",
17-
"test:console": "browserify -x react-native -x react/addons -x react/lib/ReactContext -x react/lib/ExecutionEnvironment test/*.js -t [ babelify --presets [ es2015 react ] --plugins [ transform-decorators-legacy transform-class-properties ] ] | tape-run | tap-spec && npm run test:ts",
18-
"test:open": " open ./test/browser/index.html",
15+
"test:build": "browserify -x react/addons -x react-native -x react/lib/ReactContext -x react/lib/ExecutionEnvironment test/index.js -o ./test/browser/test_bundle.js -t [ babelify --presets [ es2015 react ] --plugins [ transform-decorators-legacy transform-class-properties ] ]",
16+
"test:travis": "npm run test",
17+
"test:console": "browserify -x react-native -x react/addons -x react/lib/ReactContext -x react/lib/ExecutionEnvironment test/index.js -t [ babelify --presets [ es2015 react ] --plugins [ transform-decorators-legacy transform-class-properties ] ] | tape-run | tap-spec",
18+
"test:open": "open ./test/browser/index.html",
1919
"test:browser": "npm run test:build && npm run test:open",
2020
"build": "node build-rollup.js && cp src/index.d.ts index.d.ts && cp src/index.d.ts native.d.ts && cp src/index.d.ts custom.d.ts"
2121
},

‎test/context.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ test('observer based context', t => {
1010
const warns = []
1111
console.warn = msg => warns.push(msg)
1212

13-
observer(['test'], createClass({
14-
render: () => null
15-
}))
13+
observer(['test'], () => null)
1614

1715
t.equal(warns.length, 1)
1816
t.equal(warns[0], 'Mobx observer: Using observer to inject stores is deprecated since 4.0. Use `@inject("store1", "store2") @observer ComponentClass` or `inject("store1", "store2")(observer(componentClass))` instead of `@observer(["store1", "store2"]) ComponentClass`')

‎test/inject.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import { mount } from 'enzyme'
44
import test from 'tape'
55
import mobx, { action, observable, computed } from 'mobx'
66
import { observer, inject, Provider } from '../'
7+
import {createTestRoot} from "./index"
8+
9+
const testRoot = createTestRoot();
710

811
test('inject based context', t => {
912
test('basic context', t => {
@@ -313,9 +316,6 @@ test('inject based context', t => {
313316
});
314317

315318
test('using a custom injector is not too reactive', t => {
316-
const testRoot = document.createElement('div');
317-
document.body.appendChild(testRoot);
318-
319319
let listRender = 0;
320320
let itemRender = 0;
321321
let injectRender = 0;

‎test/issue21.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import test from 'tape'
44
import mobx from 'mobx'
55
import { observer } from '../'
66
import _ from 'lodash'
7+
import {createTestRoot} from "./index"
78

8-
const testRoot = document.createElement('div');
9-
document.body.appendChild(testRoot);
9+
const testRoot = createTestRoot();
1010
let topRenderCount = 0;
1111

1212
const wizardModel = mobx.observable({

‎test/misc.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ import { mount, shallow } from 'enzyme'
44
import test from 'tape'
55
import mobx from 'mobx'
66
import { observer } from '../'
7+
import {createTestRoot} from "./index"
8+
9+
const testRoot = createTestRoot();
710

811
test('custom shouldComponentUpdate is not respected for observable changes (#50)', t => {
912
let called = 0;
@@ -91,8 +94,6 @@ test('issue mobx 405', t => {
9194
});
9295

9396
test('#85 Should handle state changing in constructors', function(t) {
94-
const testRoot = document.createElement('div');
95-
document.body.appendChild(testRoot);
9697
const a = mobx.observable(2);
9798
const Child = observer(createClass({
9899
displayName: 'Child',

‎test/observer.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import ReactDOMServer from 'react-dom/server'
44
import test from 'tape'
55
import mobx, { observable, action, computed} from 'mobx'
66
import mobxReact, { observer, inject, onError, offError } from '../'
7+
import {createTestRoot} from "./index"
78

8-
const testRoot = document.createElement('div');
9-
document.body.appendChild(testRoot);
9+
const testRoot = createTestRoot();
1010

1111
const store = mobx.observable({
1212
todos: [{

‎test/stateless.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ import ReactDOM from 'react-dom'
33
import test from 'tape'
44
import mobx from 'mobx'
55
import { observer, propTypes } from '../'
6+
import {createTestRoot} from "./index"
7+
8+
const testRoot = createTestRoot();
69

710
const stateLessComp = ({testProp}) => <div>result: { testProp }</div>
811

@@ -13,8 +16,6 @@ stateLessComp.defaultProps = {
1316
testProp: 'default value for prop testProp'
1417
}
1518

16-
const testRoot = document.createElement('div');
17-
document.body.appendChild(testRoot);
1819

1920
test('stateless component with propTypes', t => {
2021
const StatelessCompObserver = observer(stateLessComp);
@@ -46,7 +47,7 @@ test('stateless component with context support', t => {
4647
render: () => <StateLessCompWithContextObserver />
4748
})
4849
ReactDOM.render(<ContextProvider />, testRoot, () => {
49-
t.equal(testRoot.innerText, 'context: hello world');
50+
t.equal(testRoot.innerText.replace(/\n/,""), 'context: hello world');
5051
t.end();
5152
});
5253
});

‎test/transactions.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import ReactDOM from 'react-dom'
33
import test from 'tape'
44
import mobx from 'mobx'
55
import mobxReact from '../'
6+
import {createTestRoot} from "./index"
67

78
test('mobx issue 50', t => {
8-
const testRoot = document.createElement('div');
9-
document.body.appendChild(testRoot);
9+
const testRoot = createTestRoot();
1010
const foo = {
1111
a: mobx.observable(true),
1212
b: mobx.observable(false),
@@ -43,8 +43,7 @@ test('mobx issue 50', t => {
4343
});
4444

4545
test('React.render should respect transaction', t => {
46-
const testRoot = document.createElement('div');
47-
document.body.appendChild(testRoot);
46+
const testRoot = createTestRoot();
4847
const a = mobx.observable(2);
4948
const loaded = mobx.observable(false);
5049
const valuesSeen = [];
@@ -73,8 +72,7 @@ test('React.render should respect transaction', t => {
7372
});
7473

7574
test('React.render in transaction should succeed', t => {
76-
const testRoot = document.createElement('div');
77-
document.body.appendChild(testRoot);
75+
const testRoot = createTestRoot();
7876
const a = mobx.observable(2);
7977
const loaded = mobx.observable(false);
8078
const valuesSeen = [];

0 commit comments

Comments
 (0)