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
5 changes: 5 additions & 0 deletions packages/vue/src/components.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ export const formatComponentName = (vm?: ViewModel, includeFile?: boolean): stri
return ROOT_COMPONENT_NAME;
}

// https://github.com/getsentry/sentry-javascript/issues/5204 $options can be undefined
if (!vm.$options) {
return ANONYMOUS_COMPONENT_NAME;
}

const options = vm.$options;

let name = options.name || options._componentTag;
Expand Down
140 changes: 117 additions & 23 deletions packages/vue/test/components.test.ts
Original file line number Diff line number Diff line change
@@ -1,26 +1,120 @@
import { formatComponentName } from '../src/components';

it('properly format component names', () => {
const vm: any = {
$options: {},
};
vm.$root = vm;
expect(formatComponentName(vm)).toBe('<Root>');

vm.$root = null;
vm.$options.name = 'hello-there';
expect(formatComponentName(vm)).toBe('<HelloThere>');

vm.$options.name = null;
vm.$options._componentTag = 'foo-bar-1';
expect(formatComponentName(vm)).toBe('<FooBar1>');

vm.$options._componentTag = null;
vm.$options.__file = '/foo/bar/baz/SomeThing.vue';
expect(formatComponentName(vm)).toBe(`<SomeThing> at ${vm.$options.__file}`);
expect(formatComponentName(vm, false)).toBe('<SomeThing>');

vm.$options.__file = 'C:\\foo\\bar\\baz\\windows_file.vue';
expect(formatComponentName(vm)).toBe(`<WindowsFile> at ${vm.$options.__file}`);
expect(formatComponentName(vm, false)).toBe('<WindowsFile>');
describe('formatComponentName', () => {
describe('when the vm is not defined', () => {
it('returns the anonymous component name', () => {
// arrange
const vm = undefined;

// act
const formattedName = formatComponentName(vm);

// assert
expect(formattedName).toEqual('<Anonymous>');
});
});

describe('when the vm is defined', () => {
let vm: any = undefined;

beforeEach(() => {
vm = {};
});

describe('and when the $options is not defined', () => {
it('returns the anonymous component name', () => {
// arrange
vm.$options = undefined;

// act
const formattedName = formatComponentName(vm);

// assert
expect(formattedName).toEqual('<Anonymous>');
});
});
Comment on lines +24 to +35
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is the main test I added.
Commenting the fix will make this test fail.
The rest is refactor (and the right-side ternary on name line 50 which was not covered).


describe('when the $options is defined', () => {
beforeEach(() => {
vm = { $options: {} };
});

describe('when the vm is the $root', () => {
it('returns the root component name', () => {
// arrange
vm.$root = vm;

// act
const formattedName = formatComponentName(vm);

// assert
expect(formattedName).toEqual('<Root>');
});
});

describe('when the $options have a name', () => {
it('returns the name', () => {
// arrange
vm.$options.name = 'hello-there';

// act
const formattedName = formatComponentName(vm);

// assert
expect(formattedName).toEqual('<HelloThere>');
});
});

describe('when the options have a _componentTag', () => {
it('returns the _componentTag', () => {
// arrange
vm.$options._componentTag = 'foo-bar-1';

// act
const formattedName = formatComponentName(vm);

// assert
expect(formattedName).toEqual('<FooBar1>');
});
});

describe('when the options have a __file', () => {
describe('and we do not wish to include the filename', () => {
it.each([
['unix', '/foo/bar/baz/SomeThing.vue', '<SomeThing>'],
['unix', '/foo/bar/baz/SomeThing.ts', '<Anonymous>'],
['windows', 'C:\\foo\\bar\\baz\\windows_file.vue', '<WindowsFile>'],
['windows', 'C:\\foo\\bar\\baz\\windows_file.ts', '<Anonymous>'],
])('returns the filename (%s)', (_, filePath, expected) => {
// arrange
vm.$options.__file = filePath;

// act
const formattedName = formatComponentName(vm, false);

// assert
expect(formattedName).toEqual(expected);
});
});

describe('and we wish to include the filename', () => {
it.each([
['unix', '/foo/bar/baz/SomeThing.vue', '<SomeThing>'],
['unix', '/foo/bar/baz/SomeThing.ts', '<Anonymous>'],
['windows', 'C:\\foo\\bar\\baz\\windows_file.vue', '<WindowsFile>'],
['windows', 'C:\\foo\\bar\\baz\\windows_file.ts', '<Anonymous>'],
])('returns the filename (%s)', (_, filePath, expected) => {
// arrange
vm.$options.__file = filePath;

// act
const formattedName = formatComponentName(vm);

// assert
expect(formattedName).toEqual(`${expected} at ${filePath}`);
});
});
});
});
});
});