SERVER-74787 Prepare jstest corpus for implicit strict mode

7 files changed, 21 insertions, 19 deletions

diff --git a/jstests/core/ddl/bad_index_plugin.js b/jstests/core/ddl/bad_index_plugin.js
index c9cd549cc03..cb52ef0c1ab 100644
--- a/jstests/core/ddl/bad_index_plugin.js
+++ b/jstests/core/ddl/bad_index_plugin.js
@@ -1,5 +1,5 @@
 // SERVER-5826 ensure you can't build an index with a non-existent plugin
-t = db.bad_index_plugin;
+let t = db.bad_index_plugin;
 
 assert.commandWorked(t.createIndex({good: 1}));
 assert.eq(t.getIndexes().length, 2);  // good + _id
diff --git a/jstests/core/ddl/capped_convertToCapped1.js b/jstests/core/ddl/capped_convertToCapped1.js
index 137705c8661..4f51edc6c24 100644
--- a/jstests/core/ddl/capped_convertToCapped1.js
+++ b/jstests/core/ddl/capped_convertToCapped1.js
@@ -17,21 +17,21 @@
  * ]
  */
 
-source = db.capped_convertToCapped1;
-dest = db.capped_convertToCapped1_clone;
+let source = db.capped_convertToCapped1;
+let dest = db.capped_convertToCapped1_clone;
 
 source.drop();
 dest.drop();
 
-N = 1000;
+let N = 1000;
 
-for (i = 0; i < N; ++i) {
+for (let i = 0; i < N; ++i) {
     source.save({i: i});
 }
 assert.eq(N, source.count());
 
 // should all fit
-res = db.runCommand(
+let res = db.runCommand(
     {cloneCollectionAsCapped: source.getName(), toCollection: dest.getName(), size: 100000});
 assert.commandWorked(res);
 assert.eq(source.count(), dest.count());
diff --git a/jstests/core/ddl/create_indexes.js b/jstests/core/ddl/create_indexes.js
index 64598838466..3ab29ffb6a4 100644
--- a/jstests/core/ddl/create_indexes.js
+++ b/jstests/core/ddl/create_indexes.js
@@ -6,12 +6,13 @@
  */
 (function() {
 'use strict';
+load("jstests/libs/fixture_helpers.js");
 
 const kUnknownIDLFieldError = 40415;
-const isMongos = ("isdbgrid" == db.runCommand("hello").msg);
+const runningOnMongos = FixtureHelpers.isMongos(db);
 
 const extractResult = function(obj) {
-    if (!isMongos)
+    if (!runningOnMongos)
         return obj;
 
     // Sample mongos format:
diff --git a/jstests/core/ddl/drop3.js b/jstests/core/ddl/drop3.js
index 78d4872a6c0..7829b9cf310 100644
--- a/jstests/core/ddl/drop3.js
+++ b/jstests/core/ddl/drop3.js
@@ -4,8 +4,8 @@
 //   does_not_support_causal_consistency,
 // ]
 
-t = db.jstests_drop3;
-sub = t.sub;
+let t = db.jstests_drop3;
+let sub = t.sub;
 
 t.drop();
 sub.drop();
diff --git a/jstests/core/ddl/drop_index.js b/jstests/core/ddl/drop_index.js
index 3f3e815d47d..ed11b3a5e46 100644
--- a/jstests/core/ddl/drop_index.js
+++ b/jstests/core/ddl/drop_index.js
@@ -3,6 +3,7 @@
 // @tags: [assumes_no_implicit_index_creation]
 (function() {
 'use strict';
+load("jstests/libs/fixture_helpers.js");
 
 const t = db.drop_index;
 t.drop();
@@ -51,7 +52,7 @@ assertIndexes(['b_1', 'c_1', 'd_1', 'e_1'], 'dropping {a: 1} by name');
 assert.commandWorked(t.dropIndex({b: 1}));
 assertIndexes(['c_1', 'd_1', 'e_1'], 'dropping {b: 1} by key pattern');
 
-const isMongos = assert.commandWorked(db.runCommand("hello")).msg === "isdbgrid";
+const runningOnMongos = FixtureHelpers.isMongos(db);
 
 // Not allowed to drop _id index.
 for (const dropIndexArg of ['_id_', {_id: 1}]) {
@@ -59,7 +60,7 @@ for (const dropIndexArg of ['_id_', {_id: 1}]) {
     jsTestLog(`Reply to dropIndexes with arg ${tojson(dropIndexArg)}: ${tojson(dropIdIndexReply)}`);
     assert.commandFailedWithCode(dropIdIndexReply, ErrorCodes.InvalidOptions);
     assert(dropIdIndexReply.hasOwnProperty('errmsg'));
-    if (isMongos) {
+    if (runningOnMongos) {
         assert(dropIdIndexReply.hasOwnProperty('raw'));
     }
 }
diff --git a/jstests/core/ddl/rename_collection_capped.js b/jstests/core/ddl/rename_collection_capped.js
index 670e5ce611b..e0eb2efa9c3 100644
--- a/jstests/core/ddl/rename_collection_capped.js
+++ b/jstests/core/ddl/rename_collection_capped.js
@@ -13,9 +13,9 @@
  * ]
  */
 
-a = db.jstests_rename_a;
-b = db.jstests_rename_b;
-c = db.jstests_rename_c;
+let a = db.jstests_rename_a;
+let b = db.jstests_rename_b;
+let c = db.jstests_rename_c;
 
 a.drop();
 b.drop();
@@ -26,14 +26,14 @@ c.drop();
 // note we use floats to make sure numbers are represented as doubles for SpiderMonkey, since test
 // relies on record size
 db.createCollection("jstests_rename_a", {capped: true, size: 10000});
-for (i = 0.1; i < 10; ++i) {
+for (let i = 0.1; i < 10; ++i) {
     a.save({i: i});
 }
 assert.commandWorked(
     db.adminCommand({renameCollection: "test.jstests_rename_a", to: "test.jstests_rename_b"}));
 assert.eq(1, b.countDocuments({i: 9.1}));
 printjson(b.stats());
-for (i = 10.1; i < 1000; ++i) {
+for (var i = 10.1; i < 1000; ++i) {
     b.save({i: i});
 }
 printjson(b.stats());
diff --git a/jstests/core/ddl/rename_collection_staytemp.js b/jstests/core/ddl/rename_collection_staytemp.js
index 5db125f1a23..5107b399627 100644
--- a/jstests/core/ddl/rename_collection_staytemp.js
+++ b/jstests/core/ddl/rename_collection_staytemp.js
@@ -12,8 +12,8 @@
  * ]
  */
 
-orig = 'rename_stayTemp_orig';
-dest = 'rename_stayTemp_dest';
+let orig = 'rename_stayTemp_orig';
+let dest = 'rename_stayTemp_dest';
 
 db[orig].drop();
 db[dest].drop();