Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
76 changes: 38 additions & 38 deletions js/__tests__/helper.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,27 +48,27 @@ describe('SentryCli helper', () => {

describe('`prepare` command', () => {
test('call prepare command add default ignore', () => {
const command = ['releases', 'files', 'release', 'upload-sourcemaps', '/dev/null'];
const command = ['sourcemaps', 'upload', '--release', 'release', '/dev/null'];

expect(helper.prepareCommand(command)).toEqual([
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'release',
'upload-sourcemaps',
'/dev/null',
]);
});

test('call prepare command with array option', () => {
const command = ['releases', 'files', 'release', 'upload-sourcemaps', '/dev/null'];
const command = ['sourcemaps', 'upload', '--release', 'release', '/dev/null'];

expect(
helper.prepareCommand(command, SOURCEMAPS_OPTIONS, { stripPrefix: ['node', 'app'] })
).toEqual([
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'release',
'upload-sourcemaps',
'/dev/null',
'--strip-prefix',
'node',
Expand All @@ -83,30 +83,30 @@ describe('SentryCli helper', () => {
});

test('call prepare command with boolean option', () => {
const command = ['releases', 'files', 'release', 'upload-sourcemaps', '/dev/null'];
const command = ['sourcemaps', 'upload', '--release', 'release', '/dev/null'];

expect(
helper.prepareCommand(command, SOURCEMAPS_OPTIONS, { sourceMapReference: false })
).toEqual([
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'release',
'upload-sourcemaps',
'/dev/null',
'--no-sourcemap-reference',
]);

expect(
helper.prepareCommand(command, SOURCEMAPS_OPTIONS, { sourceMapReference: true })
).toEqual(['releases', 'files', 'release', 'upload-sourcemaps', '/dev/null']);
).toEqual(['sourcemaps', 'upload', '--release', 'release', '/dev/null']);

expect(
helper.prepareCommand(command, SOURCEMAPS_OPTIONS, { decompress: true, rewrite: true })
).toEqual([
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'release',
'upload-sourcemaps',
'/dev/null',
'--decompress',
'--rewrite',
Expand All @@ -115,21 +115,21 @@ describe('SentryCli helper', () => {
expect(
helper.prepareCommand(command, SOURCEMAPS_OPTIONS, { rewrite: false, dedupe: false })
).toEqual([
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'release',
'upload-sourcemaps',
'/dev/null',
'--no-rewrite',
'--no-dedupe',
]);

// Only `invertedParam` registered for `dedupe` in `uploadSourcemaps`, so it should not add anything for positive boolean.
expect(helper.prepareCommand(command, SOURCEMAPS_OPTIONS, { dedupe: true })).toEqual([
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'release',
'upload-sourcemaps',
'/dev/null',
]);

Expand All @@ -139,23 +139,23 @@ describe('SentryCli helper', () => {
});

test('call prepare command with string option', () => {
const command = ['releases', 'files', 'release', 'upload-sourcemaps', '/dev/null'];
const command = ['sourcemaps', 'upload', '--release', 'release', '/dev/null'];

expect(helper.prepareCommand(command, SOURCEMAPS_OPTIONS, { ext: ['js'] })).toEqual([
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'release',
'upload-sourcemaps',
'/dev/null',
'--ext',
'js',
]);

expect(helper.prepareCommand(command, SOURCEMAPS_OPTIONS, { urlPrefix: '~/' })).toEqual([
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'release',
'upload-sourcemaps',
'/dev/null',
'--url-prefix',
'~/',
Expand All @@ -164,31 +164,31 @@ describe('SentryCli helper', () => {
expect(
helper.prepareCommand(command, SOURCEMAPS_OPTIONS, { urlSuffix: '?hash=1337' })
).toEqual([
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'release',
'upload-sourcemaps',
'/dev/null',
'--url-suffix',
'?hash=1337',
]);

expect(helper.prepareCommand(command, SOURCEMAPS_OPTIONS, { decompress: true })).toEqual([
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'release',
'upload-sourcemaps',
'/dev/null',
'--decompress',
]);

expect(
helper.prepareCommand(command, SOURCEMAPS_OPTIONS, { ignoreFile: '/js.ignore' })
).toEqual([
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'release',
'upload-sourcemaps',
'/dev/null',
'--ignore-file',
'/js.ignore',
Expand Down
36 changes: 18 additions & 18 deletions js/releases/__tests__/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ describe('SentryCli releases', () => {
await cli.releases.uploadSourceMaps('my-version', { include: ['path'] });
expect(mockExecute).toHaveBeenCalledWith(
[
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'my-version',
'upload-sourcemaps',
'path',
'--ignore',
'node_modules',
Expand All @@ -74,14 +74,14 @@ describe('SentryCli releases', () => {
});
expect(mockExecute).toHaveBeenCalledWith(
[
'releases',
'sourcemaps',
'upload',
'-p',
'proj-a',
'-p',
'proj-b',
'files',
'--release',
'my-version',
'upload-sourcemaps',
'path',
'--ignore',
'node_modules',
Expand All @@ -103,10 +103,10 @@ describe('SentryCli releases', () => {
paths.forEach(path =>
expect(mockExecute).toHaveBeenCalledWith(
[
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'my-version',
'upload-sourcemaps',
path,
'--ignore',
'node_modules',
Expand All @@ -129,10 +129,10 @@ describe('SentryCli releases', () => {

expect(mockExecute).toHaveBeenCalledWith(
[
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'my-version',
'upload-sourcemaps',
'some-path',
'--ignore',
'not-me', // note how this has been overridden
Expand All @@ -145,10 +145,10 @@ describe('SentryCli releases', () => {

expect(mockExecute).toHaveBeenCalledWith(
[
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'my-version',
'upload-sourcemaps',
'other-path',
'--ignore',
'node_modules',
Expand All @@ -164,10 +164,10 @@ describe('SentryCli releases', () => {
await cli.releases.uploadSourceMaps('my-version', { include: ['path'], live });
expect(mockExecute).toHaveBeenCalledWith(
[
'releases',
'files',
'sourcemaps',
'upload',
'--release',
'my-version',
'upload-sourcemaps',
'path',
'--ignore',
'node_modules',
Expand Down
4 changes: 2 additions & 2 deletions js/releases/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,9 @@ class Releases {
}

// args which apply to the entire `include` entry (everything besides the path)
const args = ['releases']
const args = ['sourcemaps', 'upload']
.concat(helper.getProjectFlagsFromOptions(options))
.concat(['files', release, 'upload-sourcemaps']);
.concat(['--release', release]);

return uploadPaths.map((path) =>
// `execute()` is async and thus we're returning a promise here
Expand Down