ff-stream-web

commit 1b0587eb6a1ff84f48335041222579b71e181f2d
parent 4dd661c4ee7e1e53eb6d4ecb8ea3b4c874590be8
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Mon,  9 Feb 2015 23:47:44 +0300

Merge branch 'sdiaz-readme_fix'

Diffstat:
M
README.md
 | 
15
++++++++++-----
M
package.json
 | 
1
-

2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
@@ -40,15 +40,16 @@ utilizing a unidirectional data flow.
 │   ├── /assets/                # Static files which are copied to ./build on compile
 │   ├── /components/            # React components
 │   ├── /constants/             # Enumerations used in action creators and stores
+│   ├── /content/               # Website content (plain HTML or Markdown, Jade, you name it)
 │   ├── /core/                  # Core components (Flux dispatcher, base classes, utilities)
 │   ├── /stores/                # Stores contain the application state and logic
-│   ├── /app.js                 # The application's main file (entry point)
-├── /test/                      # Unit, integration and load tests
-│   ├── /e2e/                   # End-to-end tests
-│   ├── /benchmark/             # Load and stress testing
-│   └── /unit/                  # Unit tests
+│   ├── /styles/                # CSS styles (deprecated, put CSS into components' folders)
+│   ├── /templates/             # HTML templates for server-side rendering, emails etc.
+│   ├── /app.js                 # Client-side startup script
+│   └── /server.js              # Server-side startup script
 │── gulpfile.js                 # Configuration file for automated builds
 │── package.json                # The list of 3rd party libraries and utilities
+│── preprocessor.js             # ES6 transpiler settings for [Jest](facebook.github.io/jest/) 
 └── webpack.config.js           # Webpack configuration for bundling and optimization
 ```
 
@@ -112,6 +113,10 @@ Run unit tests powered by [Jest](https://facebook.github.io/jest/) with the foll
 $ npm test
 ```
 
+Test any javascript module by creating a `__tests__/` directory where
+the file is. Name the test by appending `-test.js` to the js file.
+[Jest](https://facebook.github.io/jest/) will do the rest.
+
 ### Learn More
 
  * [Getting Started with React.js](http://facebook.github.io/react/)
diff --git a/package.json b/package.json
@@ -19,7 +19,6 @@
   },
   "devDependencies": {
     "6to5-core": "^3.5.3",
-    "6to5-jest": "^3.0.0",
     "6to5-loader": "^3.0.0",
     "autoprefixer-loader": "^1.1.0",
     "browser-sync": "^2.0.0-rc10",