diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /spec/frontend/sentry | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'spec/frontend/sentry')
-rw-r--r-- | spec/frontend/sentry/index_spec.js | 4 | ||||
-rw-r--r-- | spec/frontend/sentry/sentry_config_spec.js | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/spec/frontend/sentry/index_spec.js b/spec/frontend/sentry/index_spec.js index 13b9b9e909c..d1f098112e8 100644 --- a/spec/frontend/sentry/index_spec.js +++ b/spec/frontend/sentry/index_spec.js @@ -7,6 +7,8 @@ describe('SentryConfig options', () => { const gitlabUrl = 'gitlabUrl'; const environment = 'test'; const revision = 'revision'; + const featureCategory = 'my_feature_category'; + let indexReturnValue; beforeEach(() => { @@ -16,6 +18,7 @@ describe('SentryConfig options', () => { current_user_id: currentUserId, gitlab_url: gitlabUrl, revision, + feature_category: featureCategory, }; process.env.HEAD_COMMIT_SHA = revision; @@ -34,6 +37,7 @@ describe('SentryConfig options', () => { release: revision, tags: { revision, + feature_category: featureCategory, }, }); }); diff --git a/spec/frontend/sentry/sentry_config_spec.js b/spec/frontend/sentry/sentry_config_spec.js index 1f5097ef2a8..9f67b681b8d 100644 --- a/spec/frontend/sentry/sentry_config_spec.js +++ b/spec/frontend/sentry/sentry_config_spec.js @@ -72,11 +72,13 @@ describe('SentryConfig', () => { release: 'revision', tags: { revision: 'revision', + feature_category: 'my_feature_category', }, }; beforeEach(() => { jest.spyOn(Sentry, 'init').mockImplementation(); + jest.spyOn(Sentry, 'setTags').mockImplementation(); sentryConfig.options = options; sentryConfig.IGNORE_ERRORS = 'ignore_errors'; @@ -89,7 +91,6 @@ describe('SentryConfig', () => { expect(Sentry.init).toHaveBeenCalledWith({ dsn: options.dsn, release: options.release, - tags: options.tags, sampleRate: 0.95, whitelistUrls: options.whitelistUrls, environment: 'test', @@ -98,6 +99,10 @@ describe('SentryConfig', () => { }); }); + it('should call Sentry.setTags', () => { + expect(Sentry.setTags).toHaveBeenCalledWith(options.tags); + }); + it('should set environment from options', () => { sentryConfig.options.environment = 'development'; @@ -106,7 +111,6 @@ describe('SentryConfig', () => { expect(Sentry.init).toHaveBeenCalledWith({ dsn: options.dsn, release: options.release, - tags: options.tags, sampleRate: 0.95, whitelistUrls: options.whitelistUrls, environment: 'development', |