Merge pull request #217 from neo4j/1.2-no-null-bookmark

Ignore null bookmarks in transaction

Author: Zhen Li

src/v1/session.js

@@ -86,17 +86,15 @@ class Session {
    *
    * While a transaction is open the session cannot be used to run statements outside the transaction.
    *
-   * @param {string} bookmark - a reference to a previous transaction. DEPRECATED: This function is deprecated in
+   * @param {string} bookmark - a reference to a previous transaction. DEPRECATED: This parameter is deprecated in
    * favour of {@link Driver#session(string)} that accepts an initial bookmark. Session will ensure that all nested
    * transactions are chained with bookmarks to guarantee causal consistency.
    * @returns {Transaction} - New Transaction
    */
   beginTransaction(bookmark) {
     if (bookmark) {
       assertString(bookmark, 'Bookmark');
-    }
-    if (typeof bookmark !== 'undefined') {
-      this._lastBookmark = bookmark;
+      this._updateBookmark(bookmark);
     }
 
     if (this._hasTx) {

test/resources/boltkit/write_read_tx_with_bookmark_override.script.mst renamed to test/resources/boltkit/write_read_tx_with_bookmark_override.script

@@ -14,7 +14,7 @@ C: RUN "COMMIT" {}
    PULL_ALL
 S: SUCCESS {}
    SUCCESS {}
-C: RUN "BEGIN" {{{bookmarkOverride}}}
+C: RUN "BEGIN" {"bookmark": "BookmarkOverride"}
    PULL_ALL
 S: SUCCESS {}
    SUCCESS {}

test/v1/direct.driver.boltkit.it.js

@@ -160,24 +160,57 @@ describe('direct driver', () => {
   });
 
   it('should be possible to override bookmark', done => {
-    testBookmarkOverride('BookmarkOverride', done);
-  });
+    if (!boltkit.BoltKitSupport) {
+      done();
+      return;
+    }
+
+    const kit = new boltkit.BoltKit();
+    const server = kit.start('./test/resources/boltkit/write_read_tx_with_bookmark_override.script', 9001);
+
+    kit.run(() => {
+      const driver = createDriver();
+      const session = driver.session(WRITE, 'BookmarkA');
+      const writeTx = session.beginTransaction();
+      writeTx.run('CREATE (n {name:\'Bob\'})').then(result => {
+        const records = result.records;
+        expect(records.length).toEqual(0);
+
+        writeTx.commit().then(() => {
+          expect(session.lastBookmark()).toEqual('BookmarkB');
+
+          const readTx = session.beginTransaction('BookmarkOverride');
+          readTx.run('MATCH (n) RETURN n.name AS name').then(result => {
+            const records = result.records;
+            expect(records.length).toEqual(1);
+            expect(records[0].get('name')).toEqual('Bob');
+
+            readTx.commit().then(() => {
+              expect(session.lastBookmark()).toEqual('BookmarkC');
+
+              session.close(() => {
+                driver.close();
+                server.exit(code => {
+                  expect(code).toEqual(0);
+                  done();
+                });
+              });
+            });
+          });
+        });
+      });
+    });
 
-  it('should be possible to override bookmark with null', done => {
-    testBookmarkOverride(null, done);
   });
 
-  function testBookmarkOverride(bookmarkOverride, done) {
+  it('should not be possible to override bookmark with null', done => {
     if (!boltkit.BoltKitSupport) {
       done();
       return;
     }
 
     const kit = new boltkit.BoltKit();
-    const bookmarkScriptValue = bookmarkOverride ? JSON.stringify({bookmark: bookmarkOverride}) : '{}';
-    const params = {bookmarkOverride: bookmarkScriptValue};
-    const server = kit.startWithTemplate(
-      './test/resources/boltkit/write_read_tx_with_bookmark_override.script.mst', params, 9001);
+    const server = kit.start('./test/resources/boltkit/write_read_tx_with_bookmarks.script', 9001);
 
     kit.run(() => {
       const driver = createDriver();
@@ -190,7 +223,7 @@ describe('direct driver', () => {
         writeTx.commit().then(() => {
           expect(session.lastBookmark()).toEqual('BookmarkB');
 
-          const readTx = session.beginTransaction(bookmarkOverride);
+          const readTx = session.beginTransaction(null);
           readTx.run('MATCH (n) RETURN n.name AS name').then(result => {
             const records = result.records;
             expect(records.length).toEqual(1);
@@ -211,8 +244,7 @@ describe('direct driver', () => {
         });
       });
     });
-  }
-
+  });
 });
 
 function createDriver() {