Remove String prototype pollution in tests

bcaudan · Sep 19, 2020 · 38c3fa1 · 38c3fa1
1 parent 8d08ee4
commit 38c3fa1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 18 deletions.
diff --git a/spec/helpers/before-all.ts b/spec/helpers/before-all.ts
@@ -3,12 +3,15 @@ declare namespace NodeJS {
         SpecReporter;
         DisplayProcessor;
         TestProcessor;
+        colors;
     }
 }
 
 global.SpecReporter = require("../../built/main").SpecReporter;
 global.DisplayProcessor = require("../../built/main").DisplayProcessor;
 global.TestProcessor = require("./test-processor").TestProcessor;
+// tslint:disable-next-line:no-submodule-imports
+global.colors = require("colors/safe");
 
 beforeAll(() => {
     const addMatchers = require("./test-helper").addMatchers;

diff --git a/spec/helpers/test-helper.ts b/spec/helpers/test-helper.ts
@@ -1,14 +1,6 @@
-require("colors");
-
-interface String {
-    stripTime(): string;
-}
-
-// tslint:disable-next-line:no-unbound-method
-String.prototype.stripTime = function(): string {
-    return this.replace(/in (\d+\.?\d*|\.\d+) secs?/, "in {time}") // replace time in summary
+let stripTime = (str: string) =>
+    str.replace(/in (\d+\.?\d*|\.\d+) secs?/, "in {time}") // replace time in summary
         .replace(/\((\d+\.?\d*|\.\d+) secs?\)/, "({time})"); // replace time in specs
-};
 
 let isArray = value => value.toString() === "[object Array]";
 
@@ -69,7 +61,7 @@ const JasmineEnv = {
         logInSummary = false;
         console.log = stuff => {
             if (!options.withColor) {
-                stuff = stuff.stripColors.stripTime();
+                stuff = global.colors.stripColors(stripTime(stuff));
             }
             if (/^(Executed|\*\*\*\*\*\*\*)/.test(stuff)) {
                 logInSummary = true;

diff --git a/spec/unit/colors-display.spec.ts b/spec/unit/colors-display.spec.ts
@@ -21,7 +21,7 @@ describe("with colors", () => {
                     },
                     outputs => {
                         expect(outputs).not.contains("    ✓ successful spec");
-                        expect(outputs).contains("    " + "✓ successful spec".green);
+                        expect(outputs).contains("    " + global.colors.green("✓ successful spec"));
                         done();
                     },
                     { withColor: true }
@@ -40,7 +40,7 @@ describe("with colors", () => {
                     },
                     outputs => {
                         expect(outputs).not.contains("    ✗ failed spec");
-                        expect(outputs).contains("    " + "✗ failed spec".red);
+                        expect(outputs).contains("    " + global.colors.red("✗ failed spec"));
                         done();
                     },
                     { withColor: true }
@@ -59,7 +59,7 @@ describe("with colors", () => {
                     },
                     outputs => {
                         expect(outputs).not.contains("    * pending spec");
-                        expect(outputs).contains("    " + "* pending spec".yellow);
+                        expect(outputs).contains("    " + global.colors.yellow("* pending spec"));
                         done();
                     },
                     { withColor: true }
@@ -94,7 +94,7 @@ describe("with colors", () => {
                         });
                     },
                     outputs => {
-                        expect(outputs).contains("    " + "✓ successful spec".magenta);
+                        expect(outputs).contains("    " + global.colors.magenta("✓ successful spec"));
                         done();
                     },
                     { withColor: true }
@@ -112,7 +112,7 @@ describe("with colors", () => {
                         });
                     },
                     outputs => {
-                        expect(outputs).contains("    " + "✗ failed spec".white);
+                        expect(outputs).contains("    " + global.colors.white("✗ failed spec"));
                         done();
                     },
                     { withColor: true }
@@ -130,7 +130,7 @@ describe("with colors", () => {
                         });
                     },
                     outputs => {
-                        expect(outputs).contains("    " + "* pending spec".blue);
+                        expect(outputs).contains("    " + global.colors.blue("* pending spec"));
                         done();
                     },
                     { withColor: true }

diff --git a/spec/unit/custom-print.spec.ts b/spec/unit/custom-print.spec.ts
@@ -73,7 +73,7 @@ describe("spec reporter", () => {
                         expect(outputs.length).toEqual(0);
                         expect(customOutpouts).contains([
                             "  suite",
-                            "    " + "✓ spec to be started".green
+                            "    " + global.colors.green("✓ spec to be started")
                         ]);
                         done();
                     }