From 3098bf72fb301ff3596c12b2c29d4bbcec134089 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 6 Dec 2022 15:02:22 -0300 Subject: [PATCH 01/10] tests: adjusting missing tests --- .../babel-compiler/.npm/package/npm-shrinkwrap.json | 12 ++++++------ tools/tests/shell-tests.js | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index 6b29dfbba0..453a9ea4d2 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -436,9 +436,9 @@ "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==" }, "@meteorjs/babel": { - "version": "7.17.1-beta.0", - "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.17.1-beta.0.tgz", - "integrity": "sha512-ogXjGkuWbH1YwHXX3VOOjonC9aENrijkj0j6NZtDuKBq3pt0nSULvpU5fRjKu1HjgmhRFky6uE4TYa9FtlCKlQ==" + "version": "7.17.2-beta.0", + "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.17.2-beta.0.tgz", + "integrity": "sha512-gFXgGNIUu2mVvLRTtEPRE8OdpbdwDY2+vAOSn4/O//w42n7xKBDuYkiyNQtXCWIVuEjO4UBFkX2CHD88eTKhxA==" }, "@meteorjs/reify": { "version": "0.23.0", @@ -648,9 +648,9 @@ "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==" }, "caniuse-lite": { - "version": "1.0.30001435", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001435.tgz", - "integrity": "sha512-kdCkUTjR+v4YAJelyiDTqiu82BDr4W4CP5sgTA0ZBmqn30XfS2ZghPLMowik9TPhS+psWJiUNxsqLyurDbmutA==" + "version": "1.0.30001436", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001436.tgz", + "integrity": "sha512-ZmWkKsnC2ifEPoWUvSAIGyOYwT+keAaaWPHiQ9DfMqS1t6tfuyFYoWR78TeZtznkEQ64+vGXH9cZrElwR2Mrxg==" }, "chalk": { "version": "2.4.2", diff --git a/tools/tests/shell-tests.js b/tools/tests/shell-tests.js index 037106c245..1db92c6eaa 100644 --- a/tools/tests/shell-tests.js +++ b/tools/tests/shell-tests.js @@ -14,8 +14,8 @@ selftest.define("meteor shell", function () { // First try a simple one-line expression. shell.write("({server:Meteor.isServer})\n"); shell.proc.stdin.end(); - shell.waitSecs(10); - shell.match('{"server":true}'); + shell.waitSecs(20); + shell.match('{server:true}'); shell.expectExit(0); shell = s.run("shell"); From c42eff7141e9f51f707a9eb195beccc872e0523e Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 6 Dec 2022 15:57:32 -0300 Subject: [PATCH 02/10] tests: changed a little bit --- packages/babel-compiler/.npm/package/npm-shrinkwrap.json | 6 +++--- tools/tests/shell-tests.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index 453a9ea4d2..248dfa3f33 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -436,9 +436,9 @@ "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==" }, "@meteorjs/babel": { - "version": "7.17.2-beta.0", - "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.17.2-beta.0.tgz", - "integrity": "sha512-gFXgGNIUu2mVvLRTtEPRE8OdpbdwDY2+vAOSn4/O//w42n7xKBDuYkiyNQtXCWIVuEjO4UBFkX2CHD88eTKhxA==" + "version": "7.17.1-beta.0", + "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.17.1-beta.0.tgz", + "integrity": "sha512-ogXjGkuWbH1YwHXX3VOOjonC9aENrijkj0j6NZtDuKBq3pt0nSULvpU5fRjKu1HjgmhRFky6uE4TYa9FtlCKlQ==" }, "@meteorjs/reify": { "version": "0.23.0", diff --git a/tools/tests/shell-tests.js b/tools/tests/shell-tests.js index 1db92c6eaa..7b4c1a05e1 100644 --- a/tools/tests/shell-tests.js +++ b/tools/tests/shell-tests.js @@ -12,10 +12,10 @@ selftest.define("meteor shell", function () { var shell = s.run("shell"); // First try a simple one-line expression. - shell.write("({server:Meteor.isServer})\n"); + shell.write("{server:Meteor.isServer}\n"); + shell.match('{server:true}'); shell.proc.stdin.end(); shell.waitSecs(20); - shell.match('{server:true}'); shell.expectExit(0); shell = s.run("shell"); From 11b0d0a8f8f20ad75147cb8a9ebed702175b7b9c Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 6 Dec 2022 16:23:22 -0300 Subject: [PATCH 03/10] Revert "tests: changed a little bit" This reverts commit c42eff7141e9f51f707a9eb195beccc872e0523e. --- packages/babel-compiler/.npm/package/npm-shrinkwrap.json | 6 +++--- tools/tests/shell-tests.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index 248dfa3f33..453a9ea4d2 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -436,9 +436,9 @@ "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==" }, "@meteorjs/babel": { - "version": "7.17.1-beta.0", - "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.17.1-beta.0.tgz", - "integrity": "sha512-ogXjGkuWbH1YwHXX3VOOjonC9aENrijkj0j6NZtDuKBq3pt0nSULvpU5fRjKu1HjgmhRFky6uE4TYa9FtlCKlQ==" + "version": "7.17.2-beta.0", + "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.17.2-beta.0.tgz", + "integrity": "sha512-gFXgGNIUu2mVvLRTtEPRE8OdpbdwDY2+vAOSn4/O//w42n7xKBDuYkiyNQtXCWIVuEjO4UBFkX2CHD88eTKhxA==" }, "@meteorjs/reify": { "version": "0.23.0", diff --git a/tools/tests/shell-tests.js b/tools/tests/shell-tests.js index 7b4c1a05e1..1db92c6eaa 100644 --- a/tools/tests/shell-tests.js +++ b/tools/tests/shell-tests.js @@ -12,10 +12,10 @@ selftest.define("meteor shell", function () { var shell = s.run("shell"); // First try a simple one-line expression. - shell.write("{server:Meteor.isServer}\n"); - shell.match('{server:true}'); + shell.write("({server:Meteor.isServer})\n"); shell.proc.stdin.end(); shell.waitSecs(20); + shell.match('{server:true}'); shell.expectExit(0); shell = s.run("shell"); From 810e55be4be0200799b07eef83cd6f63fb260bff Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 6 Dec 2022 16:23:48 -0300 Subject: [PATCH 04/10] tests: twerked a little bit more --- tools/tests/shell-tests.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/tests/shell-tests.js b/tools/tests/shell-tests.js index 1db92c6eaa..7b4c1a05e1 100644 --- a/tools/tests/shell-tests.js +++ b/tools/tests/shell-tests.js @@ -12,10 +12,10 @@ selftest.define("meteor shell", function () { var shell = s.run("shell"); // First try a simple one-line expression. - shell.write("({server:Meteor.isServer})\n"); + shell.write("{server:Meteor.isServer}\n"); + shell.match('{server:true}'); shell.proc.stdin.end(); shell.waitSecs(20); - shell.match('{server:true}'); shell.expectExit(0); shell = s.run("shell"); From cf818aa33a2a3e05328477954631c73795923f6e Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 6 Dec 2022 17:18:56 -0300 Subject: [PATCH 05/10] tests: tried solving test again --- tools/tests/shell-tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/shell-tests.js b/tools/tests/shell-tests.js index 7b4c1a05e1..e86b5c850e 100644 --- a/tools/tests/shell-tests.js +++ b/tools/tests/shell-tests.js @@ -13,7 +13,7 @@ selftest.define("meteor shell", function () { var shell = s.run("shell"); // First try a simple one-line expression. shell.write("{server:Meteor.isServer}\n"); - shell.match('{server:true}'); + shell.match('{ server: true }'); shell.proc.stdin.end(); shell.waitSecs(20); shell.expectExit(0); From 1b87c1f892b93e8e2aac3e2e070f3df24044ae79 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 6 Dec 2022 17:34:21 -0300 Subject: [PATCH 06/10] chore: updated version --- packages/babel-compiler/.npm/package/npm-shrinkwrap.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index 453a9ea4d2..248dfa3f33 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -436,9 +436,9 @@ "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==" }, "@meteorjs/babel": { - "version": "7.17.2-beta.0", - "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.17.2-beta.0.tgz", - "integrity": "sha512-gFXgGNIUu2mVvLRTtEPRE8OdpbdwDY2+vAOSn4/O//w42n7xKBDuYkiyNQtXCWIVuEjO4UBFkX2CHD88eTKhxA==" + "version": "7.17.1-beta.0", + "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.17.1-beta.0.tgz", + "integrity": "sha512-ogXjGkuWbH1YwHXX3VOOjonC9aENrijkj0j6NZtDuKBq3pt0nSULvpU5fRjKu1HjgmhRFky6uE4TYa9FtlCKlQ==" }, "@meteorjs/reify": { "version": "0.23.0", From 037d68615c60eb794cbe7e5dd8ab8c6e96b79177 Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 6 Dec 2022 17:53:47 -0300 Subject: [PATCH 07/10] tests: tried again --- tools/tests/shell-tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tests/shell-tests.js b/tools/tests/shell-tests.js index e86b5c850e..e227420589 100644 --- a/tools/tests/shell-tests.js +++ b/tools/tests/shell-tests.js @@ -13,9 +13,9 @@ selftest.define("meteor shell", function () { var shell = s.run("shell"); // First try a simple one-line expression. shell.write("{server:Meteor.isServer}\n"); - shell.match('{ server: true }'); shell.proc.stdin.end(); shell.waitSecs(20); + shell.match('{ server: true }'); shell.expectExit(0); shell = s.run("shell"); From a720c329c4b4229f2c34f0a87a8d3436956fb70a Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 6 Dec 2022 21:38:59 -0300 Subject: [PATCH 08/10] chore: updated shrink json --- packages/babel-compiler/.npm/package/npm-shrinkwrap.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json index 248dfa3f33..453a9ea4d2 100644 --- a/packages/babel-compiler/.npm/package/npm-shrinkwrap.json +++ b/packages/babel-compiler/.npm/package/npm-shrinkwrap.json @@ -436,9 +436,9 @@ "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==" }, "@meteorjs/babel": { - "version": "7.17.1-beta.0", - "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.17.1-beta.0.tgz", - "integrity": "sha512-ogXjGkuWbH1YwHXX3VOOjonC9aENrijkj0j6NZtDuKBq3pt0nSULvpU5fRjKu1HjgmhRFky6uE4TYa9FtlCKlQ==" + "version": "7.17.2-beta.0", + "resolved": "https://registry.npmjs.org/@meteorjs/babel/-/babel-7.17.2-beta.0.tgz", + "integrity": "sha512-gFXgGNIUu2mVvLRTtEPRE8OdpbdwDY2+vAOSn4/O//w42n7xKBDuYkiyNQtXCWIVuEjO4UBFkX2CHD88eTKhxA==" }, "@meteorjs/reify": { "version": "0.23.0", From 2e1e500dd0cbf89a628b795d57930679fb11467d Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 6 Dec 2022 21:39:10 -0300 Subject: [PATCH 09/10] tests: reverted shell tests --- tools/tests/shell-tests.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/tests/shell-tests.js b/tools/tests/shell-tests.js index e227420589..037106c245 100644 --- a/tools/tests/shell-tests.js +++ b/tools/tests/shell-tests.js @@ -12,10 +12,10 @@ selftest.define("meteor shell", function () { var shell = s.run("shell"); // First try a simple one-line expression. - shell.write("{server:Meteor.isServer}\n"); + shell.write("({server:Meteor.isServer})\n"); shell.proc.stdin.end(); - shell.waitSecs(20); - shell.match('{ server: true }'); + shell.waitSecs(10); + shell.match('{"server":true}'); shell.expectExit(0); shell = s.run("shell"); From 6177dc0fb3c25b7967374a9f622d4f5840036ccc Mon Sep 17 00:00:00 2001 From: Gabriel Grubba Date: Tue, 6 Dec 2022 21:39:41 -0300 Subject: [PATCH 10/10] tests: changed how to create prompt --- tools/cli/commands.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/cli/commands.js b/tools/cli/commands.js index c729511e9c..22ffdebaeb 100644 --- a/tools/cli/commands.js +++ b/tools/cli/commands.js @@ -1,7 +1,5 @@ var main = require('./main.js'); var _ = require('underscore'); -const readline = require('readline') - .createInterface({ input: process.stdin, output: process.stdout }); var files = require('../fs/files'); var deploy = require('../meteor-services/deploy.js'); var buildmessage = require('../utils/buildmessage.js'); @@ -2549,10 +2547,12 @@ main.registerCommand({ /** * * @param question - * @returns {Promise} + * @returns {function(string): Promise} */ -const ask = async (question) => { - return new Promise((resolve, reject) => { +const createPrompt = () => { + const readline = require('readline') + .createInterface({ input: process.stdin, output: process.stdout }); + return async (question) => new Promise((resolve, reject) => { readline.question(question, (answer) => { resolve(answer); }) @@ -2614,6 +2614,7 @@ main.registerCommand({ const setup = async (arg0) => { if (arg0 === undefined) { + const ask = createPrompt(); // the ANSI color chart is here: https://en.wikipedia.org/wiki/ANSI_escape_code#Colors const scaffoldName = await ask(`What is the name of your ${yellow('model')}? `); checkScaffoldName(scaffoldName);