Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: allow CONTENT_TYPE env to work for all oclif cmds #753

Merged
merged 3 commits into from
Aug 3, 2023
Merged

fix: allow CONTENT_TYPE env to work for all oclif cmds #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71db0dc
fix: allow CONTENT_TYPE env to work for all oclif cmds
mshanemc Jul 31, 2023
a5d267f
test: don't try to execute tds "tests"
mshanemc Jul 31, 2023
378a4f7
test: remove Config import
mshanemc Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/command.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ export abstract class Command {
return jsonIndex > -1 && (ptIndex === -1 || jsonIndex < ptIndex)
}

return this.argv.includes('--json')
return this.argv.includes('--json') || this.config.scopedEnvVar?.('CONTENT_TYPE')?.toLowerCase() === 'json'
}

/**
Expand Down
16 changes: 16 additions & 0 deletions test/command/command.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,6 +525,22 @@ describe('command', () => {
})
.it('json enabled/pass through disabled/--json flag before --/jsonEnabled() should be true')

fancy
.stdout()
.do(async () => {
class CMD extends Command {
static enableJsonFlag = true
async run() {}
}

// mock a scopedEnvVar being set to JSON
const cmd = new CMD([], {
bin: 'FOO', scopedEnvVar: (foo: string) => foo.includes('CONTENT_TYPE') ? 'json' : undefined,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's an .env() on fancy-test that lets you set env vars if you prefer

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that didn't work when I tried it

} as any)
expect(cmd.jsonEnabled()).to.equal(true)
})
.it('json enabled from env')

fancy
.stdout()
.do(async () => {
Expand Down
0 test/interfaces/args.test.ts → test/interfaces/args.test-types.ts
View file
Open in desktop
File renamed without changes.
0 test/interfaces/flags.test.ts → test/interfaces/flags.test-types.ts
View file
Open in desktop
File renamed without changes.