Update to 14.0

Reviewed By: kassens

Differential Revision: D3627753

fbshipit-source-id: 35b8246c8cb61e60908d8c233a6e72063bf67096
This commit is contained in:
Christoph Pojer 2016-07-27 22:02:42 -07:00 committed by Facebook Github Bot 7
parent 7971cca4f0
commit 75ecaf4190
7 changed files with 40 additions and 13 deletions

View File

@ -0,0 +1,11 @@
/**
* Copyright (c) 2015-present, 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.
*/
'use strict';
module.exports = () => true;

View File

@ -9,11 +9,6 @@
jest.disableAutomock();
jest.mock('NativeModules')
.mock('Text')
.mock('ensureComponentIsNative')
.mock('View');
const React = require('React');
const ReactTestRenderer = require('react/lib/ReactTestRenderer');
const Text = require('Text');

View File

@ -1,4 +1,4 @@
exports[`TouchableHighlight renders correctly 0`] = `
exports[`TouchableHighlight renders correctly 1`] = `
<View
accessibilityComponentType={undefined}
accessibilityLabel={undefined}
@ -14,7 +14,9 @@ exports[`TouchableHighlight renders correctly 0`] = `
onStartShouldSetResponder={[Function bound touchableHandleStartShouldSetResponder]}
style={
Array [
4,
Object {
"backgroundColor": "transparent"
},
Object {}
]
}

View File

@ -12,11 +12,14 @@
const React = require('React');
const {Component} = React;
const RealText = require.requireActual('Text');
class Text extends Component {
render() {
const {children, ...props} = this.props;
return React.createElement('Text', props, children);
}
}
Text.propTypes = RealText.propTypes;
module.exports = Text;

View File

@ -9,6 +9,7 @@
'use strict';
require.requireActual('../packager/react-packager/src/Resolver/polyfills/babelHelpers.js');
require.requireActual('../packager/react-packager/src/Resolver/polyfills/Object.es7.js');
global.__DEV__ = true;
global.__fbBatchedBridgeConfig = {
@ -19,4 +20,17 @@ global.__fbBatchedBridgeConfig = {
global.Promise = require('promise');
global.regeneratorRuntime = require.requireActual('regenerator-runtime/runtime');
jest
.mock('ensureComponentIsNative')
.mock('Image')
.mock('NativeModules')
.mock('Text')
.mock('View');
const mockEmptyObject = {};
jest.mock('ReactNativePropRegistry', () => ({
register: id => id,
getByID: () => mockEmptyObject,
}));
jest.setMock('ErrorUtils', require('ErrorUtils'));

View File

@ -25,6 +25,7 @@
"defaultPlatform": "ios",
"providesModuleNodeModules": [
"react-native",
"react",
"parse"
],
"platforms": [
@ -33,6 +34,7 @@
]
},
"modulePathIgnorePatterns": [
"Libraries/react-native/",
"/node_modules/(?!react|fbjs|react-native|parse|react-transform-hmr|core-js|promise)/",
"node_modules/react/node_modules/fbjs/",
"node_modules/react/lib/ReactDOM.js",
@ -113,7 +115,7 @@
"flow"
],
"scripts": {
"test": "NODE_ENV=test jest",
"test": "jest",
"flow": "flow",
"lint": "eslint Examples/ Libraries/",
"start": "/usr/bin/env bash -c './packager/packager.sh \"$@\" || true' --"
@ -199,9 +201,9 @@
"eslint-plugin-flow-vars": "^0.2.1",
"eslint-plugin-react": "^4.2.1",
"flow-bin": "^0.29.0",
"jest": "^13.1.0",
"jest-repl": "^13.1.0",
"jest-runtime": "^13.1.0",
"jest": "latest",
"jest-repl": "latest",
"jest-runtime": "latest",
"portfinder": "0.4.0",
"react": "~15.3.0-rc.2",
"shelljs": "0.6.0"

View File

@ -174,7 +174,7 @@ describe('Bundler', function() {
{runMainModule: true, runBeforeMainModule: []}
]);
expect(bundle.addAsset.mock.calls).toContain([{
expect(bundle.addAsset.mock.calls[0]).toEqual([{
__packager_asset: true,
path: '/root/img/img.png',
uri: 'img',
@ -183,7 +183,7 @@ describe('Bundler', function() {
deprecated: true,
}]);
expect(bundle.addAsset.mock.calls).toContain([{
expect(bundle.addAsset.mock.calls[1]).toEqual([{
__packager_asset: true,
fileSystemLocation: '/root/img',
httpServerLocation: '/assets/img',