Finish porting examples

Author: gaearon

examples/async/favicon.ico

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "devDependencies": {
-    "react-scripts": "0.4.0",
+    "react-scripts": "^0.4.0",
     "redux-logger": "^2.6.1"
   },
   "dependencies": {
@@ -16,8 +16,7 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "eject": "react-scripts eject",
-    "test": "react-scripts test"
+    "eject": "react-scripts eject"
   },
   "eslintConfig": {
     "extends": "./node_modules/react-scripts/config/eslint.js"

examples/async/package.json

@@ -10,20 +10,27 @@ var exampleDirs = fs.readdirSync(__dirname).filter((file) => {
   return fs.statSync(path.join(__dirname, file)).isDirectory()
 })
 
-for (const dir of exampleDirs) {
-  // declare opts in this scope to avoid https://github.com/joyent/node/issues/9158
-  const opts = {
-    cwd: path.join(__dirname, dir),
-    stdio: 'inherit'
-  }
+// Ordering is important here. `npm install` must come first.
+var cmdArgs = [
+  { cmd: 'npm', args: [ 'install' ] },
+  { cmd: 'webpack', args: [ 'index.js' ] }
+]
 
-  let result = {}
-  if (process.platform === 'win32') {
-    result = spawnSync('npm.cmd', [ 'install' ], opts)
-  } else {
-    result = spawnSync('npm', [ 'install' ], opts)
-  }
-  if (result.status !== 0) {
-    throw new Error('Building examples exited with non-zero')
+for (const dir of exampleDirs) {
+  for (const cmdArg of cmdArgs) {
+    // declare opts in this scope to avoid https://github.com/joyent/node/issues/9158
+    const opts = {
+      cwd: path.join(__dirname, dir),
+      stdio: 'inherit'
+    }
+    let result = {}
+    if (process.platform === 'win32') {
+      result = spawnSync(cmdArg.cmd + '.cmd', cmdArg.args, opts)
+    } else {
+      result = spawnSync(cmdArg.cmd, cmdArg.args, opts)
+    }
+    if (result.status !== 0) {
+      throw new Error('Building examples exited with non-zero')
+    }
   }
 }

examples/buildAll.js

@@ -5,7 +5,7 @@
   "devDependencies": {
     "enzyme": "^2.4.1",
     "react-addons-test-utils": "^15.3.0",
-    "react-scripts": "0.4.0"
+    "react-scripts": "^0.4.0"
   },
   "dependencies": {
     "react": "^15.3.0",

examples/counter/favicon.ico

@@ -1,12 +1,11 @@
-import expect from 'expect'
 import React from 'react'
 import { shallow } from 'enzyme'
 import Counter from './Counter'
 
 function setup(value = 0) {
   const actions = {
-    onIncrement: expect.createSpy(),
-    onDecrement: expect.createSpy()
+    onIncrement: jest.fn(),
+    onDecrement: jest.fn()
   }
   const component = shallow(
     <Counter value={value} {...actions} />
@@ -29,38 +28,38 @@ describe('Counter component', () => {
   it('first button should call onIncrement', () => {
     const { buttons, actions } = setup()
     buttons.at(0).simulate('click')
-    expect(actions.onIncrement).toHaveBeenCalled()
+    expect(actions.onIncrement).toBeCalled()
   })
 
   it('second button should call onDecrement', () => {
     const { buttons, actions } = setup()
     buttons.at(1).simulate('click')
-    expect(actions.onDecrement).toHaveBeenCalled()
+    expect(actions.onDecrement).toBeCalled()
   })
 
   it('third button should not call onIncrement if the counter is even', () => {
     const { buttons, actions } = setup(42)
     buttons.at(2).simulate('click')
-    expect(actions.onIncrement).toNotHaveBeenCalled()
+    expect(actions.onIncrement).not.toBeCalled()
   })
 
   it('third button should call onIncrement if the counter is odd', () => {
     const { buttons, actions } = setup(43)
     buttons.at(2).simulate('click')
-    expect(actions.onIncrement).toHaveBeenCalled()
+    expect(actions.onIncrement).toBeCalled()
   })
 
   it('third button should call onIncrement if the counter is odd and negative', () => {
     const { buttons, actions } = setup(-43)
     buttons.at(2).simulate('click')
-    expect(actions.onIncrement).toHaveBeenCalled()
+    expect(actions.onIncrement).toBeCalled()
   })
 
   it('fourth button should call onIncrement in a second', (done) => {
     const { buttons, actions } = setup()
     buttons.at(3).simulate('click')
     setTimeout(() => {
-      expect(actions.onIncrement).toHaveBeenCalled()
+      expect(actions.onIncrement).toBeCalled()
       done()
     }, 1000)
   })

examples/counter/package.json

@@ -1,4 +1,3 @@
-import expect from 'expect'
 import counter from './index'
 
 describe('reducers', () => {

examples/counter/src/components/Counter.spec.js

@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "devDependencies": {
-    "react-scripts": "0.4.0",
+    "react-scripts": "^0.4.0",
     "redux-devtools": "^3.3.1",
     "redux-devtools-dock-monitor": "^1.1.1",
     "redux-devtools-log-monitor": "^1.0.11",
@@ -23,8 +23,7 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "eject": "react-scripts eject",
-    "test": "react-scripts test"
+    "eject": "react-scripts eject"
   },
   "eslintConfig": {
     "extends": "./node_modules/react-scripts/config/eslint.js"