Version v1.3.1 (#73)

* Multiple populates defaulting improved
* Tests now in "tests" instead of "test" folder
* Tests improved to cover more cases of multiple populates
* Travis uses `sudo: false`

Author: prescottprue

.travis.yml

@@ -3,6 +3,8 @@ language: node_js
 node_js:
   - "6"
 
+sudo: false
+
 branches:
   only:
     - master

docs/api/connect.md

@@ -23,8 +23,7 @@ _Data_
 
 ```javascript
 import { connect } from 'react-redux'
-import { firebaseConnect, helpers } from 'react-redux-firebase'
-const { dataToJS } = helpers
+import { firebaseConnect, dataToJS } from 'react-redux-firebase'
 
 // sync /todos from firebase into redux
 const fbWrapped = firebaseConnect([

package.json

@@ -1,17 +1,17 @@
 {
   "name": "react-redux-firebase",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Redux integration for Firebase. Comes with a Higher Order Component for use with React.",
-  "browser": "dist/redux.js",
+  "browser": "dist/react-redux-firebase.js",
   "main": "lib/index.js",
   "module": "es/index.js",
   "jsnext:main": "es/index.js",
   "scripts": {
     "clean": "rimraf dist",
     "lint": "eslint src/** test/**",
     "lint:fix": "npm run lint -- --fix",
-    "test": "mocha -R spec --compilers js:babel-core/register ./test/setup.js ./test/**/*.spec.js",
-    "test:cov": "istanbul cover ./node_modules/mocha/bin/_mocha -- ./test/** --recursive --report lcov --compilers js:babel-register --require babel-polyfill",
+    "test": "mocha -R spec --compilers js:babel-core/register ./tests/setup.js ./test/**/*.spec.js",
+    "test:cov": "istanbul cover ./node_modules/mocha/bin/_mocha -- ./tests/** --recursive --report lcov --compilers js:babel-register --require babel-polyfill",
     "codecov": "cat coverage/*/lcov.info | codecov",
     "build:commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib",
     "build:es": "cross-env BABEL_ENV=es babel src --out-dir es",

src/connect.js

@@ -16,8 +16,7 @@ import { getEventsFromInput, createCallable } from './utils'
  * export default firebaseConnect()(App)
  * @example <caption>Data</caption>
  * import { connect } from 'react-redux'
- * import { firebaseConnect, helpers } from 'react-redux-firebase'
- * const { dataToJS } = helpers
+ * import { firebaseConnect, dataToJS } from 'react-redux-firebase'
  *
  * // sync /todos from firebase into redux
  * const fbWrapped = firebaseConnect([

src/helpers.js

@@ -344,11 +344,8 @@ export const populatedDataToJS = (data, path, populates, notSetValue) => {
         }
       })
     }),
-  (obj, v) => {
-    // combine data from all populates to one object
-    const combined = defaultsDeep(obj, v)
-    return defaultsDeep(combined, dataToJS(data, path))
-  })
+  // combine data from all populates to one object starting with original data
+  (obj, v) => defaultsDeep(v, obj), dataToJS(data, path))
 }
 
 /**