Update race-lib

mrloop · Oct 30, 2021 · 9f12d78 · 9f12d78
1 parent cbf0d63
commit 9f12d78
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 29 deletions.
diff --git a/package.json b/package.json
@@ -20,9 +20,8 @@
     "fuzzy": "^0.1.3",
     "inquirer": "^8.0.0",
     "inquirer-autocomplete-prompt": "^1.0.1",
-    "node-fetch": "^2.6.0",
     "race-fix": "^0.0.2",
-    "race-lib": "^2.0.0",
+    "race-lib": "^3.0.1",
     "table": "^6.0.0"
   },
   "devDependencies": {

diff --git a/prompts.js b/prompts.js
@@ -1,20 +1,11 @@
-import { Event, User, Race } from 'race-lib';
+import { Event, setup } from 'race-lib';
 import inquirer from 'inquirer';
 import fuzzy from 'fuzzy';
 import chalk from 'chalk';
 import { table } from 'table';
 import cheerio from 'cheerio';
-import fetch from 'node-fetch';
-import { injectFixtures } from 'race-fix';
 import prompt from 'inquirer-autocomplete-prompt';
 
-Event.inject('cheerio', cheerio);
-Event.inject('fetch', fetch);
-
-if(process.env.test) {
-  injectFixtures(Event);
-}
-
 export const ui = new inquirer.ui.BottomBar();
 
 inquirer.registerPrompt('autocomplete', prompt);
@@ -91,7 +82,9 @@ const searchEvents = function(answers, input) {
   })
 }
 
-export function selectEvent () {
+export async function selectEvent () {
+  await setup({ cheerio, useFixtures: process.env.test });
+
   return inquirer.prompt({
     message: "what event?",
     name: 'event',
@@ -104,6 +97,6 @@ export function selectEvent () {
       return selectRace(evt);
     });
   }).catch((error) => {
-    console.log(error);
+    console.error(error);
   });
 }
diff --git a/test.js b/test.js
@@ -11,10 +11,10 @@ process.env.test = true;
 
 test('selectEvent', async assert => {
   const result = await run([cliPath], ['CCH Junior Road Race', ENTER], 4000);
-  assert.true(new RegExp('CCH Junior', 'g').test(result));
+  assert.true(new RegExp('CCH Junior', 'g').test(result), result);
 });
 
 test('selectRace', async assert => {
   const result = await run([cliPath], ['CCH Junior Road Race', ENTER, ENTER], 8000);
-  assert.true(new RegExp('Craig Adams', 'g').test(result));
+  assert.true(new RegExp('Craig Adams', 'g').test(result), result);
 });
diff --git a/yarn.lock b/yarn.lock
@@ -725,6 +725,13 @@ cosmiconfig@7.0.1:
     path-type "^4.0.0"
     yaml "^1.10.0"
 
+cross-fetch@3.1.4:
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39"
+  integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ==
+  dependencies:
+    node-fetch "2.6.1"
+
 cross-spawn@^7.0.0, cross-spawn@^7.0.3:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
@@ -956,11 +963,6 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es6-promise@^4.2:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -981,11 +983,16 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-event-target-shim@^5.0, event-target-shim@^5.0.0:
+event-target-shim@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
   integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
 
+event-target-shim@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-6.0.2.tgz#ea5348c3618ee8b62ff1d344f01908ee2b8a2b71"
+  integrity sha512-8q3LsZjRezbFZ2PN+uP+Q7pnHUMmAOziU2vA2OwoFaKIXxlxl38IylhSSgUorWu/rf4er67w0ikBqjBFk/pomA==
+
 execa@5.1.1, execa@^5.0.0, execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -2218,7 +2225,7 @@ new-github-release-url@1.0.0:
   dependencies:
     type-fest "^0.4.1"
 
-node-fetch@^2.6.0:
+node-fetch@2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
   integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
@@ -2559,14 +2566,14 @@ race-fix@^0.0.2:
   resolved "https://registry.yarnpkg.com/race-fix/-/race-fix-0.0.2.tgz#128d9db11bd042c8105cea53d59b70e60dfe060a"
   integrity sha1-Eo2dsRvQQsgQXOpT1Ztw5g3+Bgo=
 
-race-lib@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/race-lib/-/race-lib-2.0.0.tgz#6af2be2b579437e941d0db7dba6913ea5ff51079"
-  integrity sha512-/3k7KGKAiYGrj2Xb7hkcXsd7fZ1jLSLacytP/WuE3bqlG8UUaM75gXFwS01P1hxinfC5dpBnXegnxIgnpQ5Now==
+race-lib@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/race-lib/-/race-lib-3.0.1.tgz#4c71e20d2aea9258a189c30d0d7cdd917551b67d"
+  integrity sha512-wAXrj01ANCv1CSVzhMkfCueizvQMo8SITMOP/j5KfRgb0TF5s9Wd93Wes7ajoMfVNDpTwNsuhiUvihRpV7tFPw==
   dependencies:
     abort-controller "^3.0.0"
-    es6-promise "^4.2"
-    event-target-shim "^5.0"
+    cross-fetch "3.1.4"
+    event-target-shim "^6.0.0"
     serial-fetch "1.0.0"
     uri-js "^4.2"