From 742fdca9519feb08c3124c4b3ffcdfc46eca2810 Mon Sep 17 00:00:00 2001 From: Slava Kim Date: Mon, 30 Mar 2015 21:06:17 -0700 Subject: [PATCH] Don't wrap the tests and patterns --- tools/selftest.js | 2 +- tools/tests/package-tests.js | 34 ++++++++++++++++------------------ 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/tools/selftest.js b/tools/selftest.js index 059e69ee92..6480961646 100644 --- a/tools/selftest.js +++ b/tools/selftest.js @@ -1778,7 +1778,7 @@ var runTests = function (options) { Console.rawError(" => " + failure.reason + " at " + relpath + ":" + frames[0].line + "\n"); if (failure.reason === 'no-match' || failure.reason === 'junk-before') { - Console.arrowError("Pattern: " + failure.details.pattern, 2); + Console.arrowError("Pattern: " + Console.rawInfo(failure.details.pattern), 2); } if (failure.reason === "wrong-exit-code") { var s = function (status) { diff --git a/tools/tests/package-tests.js b/tools/tests/package-tests.js index 3d4fe70b45..3cc6b932c9 100644 --- a/tools/tests/package-tests.js +++ b/tools/tests/package-tests.js @@ -1088,9 +1088,7 @@ selftest.define("show and search local package", function () { }); var exportStr = - "A, B (server), C (web.browser, web.cordova)," + - " D (web.browser),\n" + " " + - "E (web.cordova), G (server, web.cordova)"; + "A, B (server), C (web.browser, web.cordova), D (web.browser), E (web.cordova), G (server, web.cordova)"; var description = "Test package."; testShowPackage(s, name, { @@ -1141,8 +1139,8 @@ selftest.define("show and search local package", function () { return d.label ? d.name + " (" + d.label + ")" : d.name; }); var impStr = - impArr[0] + ", " + impArr[1] + ",\n" + " " + - impArr[2] + ", " + impArr[3] + ",\n" + " " + + impArr[0] + ", " + impArr[1] + ", " + + impArr[2] + ", " + impArr[3] + ", " + impArr[4] + ", " + impArr[5]; testShowPackage(s, name, { @@ -1217,8 +1215,8 @@ selftest.define("show and search local overrides server", // When we ask for version 1.0.0, we get the local version. var addendum = "This package version is built locally from source. " + - "The same version of this\npackage also exists on the package server. " + - "To view its metadata, run\n'meteor show " + fullPackageName + + "The same version of this package also exists on the package server. " + + "To view its metadata, run 'meteor show " + fullPackageName + "@1.0.0' from outside the project."; testShowPackageVersion(s, { packageName: fullPackageName, @@ -1345,7 +1343,7 @@ selftest.define("show server package", versions.push({ version: "1.0.1", date: today }); var exportStr = "A, B (server), C (web.browser, web.cordova)," + - " D (web.browser),\n" + " " + + " D (web.browser), " + "E (web.cordova), G (server, web.cordova)"; testShowPackage(s, fullPackageName, { @@ -1450,8 +1448,8 @@ selftest.define("show server package", return d.label ? d.name + " (" + d.label + ")" : d.name; }); var impStr = - impArr[0] + ", " + impArr[1] + ",\n" + " " + - impArr[2] + ", " + impArr[3] + ",\n" + " " + + impArr[0] + ", " + impArr[1] + ", " + + impArr[2] + ", " + impArr[3] + ", " + impArr[4] + ", " + impArr[5]; // Implies are also dependencies. @@ -1540,7 +1538,7 @@ selftest.define("show server package", // Neither of these versions should show up. var moreAvailable = "Pre-release and unmigrated versions of " + fullPackageName + - " have been hidden. To see all\n" + "6" + + " have been hidden. To see all " + "6" + " versions, run 'meteor show --show-all " + fullPackageName + "'."; testShowPackage(s, fullPackageName, { summary: newSummary, @@ -1612,7 +1610,7 @@ selftest.define("show rc-only package", // versions are available. var moreAvailable = "One pre-release version of " + fullPackageName + " has been hidden. To see " + - "the hidden\nversion, run 'meteor show --show-all " + fullPackageName + "'."; + "the hidden version, run 'meteor show --show-all " + fullPackageName + "'."; testShowPackage(s, fullPackageName, { maintainers: username, addendum: moreAvailable @@ -1822,7 +1820,7 @@ selftest.define("show release", publishRelease(s, releaseConfig); var moreVersions = "One non-recommended version of " + releaseConfig.track + " has been hidden. " + - "To see all 2\n" + + "To see all 2 " + "versions, run 'meteor show --show-all " + releaseConfig.track + "'."; testShowRelease(s, { name: releaseTrack, @@ -1890,7 +1888,7 @@ selftest.define("show release", }); moreVersions = - "Non-recommended versions of " + releaseConfig.track + " have been hidden. To see all 4\n" + + "Non-recommended versions of " + releaseConfig.track + " have been hidden. To see all 4 " + "versions, run 'meteor show --show-all " + releaseConfig.track + "'."; testShowRelease(s, { name: releaseTrack, @@ -1960,7 +1958,7 @@ selftest.define("show release w/o recommended versions", }); publishRelease(s, releaseConfig); var moreVersions = - "Non-recommended versions of " + releaseConfig.track + " have been hidden. To see all 2\n" + + "Non-recommended versions of " + releaseConfig.track + " have been hidden. To see all 2 " + "versions, run 'meteor show --show-all " + releaseConfig.track + "'."; testShowRelease(s, { @@ -2032,7 +2030,7 @@ selftest.define("show package w/many versions", // Make sure that the right versions show up when the local package is visible. var moreAvailable = "Older versions of " + fullPackageName + " have been hidden. To see " + - "all 9 versions, run\n'meteor show --show-all " + fullPackageName + "'."; + "all 9 versions, run 'meteor show --show-all " + fullPackageName + "'."; testShowPackage(s, fullPackageName, { maintainers: username, summary: "Test package.", @@ -2054,7 +2052,7 @@ selftest.define("show package w/many versions", setVersionAndPublish("2.0.2"); moreAvailable = "Older and pre-release versions of " + fullPackageName + - " have been hidden. To see all 11\n" + + " have been hidden. To see all 11 " + "versions, run 'meteor show --show-all " + fullPackageName + "'."; testShowPackage(s, fullPackageName, { maintainers: username, @@ -2076,7 +2074,7 @@ selftest.define("show package w/many versions", // Make sure that the right versions show up when the local package is NOT visible. var moreAvailable = "Older and pre-release versions of " + fullPackageName + " have been hidden. " + - "To see all 10\nversions, run 'meteor show --show-all " + fullPackageName + "'."; + "To see all 10 versions, run 'meteor show --show-all " + fullPackageName + "'."; testShowPackage(s, fullPackageName, { maintainers: username, summary: "Test package.",