Babel module resolver added to simplify module paths in unit tests. Unit test added for presence.

Author: prescottprue

.babelrc

@@ -18,19 +18,18 @@
   ],
   "env": {
     "es": {
-      "comments": false,
-      "plugins": [
-      ]
+      "comments": false
     },
     "commonjs": {
-      "comments": false,
-      "plugins": [
-      ]
+      "comments": false
     },
     "test": {
       "plugins": [
         "transform-runtime",
-        "transform-async-to-generator"
+        "transform-async-to-generator",
+        ["module-resolver", {
+         "root": ["./src"]
+       }]
       ]
     }
   }

package-lock.json

@@ -71,6 +71,7 @@
     "babel-loader": "^7.1.2",
     "babel-plugin-add-module-exports": "^0.2.1",
     "babel-plugin-lodash": "^3.2.11",
+    "babel-plugin-module-resolver": "^3.1.1",
     "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-plugin-transform-class-properties": "^6.24.0",
     "babel-plugin-transform-export-extensions": "^6.22.0",

package.json

@@ -4,7 +4,8 @@ import { populate } from '../helpers'
 import {
   getLoginMethodAndParams,
   updateProfileOnRTDB,
-  updateProfileOnFirestore
+  updateProfileOnFirestore,
+  setupPresence
 } from '../utils/auth'
 import { promisesForPopulate, getPopulateObjs } from '../utils/populate'
 
@@ -293,68 +294,6 @@ export const createUserProfile = (dispatch, firebase, userData, profile) => {
     })
 }
 
-/**
- * @description Start presence management for a specificed user uid.
- * Presence collection contains a list of users that are online currently.
- * Sessions collection contains a record of all user sessions.
- * This function is called within login functions if enablePresence: true.
- * @param {Function} dispatch - Action dispatch function
- * @param {Object} firebase - Internal firebase object
- * @return {Promise}
- * @private
- */
-const setupPresence = (dispatch, firebase) => {
-  // exit if database does not exist on firebase instance
-  if (!firebase.database || !firebase.database.ServerValue) {
-    return
-  }
-  const ref = firebase.database().ref()
-  const { config: { presence, sessions }, authUid } = firebase._
-  const amOnline = ref.child('.info/connected')
-  const onlineRef = ref
-    .child(
-      isFunction(presence)
-        ? presence(firebase.auth().currentUser, firebase)
-        : presence
-    )
-    .child(authUid)
-  let sessionsRef = isFunction(sessions)
-    ? sessions(firebase.auth().currentUser, firebase)
-    : sessions
-  if (sessionsRef) {
-    sessionsRef = ref.child(sessions)
-  }
-  amOnline.on('value', snapShot => {
-    if (!snapShot.val()) return
-    // user is online
-    if (sessionsRef) {
-      // add session and set disconnect
-      dispatch({ type: actionTypes.SESSION_START, payload: authUid })
-      // add new session to sessions collection
-      const session = sessionsRef.push({
-        startedAt: firebase.database.ServerValue.TIMESTAMP,
-        user: authUid
-      })
-      // Support versions of react-native-firebase that do not have setPriority
-      // on firebase.database.ThenableReference
-      if (isFunction(session.setPriority)) {
-        // set authUid as priority for easy sorting
-        session.setPriority(authUid)
-      }
-      session
-        .child('endedAt')
-        .onDisconnect()
-        .set(firebase.database.ServerValue.TIMESTAMP, () => {
-          dispatch({ type: actionTypes.SESSION_END })
-        })
-    }
-    // add correct session id to user
-    // remove from presence list
-    onlineRef.set(true)
-    onlineRef.onDisconnect().remove()
-  })
-}
-
 /**
  * Auth state change handler. Handles response from firebase's onAuthStateChanged
  * @param {Function} dispatch - Action dispatch function

src/actions/auth.js

@@ -1,5 +1,5 @@
 import { capitalize, isArray, isString, isFunction } from 'lodash'
-import { supportedAuthProviders } from '../constants'
+import { supportedAuthProviders, actionTypes } from '../constants'
 
 /**
  * @description Get correct login method and params order based on provided credentials
@@ -219,3 +219,65 @@ export const updateProfileOnFirestore = (
     : profileRef.update(profileUpdate)
   return profileUpdatePromise.then(() => profileRef.get())
 }
+
+/**
+ * @description Start presence management for a specificed user uid.
+ * Presence collection contains a list of users that are online currently.
+ * Sessions collection contains a record of all user sessions.
+ * This function is called within login functions if enablePresence: true.
+ * @param {Function} dispatch - Action dispatch function
+ * @param {Object} firebase - Internal firebase object
+ * @return {Promise}
+ * @private
+ */
+export function setupPresence(dispatch, firebase) {
+  // exit if database does not exist on firebase instance
+  if (!firebase.database || !firebase.database.ServerValue) {
+    return
+  }
+  const ref = firebase.database().ref()
+  const { config: { presence, sessions }, authUid } = firebase._
+  const amOnline = ref.child('.info/connected')
+  const onlineRef = ref
+    .child(
+      isFunction(presence)
+        ? presence(firebase.auth().currentUser, firebase)
+        : presence
+    )
+    .child(authUid)
+  let sessionsRef = isFunction(sessions)
+    ? sessions(firebase.auth().currentUser, firebase)
+    : sessions
+  if (sessionsRef) {
+    sessionsRef = ref.child(sessions)
+  }
+  amOnline.on('value', snapShot => {
+    if (!snapShot.val()) return
+    // user is online
+    if (sessionsRef) {
+      // add session and set disconnect
+      dispatch({ type: actionTypes.SESSION_START, payload: authUid })
+      // add new session to sessions collection
+      const session = sessionsRef.push({
+        startedAt: firebase.database.ServerValue.TIMESTAMP,
+        user: authUid
+      })
+      // Support versions of react-native-firebase that do not have setPriority
+      // on firebase.database.ThenableReference
+      if (isFunction(session.setPriority)) {
+        // set authUid as priority for easy sorting
+        session.setPriority(authUid)
+      }
+      session
+        .child('endedAt')
+        .onDisconnect()
+        .set(firebase.database.ServerValue.TIMESTAMP, () => {
+          dispatch({ type: actionTypes.SESSION_END })
+        })
+    }
+    // add correct session id to user
+    // remove from presence list
+    onlineRef.set(true)
+    onlineRef.onDisconnect().remove()
+  })
+}

src/utils/auth.js

@@ -16,15 +16,15 @@ import {
   resetPassword,
   confirmPasswordReset,
   verifyPasswordResetCode
-} from '../../../src/actions/auth'
+} from 'actions/auth'
 import { cloneDeep } from 'lodash'
 import { actionTypes } from '../../../src/constants'
 import {
   fakeFirebase,
   onAuthStateChangedSpy,
   firebaseWithConfig
 } from '../../utils'
-// import { promisesForPopulate } from '../../../src/utils/populate'
+// import { promisesForPopulate } from 'utils/populate'
 
 let functionSpy
 let dispatchSpy

test/unit/actions/auth.spec.js

@@ -4,7 +4,7 @@ import {
   watchEvents,
   unWatchEvents,
   remove
-} from '../../../src/actions/query'
+} from 'actions/query'
 import { actionTypes } from '../../../src/constants'
 let spy
 const dispatch = () => {}

test/unit/actions/query.spec.js

@@ -3,7 +3,7 @@ import {
   uploadFile,
   uploadFiles,
   deleteFile
-} from '../../../src/actions/storage'
+} from 'actions/storage'
 import { fakeFirebase } from '../../utils'
 
 let spy

test/unit/actions/storage.spec.js

@@ -214,7 +214,8 @@ describe('enhancer', () => {
 
     describe('uploadFiles', () => {
       it('calls uploadFiles Firebase method', () => {
-        expect(store.firebase.uploadFiles('[email protected]')).to.be.rejected
+        expect(store.firebase.uploadFiles('test', [{ name: 'file1' }])).to.be
+          .rejected
       })
     })
 

test/unit/enhancer.spec.js

@@ -7,9 +7,7 @@ import {
   ProviderMock,
   TestContainer
 } from '../utils'
-import firestoreConnect, {
-  createFirestoreConnect
-} from '../../src/firestoreConnect'
+import firestoreConnect, { createFirestoreConnect } from 'firestoreConnect'
 
 const createContainer = () => {
   const store = storeWithFirestore()