Bug/#140 snapshot whenready (#192)

* bug/record-handler: Fixes #140 * Fix #140 adding test for snapshot ready
deepstreamIO · Jul 28, 2016 · 7e574b2 · 7e574b2
1 parent 45cc40a
commit 7e574b2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/record/record-handler.js b/src/record/record-handler.js
@@ -136,7 +136,7 @@ RecordHandler.prototype.unlisten = function( pattern ) {
  * @public
  */
 RecordHandler.prototype.snapshot = function( name, callback ) {
-	if( this._records[ name ] ) {
+	if( this._records[ name ] && this._records[ name ].isReady ) {
 		callback( null, this._records[ name ].get() );
 	} else {
 		this._snapshotRegistry.request( name, callback );

diff --git a/test-e2e/specs/record-snapshotSpec.js b/test-e2e/specs/record-snapshotSpec.js
@@ -20,7 +20,7 @@ describe( 'record snapshot', function() {
 
 	it( 'creates clientA', function( done ) {
 		clientA = deepstreamClient( 'localhost:6021' );
-		clientA.login( null, function(){ done(); });
+		clientA.login( null, done );
 	});
 
 	 /**************** TEST ****************/
@@ -59,12 +59,23 @@ describe( 'record snapshot', function() {
 				clientA.record.snapshot( 'localRecord', function( error, data ) {
 					expect( error ).toBeNull();
 					expect( data ).toEqual( { key: 'value' } );
-					done();
+					record.on( 'discard', done );
+					record.discard();
 				} );
 			 }, 10 );
 		} );
 	});
 
+	it( 'retrieves remote snapshot if client record is not ready', function( done ){
+		var record = clientA.record.getRecord( 'localRecord' );
+
+		clientA.record.snapshot( 'localRecord', function( error, data ) {
+			expect( error ).toBeNull();
+			expect( data ).toEqual( { key: 'value' } );
+			done();
+		} );
+	});
+
 	/**************** TEAR DOWN ****************/
 	it( 'closes the clients', function() {
 		clientA.close();