SERVER-49117 Remove storage validation of '$' prefixes in insert and update

1 files changed, 16 insertions, 15 deletions

diff --git a/jstests/core/batch_write_command_insert.js b/jstests/core/batch_write_command_insert.js
index 664ff73958a..c2f7a22ca0c 100644
--- a/jstests/core/batch_write_command_insert.js
+++ b/jstests/core/batch_write_command_insert.js
@@ -8,6 +8,7 @@
 //
 //   # Uses index building in background
 //   requires_background_index,
+//   requires_fcv_50,
 // ]
 //
 //
@@ -97,21 +98,21 @@ assert(resultOK(result), tojson(result));
 assert.eq(1, result.n);
 assert.eq(coll.count(), 1);
 
-//
-// Document with illegal key should fail
-coll.drop();
-request = {
-    insert: coll.getName(),
-    documents: [{$set: {a: 1}}],
-    writeConcern: {w: 1},
-    ordered: false
-};
-result = coll.runCommand(request);
-assert(result.ok, tojson(result));
-assert(result.writeErrors != null);
-assert.eq(1, result.writeErrors.length);
-assert.eq(0, result.n);
-assert.eq(coll.count(), 0);
+var isDotsAndDollarsEnabled = db.adminCommand({getParameter: 1, featureFlagDotsAndDollars: 1})
+                                  .featureFlagDotsAndDollars.value;
+if (!isDotsAndDollarsEnabled) {
+    //
+    // Document with illegal key should fail
+    coll.drop();
+    request =
+        {insert: coll.getName(), documents: [{$set: {a: 1}}], writeConcern: {w: 1}, ordered: false};
+    result = coll.runCommand(request);
+    assert(result.ok, tojson(result));
+    assert(result.writeErrors != null);
+    assert.eq(1, result.writeErrors.length);
+    assert.eq(0, result.n);
+    assert.eq(coll.count(), 0);
+}
 
 //
 // Document with valid nested key should insert (op log format)