Skip to content

Commit 8ab86b0

Browse files
committed
Add WysiwygFieldTest and clean tests
1 parent 9d33bfa commit 8ab86b0

20 files changed

+171
-188
lines changed

app/Actions/__mocks__/ListActions.js

Lines changed: 0 additions & 4 deletions
This file was deleted.

app/Component/Button/__tests__/MaBackButtonTest.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
jest.dontMock('../MaBackButton');
2-
3-
const React = require('react/addons');
4-
const TestUtils = React.addons.TestUtils;
1+
jest.autoMockOff();
52

63
describe('MaBackButton', () => {
7-
let MaBackButton;
4+
let React, TestUtils, MaBackButton;
85

96
beforeEach(() => {
7+
React = require('react/addons');
8+
TestUtils = React.addons.TestUtils;
109
MaBackButton = require('../MaBackButton');
1110
});
1211

app/Component/Button/__tests__/MaCreateButtonTest.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
jest.autoMockOff();
22
jest.setMock('react-router', {Link : require('../__mocks__/Link')});
33

4-
const React = require('react/addons');
5-
const TestUtils = React.addons.TestUtils;
6-
74
describe('MaCreateButton', () => {
8-
let MaCreateButton;
5+
let React, TestUtils, MaCreateButton;
96

107
beforeEach(() => {
8+
React = require('react/addons');
9+
TestUtils = React.addons.TestUtils;
1110
MaCreateButton = require('../MaCreateButton');
1211
});
1312

app/Component/Button/__tests__/MaDeleteButtonTest.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
jest.autoMockOff();
22
jest.setMock('react-router', {Link : require('../__mocks__/Link')});
33

4-
const React = require('react/addons');
5-
const TestUtils = React.addons.TestUtils;
6-
74
describe('MaDeleteButton', () => {
8-
let MaDeleteButton;
9-
let entry;
5+
let React, TestUtils, MaDeleteButton, entry;
106

117
beforeEach(() => {
8+
React = require('react/addons');
9+
TestUtils = React.addons.TestUtils;
1210
MaDeleteButton = require('../MaDeleteButton');
1311

1412
entry = {
1513
identifierValue: 23
16-
}
14+
};
1715
});
1816

1917
describe('With good props', () => {

app/Component/Button/__tests__/MaEditButtonTest.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
jest.autoMockOff();
22
jest.setMock('react-router', {Link : require('../__mocks__/Link')});
33

4-
const React = require('react/addons');
5-
const TestUtils = React.addons.TestUtils;
6-
74
describe('MaEditButton', () => {
8-
let MaEditButton;
9-
let entry;
5+
let React, TestUtils, MaEditButton, entry;
106

117
beforeEach(() => {
8+
React = require('react/addons');
9+
TestUtils = React.addons.TestUtils;
1210
MaEditButton = require('../MaEditButton');
1311

1412
entry = {
1513
identifierValue: 23
16-
}
14+
};
1715
});
1816

1917
describe('With good props', () => {

app/Component/Button/__tests__/MaListButtonTest.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
jest.autoMockOff();
22
jest.setMock('react-router', {Link : require('../__mocks__/Link')});
33

4-
const React = require('react/addons');
5-
const TestUtils = React.addons.TestUtils;
6-
74
describe('MaListButton', () => {
8-
let MaListButton;
5+
let React, TestUtils, MaListButton;
96

107
beforeEach(() => {
8+
React = require('react/addons');
9+
TestUtils = React.addons.TestUtils;
1110
MaListButton = require('../MaListButton');
1211
});
1312

app/Component/Button/__tests__/MaShowButtonTest.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
jest.autoMockOff();
22
jest.setMock('react-router', {Link : require('../__mocks__/Link')});
33

4-
const React = require('react/addons');
5-
const TestUtils = React.addons.TestUtils;
6-
74
describe('MaShowButton', () => {
8-
let MaShowButton;
9-
let entry;
5+
let React, TestUtils, MaShowButton, entry;
106

117
beforeEach(() => {
8+
React = require('react/addons');
9+
TestUtils = React.addons.TestUtils;
1210
MaShowButton = require('../MaShowButton');
1311

1412
entry = {
1513
identifierValue: 23
16-
}
14+
};
1715
});
1816

1917
describe('With good props', () => {

app/Component/Column/__tests__/BooleanColumnTest.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
jest.autoMockOff();
2-
jest.dontMock('../BooleanColumn');
3-
4-
const React = require('react/addons');
5-
const TestUtils = React.addons.TestUtils;
62

73
describe('BooleanColumn', () => {
8-
let BooleanColumn;
4+
let React, TestUtils, BooleanColumn;
95

106
beforeEach(() => {
7+
React = require('react/addons');
8+
TestUtils = React.addons.TestUtils;
119
BooleanColumn = require('../BooleanColumn');
1210
});
1311

app/Component/Column/__tests__/ColumnTest.js

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
jest.autoMockOff();
2-
jest.dontMock('../../../Field/FieldViewConfiguration');
3-
jest.dontMock('../../../Field/StringFieldView');
4-
5-
const React = require('react/addons');
6-
const TestUtils = React.addons.TestUtils;
7-
8-
import Field from 'admin-config/lib/Field/Field';
9-
import NumberField from 'admin-config/lib/Field/NumberField';
10-
import Entity from 'admin-config/lib/Entity/Entity';
11-
12-
const Column = require('../Column');
13-
const FieldViewConfiguration = require('../../../Field/FieldViewConfiguration');
14-
const StringFieldView = require('../../../Field/StringFieldView');
15-
const NumberFieldView = require('../../../Field/NumberFieldView');
16-
17-
FieldViewConfiguration.registerFieldView('string', StringFieldView);
18-
FieldViewConfiguration.registerFieldView('number', NumberFieldView);
19-
20-
function getColumn(field, entity, entry, dataStore, configuration) {
21-
const col = TestUtils.renderIntoDocument(<Column field={field} entity={entity} entry={entry}
22-
dataStore={dataStore} configuration={configuration} />);
23-
24-
return React.findDOMNode(col);
25-
}
262

273
describe('Column', () => {
4+
let React, TestUtils, Column, Field, NumberField, Entity, FieldViewConfiguration, StringFieldView, NumberFieldView;
5+
6+
function getColumn(field, entity, entry, dataStore, configuration) {
7+
const col = TestUtils.renderIntoDocument(<Column field={field} entity={entity} entry={entry}
8+
dataStore={dataStore} configuration={configuration} />);
9+
10+
return React.findDOMNode(col);
11+
}
12+
13+
beforeEach(() => {
14+
React = require('react/addons');
15+
TestUtils = React.addons.TestUtils;
16+
Column = require('../Column');
17+
Field = require('admin-config/lib/Field/Field');
18+
NumberField = require('admin-config/lib/Field/NumberField');
19+
Entity = require('admin-config/lib/Entity/Entity');
20+
FieldViewConfiguration = require('../../../Field/FieldViewConfiguration');
21+
StringFieldView = require('../../../Field/StringFieldView');
22+
NumberFieldView = require('../../../Field/NumberFieldView');
23+
24+
FieldViewConfiguration.registerFieldView('string', StringFieldView);
25+
FieldViewConfiguration.registerFieldView('number', NumberFieldView);
26+
});
2827

2928
it('should display a string field', () => {
3029
const field = new Field('name');

app/Component/Column/__tests__/JsonColumnTest.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
jest.dontMock('../JsonColumn');
2-
3-
const React = require('react/addons');
4-
const TestUtils = React.addons.TestUtils;
1+
jest.autoMockOff();
52

63
describe('JsonColumn', () => {
7-
let JsonColumn;
4+
let React, TestUtils, JsonColumn;
85

96
beforeEach(() => {
7+
React = require('react/addons');
8+
TestUtils = React.addons.TestUtils
109
JsonColumn = require('../JsonColumn');
1110
});
1211

0 commit comments

Comments
 (0)