✅ Move projections test inside getQuery check

The `getQuery` test option is optional, but the projections tests try to run regardless of whether it's set. This change moves it inside the guard for this option.
share · Jun 7, 2024 · 97dc188 · 97dc188
1 parent 7abe650
commit 97dc188
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 39 deletions.
diff --git a/test/client/query.js b/test/client/query.js
@@ -172,5 +172,43 @@ module.exports = function(options) {
         });
       });
     });
+
+    it('snapshot fetch from query does not advance version of doc with pending ops', function(done) {
+      var backend = this.backend;
+      backend.connect(null, null, function(connection1) {
+        backend.connect(null, null, function(connection2) {
+          var doc = connection1.get('dogs', 'fido');
+          var doc2 = connection2.get('dogs', 'fido');
+          doc.create({name: 'kido'}, function(err) {
+            if (err) return done(err);
+            doc2.fetch(function(err) {
+              if (err) return done(err);
+              doc2.submitOp({p: ['name', 0], si: 'f'}, function(err) {
+                if (err) return done(err);
+                expect(doc2.data).eql({name: 'fkido'});
+                doc.connection.createFetchQuery('dogs', {}, null, function(err) {
+                  if (err) return done(err);
+                  doc.resume();
+                });
+              });
+            });
+          });
+          process.nextTick(function() {
+            doc.pause();
+            doc.submitOp({p: ['name', 0], sd: 'k'}, function(err) {
+              if (err) return done(err);
+              doc.pause();
+              doc2.fetch(function(err) {
+                if (err) return done(err);
+                expect(doc2.version).equal(3);
+                expect(doc2.data).eql({name: 'fido'});
+                done();
+              });
+            });
+            doc.del();
+          });
+        });
+      });
+    });
   });
 };
diff --git a/test/client/submit.js b/test/client/submit.js
@@ -898,44 +898,6 @@ module.exports = function() {
       });
     });
 
-    it('snapshot fetch from query does not advance version of doc with pending ops', function(done) {
-      var backend = this.backend;
-      backend.connect(null, null, function(connection1) {
-        backend.connect(null, null, function(connection2) {
-          var doc = connection1.get('dogs', 'fido');
-          var doc2 = connection2.get('dogs', 'fido');
-          doc.create({name: 'kido'}, function(err) {
-            if (err) return done(err);
-            doc2.fetch(function(err) {
-              if (err) return done(err);
-              doc2.submitOp({p: ['name', 0], si: 'f'}, function(err) {
-                if (err) return done(err);
-                expect(doc2.data).eql({name: 'fkido'});
-                doc.connection.createFetchQuery('dogs', {}, null, function(err) {
-                  if (err) return done(err);
-                  doc.resume();
-                });
-              });
-            });
-          });
-          process.nextTick(function() {
-            doc.pause();
-            doc.submitOp({p: ['name', 0], sd: 'k'}, function(err) {
-              if (err) return done(err);
-              doc.pause();
-              doc2.fetch(function(err) {
-                if (err) return done(err);
-                expect(doc2.version).equal(3);
-                expect(doc2.data).eql({name: 'fido'});
-                done();
-              });
-            });
-            doc.del();
-          });
-        });
-      });
-    });
-
     it('passing an error in submit middleware rejects a create and calls back with the erorr', function(done) {
       this.backend.use('submit', function(request, next) {
         next({message: 'Custom error'});

diff --git a/test/db.js b/test/db.js
@@ -61,9 +61,9 @@ module.exports = function(options) {
     if (options.getQuery) {
       require('./client/query-subscribe')({getQuery: options.getQuery});
       require('./client/query')({getQuery: options.getQuery});
+      require('./client/projections')({getQuery: options.getQuery});
     }
 
-    require('./client/projections')({getQuery: options.getQuery});
     require('./client/submit')();
     require('./client/submit-json1')();
     require('./client/subscribe')();