WIP: fix merge conflicts

Author: jsayol

src/database/core/PersistentConnection.ts

@@ -817,7 +817,7 @@ export class PersistentConnection extends ServerActions {
     // Puts depend on having received the corresponding data update from the server before they complete, so we must
     // make sure to send listens before puts.
     forEach(this.listens_, (pathString: string, queries: Object) => {
-      forEach(queries, function (key: string, listenSpec: ListenSpec) {
+      forEach(queries, (key: string, listenSpec: ListenSpec) => {
         this.sendListen_(listenSpec);
       });
     });

src/database/core/Repo_transaction.ts

@@ -55,8 +55,7 @@ export enum TransactionStatus {
  * @const
  * @private
  */
-const MAX_TRANSACTION_RETRIES_ = 25;
-
+(Repo as any).MAX_TRANSACTION_RETRIES_ = 25;
 
 /**
  * @typedef {{
@@ -401,7 +400,7 @@ Repo.prototype.startTransaction = function (path: Path,
       abortReason = transaction.abortReason;
       events = events.concat(this.serverSyncTree_.ackUserWrite(transaction.currentWriteId, true));
     } else if (transaction.status === TransactionStatus.RUN) {
-      if (transaction.retryCount >= MAX_TRANSACTION_RETRIES_) {
+      if (transaction.retryCount >= (Repo as any).MAX_TRANSACTION_RETRIES_) {
         abortTransaction = true;
         abortReason = 'maxretry';
         events = events.concat(this.serverSyncTree_.ackUserWrite(transaction.currentWriteId, true));

tests/database/helpers/util.ts

@@ -188,13 +188,16 @@ export function getSnap(path) {
   path.once('value', callback);
   return snap;
 }
+
 export function getVal(path) {
   const snap = getSnap(path);
   return snap ? snap.val() : undefined;
 }
+
 export function canCreateExtraConnections() {
   return globalScope.MozWebSocket || globalScope.WebSocket;
 }
+
 export function buildObjFromKey(key) {
   const keys = key.split('.');
   const obj = {};
@@ -206,10 +209,11 @@ export function buildObjFromKey(key) {
   }
   return obj;
 }
+
 export function testRepoInfo(url) {
-  const regex = /https:\/\/(.*).firebaseio.com/;
+  const regex = /https?:\/\/(.*).firebaseio.com/;
   const match = url.match(regex);
   if (!match) throw new Error('Couldnt get Namespace from passed URL');
   const [,ns] = match;
-  return new ConnectionTarget(`${ns}.firebaseio.com`, false, ns, false);
+  return new ConnectionTarget(`${ns}.firebaseio.com`, true, ns, false);
 }

tests/database/repoinfo.test.ts

@@ -16,10 +16,10 @@ describe('RepoInfo', function() {
     urlParams[VERSION_PARAM] = PROTOCOL_VERSION;
     urlParams[LAST_SESSION_PARAM] = 'test';
 
-    const websocketUrl = repoInfo.connectionURL(CONSTANTS.WEBSOCKET, urlParams);
+    const websocketUrl = repoInfo.connectionURL(WEBSOCKET, urlParams);
     expect(websocketUrl).to.equal('wss://test-ns.firebaseio.com/.ws?v=5&ls=test');
 
-    const longPollingUrl = repoInfo.connectionURL(CONSTANTS.LONG_POLLING, urlParams);
+    const longPollingUrl = repoInfo.connectionURL(LONG_POLLING, urlParams);
     expect(longPollingUrl).to.equal('https://test-ns.firebaseio.com/.lp?v=5&ls=test');
   });
 });