Merge branch 'master' into ticketea-android-support

Author: jsdf

lib/__mocks__/ListView.js

@@ -1 +1 @@
-module.exports = jest.genMockFromModule('./View')
+module.exports = require.requireActual('./react-native').ListView;

lib/__mocks__/View.js

@@ -1,11 +1,20 @@
 var React = require.requireActual('react/dist/react-with-addons')
 
+function makeMockComponentClass(displayName) {
+ return React.createClass({
+ displayName,
+ render() {
+ return this.props.children
+ },
+ })
+}
+
 var ReactNative = {
  ...React,
- ActivityIndicatorIOS: jest.genMockFromModule('./View'),
- ListView: jest.genMockFromModule('./View'),
- View: jest.genMockFromModule('./View'),
- Text: jest.genMockFromModule('./View'),
+ ActivityIndicatorIOS: makeMockComponentClass('ActivityIndicatorIOS'),
+ ListView: makeMockComponentClass('ListView'),
+ View: makeMockComponentClass('View'),
+ Text: makeMockComponentClass('Text'),
  StyleSheet: {
  create: (ss) => ss,
  },

lib/__mocks__/react-native.js

@@ -2,11 +2,15 @@ jest.dontMock('../RefreshingIndicator')
 
 describe('RefreshingIndicator', function() {
  let React
+ let ReactNative
+ let ShallowTestUtils
  let RefreshingIndicator
  let description
 
  beforeEach(function() {
  React = require.requireActual('react/dist/react-with-addons')
+ ReactNative = require('react-native')
+ ShallowTestUtils = require('react-shallow-testutils')
 
  RefreshingIndicator = require('../RefreshingIndicator')
 
@@ -16,15 +20,18 @@ describe('RefreshingIndicator', function() {
  it('renders an activity indicator', function() {
  let renderer = this.shallowRender(
  <RefreshingIndicator
- description={description}
+ refreshingPrompt={description}
+ isRefreshing={true}
  />
  )
 
  let rootEl = renderer.getRenderOutput()
- expect(rootEl).toBeReactElement()
+ expect(rootEl).toBeReactElementOfType(ReactNative.View)
 
- expect(
- React.Children.only(rootEl.props.children).props.children[0]
- ).toBeReactElement()
+ let textEl = ShallowTestUtils.findWithType(rootEl, ReactNative.Text)
+ expect(textEl.props.children).toBe(description)
+
+ let indicatorEl = ShallowTestUtils.findWithType(rootEl, ReactNative.ActivityIndicatorIOS)
+ expect(indicatorEl).not.toBeUndefined()
  })
 })

lib/__tests__/RefreshingIndicator-test.js

@@ -34,6 +34,9 @@
  "<rootDir>/node_modules/react",
  "<rootDir>/node_modules/babel-core",
  "<rootDir>/node_modules/source-map-support",
+ "<rootDir>/node_modules/inspect-react-element",
+ "<rootDir>/node_modules/react-shallow-testutils",
+ "<rootDir>/node_modules/react-addons-test-utils",
  "<rootDir>/node_modules/absolute-path",
  "<rootDir>/node_modules/xtend",
  "<rootDir>/node_modules/jasmine-object-matchers-jest",
@@ -54,15 +57,18 @@
  "babel-core": "^5.8.34",
  "eslint": "^0.19.0",
  "eslint-plugin-react": "^2.1.1",
+ "inspect-react-element": "^1.1.1",
  "jasmine-object-matchers-jest": "^0.1.0",
  "jest-cli": "^0.8.2",
  "jscs": "^2.7.0",
- "react": "^0.13.1",
+ "react": "^0.14.7",
+ "react-addons-test-utils": "^0.14.7",
  "source-map-support": "^0.2.10",
  "watchy": "^0.6.4",
  "xtend": "^4.0.0"
  },
  "dependencies": {
- "is-promise": "^2.0.0"
+ "is-promise": "^2.0.0",
+ "jest-cli": "^0.9.0-fb2"
  }
 }

package.json

@@ -1,6 +1,7 @@
 let fs = require('fs')
 let sourceMapSupport = require('source-map-support')
 let absolutePath = require('absolute-path')
+let inspectReactElement = require('inspect-react-element')
 let sourceMapPath = require('./sourceMapPath')
 
 sourceMapSupport.install({
@@ -18,7 +19,9 @@ sourceMapSupport.install({
 })
 
 jasmine.getEnv().beforeEach(function() {
+ let React = require.requireActual('react/dist/react-with-addons')
  this.shallowRender = require('./shallowRender')
+ window.printElement = (el) => console.log('\n' + inspectReactElement(el))
 
  jest.setMock('react-native', require.requireActual('../../lib/__mocks__/react-native'))
 
@@ -32,7 +35,13 @@ jasmine.getEnv().beforeEach(function() {
  return typeof this.actual == 'function'
  },
  toBeReactElement() {
- return this.actual && typeof this.actual == 'object' && this.actual._isReactElement
+ return React.isValidElement(this.actual)
+ },
+ toBeReactElementOfType(type) {
+ return (
+ React.isValidElement(this.actual) &&
+ this.actual.type === type
+ )
  },
  })
 })

test/support/setupTestFramework.js

@@ -1,7 +1,6 @@
-var React = require('react/addons')
+var TestUtils = require('react-addons-test-utils')
 
 function shallowRender(element) {
- var {TestUtils} = React.addons
  var shallowRenderer = TestUtils.createRenderer()
 
  // add a method to expose instantiated component