Add URL test

terrazzoapp · Jul 14, 2023 · 3812019 · 3812019
1 parent fad5d8d
commit 3812019
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
           node-version: 20
       - uses: pnpm/action-setup@v2
         with:
-          version: latest
+          version: 8
       - run: pnpm i
       - run: pnpm run lint
   test:
@@ -28,7 +28,7 @@ jobs:
           node-version: 20
       - uses: pnpm/action-setup@v2
         with:
-          version: latest
+          version: 8
       - run: pnpm i
       - run: pnpm run build
       - run: pnpm test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,14 +9,13 @@ jobs:
   changelog:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
       - uses: actions/checkout@v3
       - uses: pnpm/action-setup@v2
         with:
-          version: latest
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
+          version: 8
       - run: pnpm i
       - run: pnpm run build
       - uses: changesets/action@v1

diff --git a/packages/cli/bin/cli.js b/packages/cli/bin/cli.js
@@ -65,7 +65,6 @@ async function main() {
   try {
     // if running `co check [tokens]`, don’t load config from file
     if (cmd === 'check' && args[0]) {
-      console.log(args[0]);
       config = await initConfig({tokens: args[0]}, cwd);
     } else {
       config = await loadConfig(resolveConfig(configPath));
@@ -137,8 +136,9 @@ async function main() {
       break;
     }
     case 'check': {
-      console.log(`${UNDERLINE}${fileURLToPath(config.tokens[0])}${RESET}`);
       const rawSchema = await loadTokens(config.tokens);
+      const filepath = config.tokens[0];
+      console.log(`${UNDERLINE}${filepath.protocol === 'file:' ? fileURLToPath(filepath) : filepath}${RESET}`);
       const {errors, warnings} = parse(rawSchema, config); // will throw if errors
       if (errors || warnings) {
         printErrors(errors);
@@ -210,9 +210,10 @@ async function loadTokens(tokenPaths) {
   for (const filepath of tokenPaths) {
     const pathname = filepath.pathname.toLowerCase();
     const isYAMLExt = pathname.endsWith('.yaml') || pathname.endsWith('.yml');
-    if (filepath.protocol === 'url:') {
+    if (filepath.protocol === 'http:' || filepath.protocol === 'https:') {
       try {
-        const raw = await globalThis.fetch(filepath, {method: 'GET', headers: {Accepted: '*/*', 'User-Agent': 'cobalt'}}).then((res) => res.text());
+        const res = await globalThis.fetch(filepath, {method: 'GET', headers: {Accept: '*/*', 'User-Agent': 'Mozilla/5.0 Gecko/20100101 Firefox/116.0'}});
+        const raw = await res.text();
         if (isYAMLExt || res.headers.get('content-type').includes('yaml')) {
           rawTokens.push(yaml.load(raw));
         } else {

diff --git a/packages/cli/test/check.test.js b/packages/cli/test/check.test.js
@@ -17,6 +17,11 @@ describe('co check', () => {
     expect(result.exitCode).toBe(0);
   });
 
+  test('URL', async () => {
+    const result = await execa('node', ['./bin/cli.js', 'check', 'https://raw.githubusercontent.com/drwpow/cobalt-ui/main/packages/cli/test/fixtures/check-default/tokens.json']);
+    expect(result.exitCode).toBe(0);
+  });
+
   test('invalid tokens', async () => {
     const cwd = new URL('./fixtures/check-invalid/', import.meta.url);
     await expect(async () => await execa('node', [cmd, 'check'], {cwd, throwOnStderr: false})).rejects.toThrow();