Remove generateFromMetadata and getMetadata usage.

This commit is contained in:
cpojer
2015-10-28 23:38:29 -07:00
parent 2ecfc4f8fb
commit ac17bdaaba
8 changed files with 62 additions and 50 deletions

View File

@@ -0,0 +1,22 @@
/**
* Copyright 2013-2015, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
* @providesModule ReactElementTestChild
*/
'use strict';
var React = require('React');
var Child = React.createClass({
render: function() {
return React.createElement('div');
},
});
module.exports = Child;

View File

@@ -0,0 +1,35 @@
/**
* Copyright 2013-2015, Facebook, Inc.
* All rights reserved.
*
* This source code is licensed under the BSD-style license found in the
* LICENSE file in the root directory of this source tree. An additional grant
* of patent rights can be found in the PATENTS file in the same directory.
*
* @providesModule ReactMockedComponentTestComponent
*/
'use strict';
var React = require('React');
var ReactMockedComponentTestComponent = React.createClass({
getDefaultProps: function() {
return {bar: 'baz'};
},
getInitialState: function() {
return {foo: 'bar'};
},
hasCustomMethod: function() {
return true;
},
render: function() {
return <span />;
},
});
module.exports = ReactMockedComponentTestComponent;

View File

@@ -70,6 +70,7 @@
],
"testPathDirs": [
"<rootDir>/eslint-rules",
"<rootDir>/mocks",
"<rootDir>/src",
"node_modules/fbjs"
],

View File

@@ -369,23 +369,14 @@ describe('ReactElement', function() {
});
describe('comparing jsx vs .createFactory() vs .createElement()', function() {
var Child, mocks;
var Child;
beforeEach(function() {
jest.resetModuleRegistry();
mocks = require('mocks');
React = require('React');
ReactDOM = require('ReactDOM');
ReactTestUtils = require('ReactTestUtils');
var metaData = mocks.getMetadata(React.createClass({
render: function() {
return React.createElement('div');
},
}));
Child = mocks.generateFromMetadata(metaData);
Child = jest.genMockFromModule('ReactElementTestChild');
});

View File

@@ -15,8 +15,6 @@ describe('DOMPropertyOperations', function() {
var DOMPropertyOperations;
var DOMProperty;
var mocks;
beforeEach(function() {
jest.resetModuleRegistry();
var ReactDefaultInjection = require('ReactDefaultInjection');
@@ -24,8 +22,6 @@ describe('DOMPropertyOperations', function() {
DOMPropertyOperations = require('DOMPropertyOperations');
DOMProperty = require('DOMProperty');
mocks = require('mocks');
});
describe('createMarkupForProperty', function() {

View File

@@ -15,11 +15,8 @@ var React;
var ReactDOM;
var ReactTestUtils;
var mocks;
describe('ReactComponent', function() {
beforeEach(function() {
mocks = require('mocks');
React = require('React');
ReactDOM = require('ReactDOM');
ReactTestUtils = require('ReactTestUtils');

View File

@@ -14,43 +14,17 @@
var React;
var ReactTestUtils;
var mocks;
var OriginalComponent;
var AutoMockedComponent;
var MockedComponent;
describe('ReactMockedComponent', function() {
beforeEach(function() {
mocks = require('mocks');
React = require('React');
ReactTestUtils = require('ReactTestUtils');
OriginalComponent = React.createClass({
getDefaultProps: function() {
return {bar: 'baz'};
},
getInitialState: function() {
return {foo: 'bar'};
},
hasCustomMethod: function() {
return true;
},
render: function() {
return <span />;
},
});
var metaData = mocks.getMetadata(OriginalComponent);
AutoMockedComponent = mocks.generateFromMetadata(metaData);
MockedComponent = mocks.generateFromMetadata(metaData);
AutoMockedComponent = jest.genMockFromModule('ReactMockedComponentTestComponent');
MockedComponent = jest.genMockFromModule('ReactMockedComponentTestComponent');
ReactTestUtils.mockComponent(MockedComponent);
});

View File

@@ -16,13 +16,9 @@ var ReactDOM;
var ReactDOMServer;
var ReactTestUtils;
var mocks;
describe('ReactTestUtils', function() {
beforeEach(function() {
mocks = require('mocks');
React = require('React');
ReactDOM = require('ReactDOM');
ReactDOMServer = require('ReactDOMServer');