spec sync and unskip now passing spec tests

mongodb · Feb 11, 2022 · 182caa1 · 182caa1
1 parent 15127fe
commit 182caa1
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/test/spec/uri-options/connection-options.json b/test/spec/uri-options/connection-options.json
@@ -135,7 +135,8 @@
       "valid": false,
       "warning": false,
       "hosts": null,
-      "auth": null
+      "auth": null,
+      "options": {}
     },
     {
       "description": "directConnection=false",
@@ -179,6 +180,18 @@
         "loadBalanced": true
       }
     },
+    {
+      "description": "loadBalanced=true with directConnection=false",
+      "uri": "mongodb://example.com/?loadBalanced=true&directConnection=false",
+      "valid": true,
+      "warning": false,
+      "hosts": null,
+      "auth": null,
+      "options": {
+        "loadBalanced": true,
+        "directConnection": false
+      }
+    },
     {
       "description": "loadBalanced=false",
       "uri": "mongodb://example.com/?loadBalanced=false",
@@ -217,15 +230,6 @@
       "auth": null,
       "options": {}
     },
-    {
-      "description": "loadBalanced=true with directConnection=false causes an error",
-      "uri": "mongodb://example.com/?loadBalanced=true&directConnection=false",
-      "valid": false,
-      "warning": false,
-      "hosts": null,
-      "auth": null,
-      "options": {}
-    },
     {
       "description": "loadBalanced=true with replicaSet causes an error",
       "uri": "mongodb://example.com/?loadBalanced=true&replicaSet=replset",

diff --git a/test/spec/uri-options/connection-options.yml b/test/spec/uri-options/connection-options.yml
@@ -64,7 +64,7 @@ tests:
         hosts: ~
         auth: ~
         options: {}
-    - 
+    -
         description: "Invalid retryWrites causes a warning"
         uri: "mongodb://example.com/?retryWrites=invalid"
         valid: true
@@ -104,7 +104,6 @@ tests:
         hosts: ~
         auth: ~
         options: {}
-
     -
       description: directConnection=true
       uri: "mongodb://example.com/?directConnection=true"
@@ -121,6 +120,7 @@ tests:
       warning: false
       hosts: ~
       auth: ~
+      options: {}
     -
       description: directConnection=false
       uri: "mongodb://example.com/?directConnection=false"
@@ -156,6 +156,16 @@ tests:
       auth: ~
       options:
           loadBalanced: true
+    -
+      description: loadBalanced=true with directConnection=false
+      uri: "mongodb://example.com/?loadBalanced=true&directConnection=false"
+      valid: true
+      warning: false
+      hosts: ~
+      auth: ~
+      options:
+          loadBalanced: true
+          directConnection: false
     -
       description: loadBalanced=false
       uri: "mongodb://example.com/?loadBalanced=false"
@@ -189,14 +199,6 @@ tests:
       hosts: ~
       auth: ~
       options: {}
-    -
-      description: loadBalanced=true with directConnection=false causes an error
-      uri: "mongodb://example.com/?loadBalanced=true&directConnection=false"
-      valid: false
-      warning: false
-      hosts: ~
-      auth: ~
-      options: {}
     -
       description: loadBalanced=true with replicaSet causes an error
       uri: "mongodb://example.com/?loadBalanced=true&replicaSet=replset"

diff --git a/test/unit/assorted/uri_options.spec.test.ts b/test/unit/assorted/uri_options.spec.test.ts
@@ -7,10 +7,6 @@ describe('URI option spec tests', function () {
   const suites = loadSpecTests('uri-options');
 
   const skipTests = [
-    // TODO(NODE-3917): Fix directConnection and loadBalanced option validation
-    'directConnection=true with multiple seeds',
-    'loadBalanced=true with directConnection=false causes an error',
-
     // Skipped because this does not apply to Node
     'Valid options specific to single-threaded drivers are parsed correctly',