diff options
Diffstat (limited to 'spec/frontend')
34 files changed, 69 insertions, 53 deletions
diff --git a/spec/frontend/alert_spec.js b/spec/frontend/alert_spec.js index de3093c6c19..71c7dbe0cfd 100644 --- a/spec/frontend/alert_spec.js +++ b/spec/frontend/alert_spec.js @@ -1,8 +1,8 @@ -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { setHTMLFixture, resetHTMLFixture } from 'helpers/fixtures'; import { createAlert, VARIANT_WARNING } from '~/alert'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); describe('Flash', () => { const findTextContent = (containerSelector = '.flash-container') => diff --git a/spec/frontend/boards/cache_updates_spec.js b/spec/frontend/boards/cache_updates_spec.js index bc661f20451..07f5cef4a36 100644 --- a/spec/frontend/boards/cache_updates_spec.js +++ b/spec/frontend/boards/cache_updates_spec.js @@ -1,4 +1,4 @@ -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { setError } from '~/boards/graphql/cache_updates'; import { defaultClient } from '~/graphql_shared/issuable_client'; import setErrorMutation from '~/boards/graphql/client/set_error.mutation.graphql'; diff --git a/spec/frontend/boards/stores/actions_spec.js b/spec/frontend/boards/stores/actions_spec.js index 5b4b79c650a..358cb340802 100644 --- a/spec/frontend/boards/stores/actions_spec.js +++ b/spec/frontend/boards/stores/actions_spec.js @@ -1,8 +1,8 @@ -import * as Sentry from '@sentry/browser'; import { cloneDeep } from 'lodash'; import Vue from 'vue'; // eslint-disable-next-line no-restricted-imports import Vuex from 'vuex'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { inactiveId, ISSUABLE, ListType, DraggableItemTypes } from 'ee_else_ce/boards/constants'; import issueMoveListMutation from 'ee_else_ce/boards/graphql/issue_move_list.mutation.graphql'; import testAction from 'helpers/vuex_action_helper'; diff --git a/spec/frontend/ci/pipelines_page/pipelines_spec.js b/spec/frontend/ci/pipelines_page/pipelines_spec.js index fd95f98e7f8..3ce7960ed71 100644 --- a/spec/frontend/ci/pipelines_page/pipelines_spec.js +++ b/spec/frontend/ci/pipelines_page/pipelines_spec.js @@ -7,7 +7,6 @@ import { GlPagination, GlCollapsibleListbox, } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import { chunk } from 'lodash'; @@ -19,6 +18,7 @@ import { mockTracking } from 'helpers/tracking_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; import createMockApollo from 'helpers/mock_apollo_helper'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import Api from '~/api'; import { createAlert, VARIANT_WARNING } from '~/alert'; import setSortPreferenceMutation from '~/issues/list/queries/set_sort_preference.mutation.graphql'; @@ -40,7 +40,7 @@ import { import { stageReply } from 'jest/ci/pipeline_mini_graph/mock_data'; import { users, mockSearch, branches } from '../pipeline_details/mock_data'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); jest.mock('~/alert'); const mockProjectPath = 'twitter/flight'; diff --git a/spec/frontend/ci/runner/sentry_utils_spec.js b/spec/frontend/ci/runner/sentry_utils_spec.js index 59d386a5899..bb291557288 100644 --- a/spec/frontend/ci/runner/sentry_utils_spec.js +++ b/spec/frontend/ci/runner/sentry_utils_spec.js @@ -1,7 +1,7 @@ -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { captureException } from '~/ci/runner/sentry_utils'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); describe('~/ci/runner/sentry_utils', () => { describe('captureException', () => { diff --git a/spec/frontend/clusters_list/components/clusters_spec.js b/spec/frontend/clusters_list/components/clusters_spec.js index d4474b1c643..a7ec32c4f32 100644 --- a/spec/frontend/clusters_list/components/clusters_spec.js +++ b/spec/frontend/clusters_list/components/clusters_spec.js @@ -1,8 +1,8 @@ import { GlLoadingIcon, GlPagination, GlSkeletonLoader, GlTableLite } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; import { mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; import { nextTick } from 'vue'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import Clusters from '~/clusters_list/components/clusters.vue'; import ClustersEmptyState from '~/clusters_list/components/clusters_empty_state.vue'; import ClusterStore from '~/clusters_list/store'; @@ -15,7 +15,7 @@ import { } from '~/clusters_list/store/mutation_types'; import { apiData } from '../mock_data'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); describe('Clusters', () => { let mock; diff --git a/spec/frontend/clusters_list/store/actions_spec.js b/spec/frontend/clusters_list/store/actions_spec.js index 9e6da595a75..fda3fde6baa 100644 --- a/spec/frontend/clusters_list/store/actions_spec.js +++ b/spec/frontend/clusters_list/store/actions_spec.js @@ -1,5 +1,5 @@ -import * as Sentry from '@sentry/browser'; import MockAdapter from 'axios-mock-adapter'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import testAction from 'helpers/vuex_action_helper'; import waitForPromises from 'helpers/wait_for_promises'; import { MAX_REQUESTS } from '~/clusters_list/constants'; diff --git a/spec/frontend/custom_emoji/components/delete_item_spec.js b/spec/frontend/custom_emoji/components/delete_item_spec.js index 06c4ca8d54b..2d5594b8a65 100644 --- a/spec/frontend/custom_emoji/components/delete_item_spec.js +++ b/spec/frontend/custom_emoji/components/delete_item_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; -import * as Sentry from '@sentry/browser'; import { GlModal } from '@gitlab/ui'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { mountExtended } from 'helpers/vue_test_utils_helper'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; @@ -11,7 +11,7 @@ import deleteCustomEmojiMutation from '~/custom_emoji/queries/delete_custom_emoj import { CUSTOM_EMOJI } from '../mock_data'; jest.mock('~/alert'); -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); let wrapper; let deleteMutationSpy; diff --git a/spec/frontend/design_management/components/design_notes/design_note_spec.js b/spec/frontend/design_management/components/design_notes/design_note_spec.js index 8795b089551..91c6acd8890 100644 --- a/spec/frontend/design_management/components/design_notes/design_note_spec.js +++ b/spec/frontend/design_management/components/design_notes/design_note_spec.js @@ -1,7 +1,7 @@ import { ApolloMutation } from 'vue-apollo'; import { nextTick } from 'vue'; import { GlAvatar, GlAvatarLink, GlDisclosureDropdown, GlDisclosureDropdownItem } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; diff --git a/spec/frontend/emoji/awards_app/store/actions_spec.js b/spec/frontend/emoji/awards_app/store/actions_spec.js index 65f2e813f19..23aa7bd5ad7 100644 --- a/spec/frontend/emoji/awards_app/store/actions_spec.js +++ b/spec/frontend/emoji/awards_app/store/actions_spec.js @@ -1,11 +1,11 @@ -import * as Sentry from '@sentry/browser'; import MockAdapter from 'axios-mock-adapter'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import testAction from 'helpers/vuex_action_helper'; import * as actions from '~/emoji/awards_app/store/actions'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_INTERNAL_SERVER_ERROR, HTTP_STATUS_OK } from '~/lib/utils/http_status'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); jest.mock('~/vue_shared/plugins/global_toast'); describe('Awards app actions', () => { diff --git a/spec/frontend/import_entities/import_projects/components/github_organizations_box_spec.js b/spec/frontend/import_entities/import_projects/components/github_organizations_box_spec.js index b6f96cd6a23..7b3758cbd25 100644 --- a/spec/frontend/import_entities/import_projects/components/github_organizations_box_spec.js +++ b/spec/frontend/import_entities/import_projects/components/github_organizations_box_spec.js @@ -1,8 +1,8 @@ import { GlCollapsibleListbox } from '@gitlab/ui'; import MockAdapter from 'axios-mock-adapter'; import { mount } from '@vue/test-utils'; -import { captureException } from '@sentry/browser'; import { nextTick } from 'vue'; +import { captureException } from '~/sentry/sentry_browser_wrapper'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_INTERNAL_SERVER_ERROR, HTTP_STATUS_OK } from '~/lib/utils/http_status'; @@ -10,7 +10,7 @@ import { createAlert } from '~/alert'; import GithubOrganizationsBox from '~/import_entities/import_projects/components/github_organizations_box.vue'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); jest.mock('~/alert'); const MOCK_RESPONSE = { diff --git a/spec/frontend/integrations/edit/components/integration_form_spec.js b/spec/frontend/integrations/edit/components/integration_form_spec.js index 5aa3ee35379..cef8fb0b720 100644 --- a/spec/frontend/integrations/edit/components/integration_form_spec.js +++ b/spec/frontend/integrations/edit/components/integration_form_spec.js @@ -2,7 +2,7 @@ import { GlAlert, GlForm } from '@gitlab/ui'; import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import { nextTick } from 'vue'; -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { setHTMLFixture } from 'helpers/fixtures'; import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper'; import waitForPromises from 'helpers/wait_for_promises'; @@ -29,7 +29,7 @@ import { mockSectionJiraIssues, } from '../mock_data'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); jest.mock('~/lib/utils/url_utility'); describe('IntegrationForm', () => { diff --git a/spec/frontend/integrations/overrides/components/integration_overrides_spec.js b/spec/frontend/integrations/overrides/components/integration_overrides_spec.js index 9e863eaecfd..ac67d53e00d 100644 --- a/spec/frontend/integrations/overrides/components/integration_overrides_spec.js +++ b/spec/frontend/integrations/overrides/components/integration_overrides_spec.js @@ -1,7 +1,7 @@ import { GlTable, GlLink, GlPagination, GlAlert } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; import { shallowMount, mount } from '@vue/test-utils'; import MockAdapter from 'axios-mock-adapter'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import waitForPromises from 'helpers/wait_for_promises'; import { DEFAULT_PER_PAGE } from '~/api'; import IntegrationOverrides from '~/integrations/overrides/components/integration_overrides.vue'; diff --git a/spec/frontend/issues/dashboard/components/issues_dashboard_app_spec.js b/spec/frontend/issues/dashboard/components/issues_dashboard_app_spec.js index f6c9fab76d1..35699568793 100644 --- a/spec/frontend/issues/dashboard/components/issues_dashboard_app_spec.js +++ b/spec/frontend/issues/dashboard/components/issues_dashboard_app_spec.js @@ -1,9 +1,9 @@ import { GlDisclosureDropdown, GlEmptyState } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; import AxiosMockAdapter from 'axios-mock-adapter'; import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; import { cloneDeep } from 'lodash'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import getIssuesQuery from 'ee_else_ce/issues/dashboard/queries/get_issues.query.graphql'; import IssueCardStatistics from 'ee_else_ce/issues/list/components/issue_card_statistics.vue'; import IssueCardTimeInfo from 'ee_else_ce/issues/list/components/issue_card_time_info.vue'; @@ -45,7 +45,7 @@ import { issuesQueryResponse, } from '../mock_data'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); jest.mock('~/lib/utils/scroll_utils', () => ({ scrollUp: jest.fn() })); describe('IssuesDashboardApp component', () => { diff --git a/spec/frontend/issues/list/components/issues_list_app_spec.js b/spec/frontend/issues/list/components/issues_list_app_spec.js index f830168ce5d..6bd952cd215 100644 --- a/spec/frontend/issues/list/components/issues_list_app_spec.js +++ b/spec/frontend/issues/list/components/issues_list_app_spec.js @@ -1,11 +1,11 @@ import { GlButton, GlDisclosureDropdown, GlDrawer } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; import { mount, shallowMount } from '@vue/test-utils'; import AxiosMockAdapter from 'axios-mock-adapter'; import { cloneDeep } from 'lodash'; import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; import VueRouter from 'vue-router'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import getIssuesQuery from 'ee_else_ce/issues/list/queries/get_issues.query.graphql'; import getIssuesCountsQuery from 'ee_else_ce/issues/list/queries/get_issues_counts.query.graphql'; import createMockApollo from 'helpers/mock_apollo_helper'; @@ -87,7 +87,7 @@ import { import('~/issuable'); import('~/users_select'); -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); jest.mock('~/alert'); jest.mock('~/lib/utils/scroll_utils', () => ({ scrollUp: jest.fn() })); diff --git a/spec/frontend/issues/service_desk/components/service_desk_list_app_spec.js b/spec/frontend/issues/service_desk/components/service_desk_list_app_spec.js index d28b4f2fe76..bb388cefa95 100644 --- a/spec/frontend/issues/service_desk/components/service_desk_list_app_spec.js +++ b/spec/frontend/issues/service_desk/components/service_desk_list_app_spec.js @@ -3,8 +3,8 @@ import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; import { cloneDeep } from 'lodash'; import VueRouter from 'vue-router'; -import * as Sentry from '@sentry/browser'; import AxiosMockAdapter from 'axios-mock-adapter'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import axios from '~/lib/utils/axios_utils'; import createMockApollo from 'helpers/mock_apollo_helper'; import setWindowLocation from 'helpers/set_window_location_helper'; @@ -55,7 +55,7 @@ import { locationSearch, } from '../mock_data'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); jest.mock('~/alert'); jest.mock('~/lib/utils/scroll_utils', () => ({ scrollUp: jest.fn() })); diff --git a/spec/frontend/members/components/table/role_dropdown_spec.js b/spec/frontend/members/components/table/role_dropdown_spec.js index 5204ac2fdbe..915b2ae17ae 100644 --- a/spec/frontend/members/components/table/role_dropdown_spec.js +++ b/spec/frontend/members/components/table/role_dropdown_spec.js @@ -1,10 +1,10 @@ import { GlCollapsibleListbox, GlListboxItem } from '@gitlab/ui'; import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils'; -import * as Sentry from '@sentry/browser'; import { mount } from '@vue/test-utils'; import Vue, { nextTick } from 'vue'; // eslint-disable-next-line no-restricted-imports import Vuex from 'vuex'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import waitForPromises from 'helpers/wait_for_promises'; import RoleDropdown from '~/members/components/table/role_dropdown.vue'; import { MEMBER_TYPES } from '~/members/constants'; @@ -13,7 +13,7 @@ import { member } from '../../mock_data'; Vue.use(Vuex); jest.mock('ee_else_ce/members/guest_overage_confirm_action'); -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); describe('RoleDropdown', () => { let wrapper; diff --git a/spec/frontend/ml/model_registry/apps/show_ml_model_version_spec.js b/spec/frontend/ml/model_registry/apps/show_ml_model_version_spec.js new file mode 100644 index 00000000000..77fca53c00e --- /dev/null +++ b/spec/frontend/ml/model_registry/apps/show_ml_model_version_spec.js @@ -0,0 +1,15 @@ +import { shallowMount } from '@vue/test-utils'; +import { ShowMlModelVersion } from '~/ml/model_registry/apps'; +import { MODEL_VERSION } from '../mock_data'; + +let wrapper; +const createWrapper = () => { + wrapper = shallowMount(ShowMlModelVersion, { propsData: { modelVersion: MODEL_VERSION } }); +}; + +describe('ShowMlModelVersion', () => { + beforeEach(() => createWrapper()); + it('renders the app', () => { + expect(wrapper.text()).toContain(`${MODEL_VERSION.model.name} - ${MODEL_VERSION.version}`); + }); +}); diff --git a/spec/frontend/ml/model_registry/mock_data.js b/spec/frontend/ml/model_registry/mock_data.js index 18b2b32e069..35a2c3bec01 100644 --- a/spec/frontend/ml/model_registry/mock_data.js +++ b/spec/frontend/ml/model_registry/mock_data.js @@ -1 +1,3 @@ export const MODEL = { name: 'blah' }; + +export const MODEL_VERSION = { version: '1.2.3', model: MODEL }; diff --git a/spec/frontend/observability/client_spec.js b/spec/frontend/observability/client_spec.js index 68a53131539..e61153fb5e5 100644 --- a/spec/frontend/observability/client_spec.js +++ b/spec/frontend/observability/client_spec.js @@ -1,10 +1,10 @@ import MockAdapter from 'axios-mock-adapter'; -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { buildClient } from '~/observability/client'; import axios from '~/lib/utils/axios_utils'; jest.mock('~/lib/utils/axios_utils'); -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); describe('buildClient', () => { let client; diff --git a/spec/frontend/packages_and_registries/package_registry/components/details/additional_metadata_spec.js b/spec/frontend/packages_and_registries/package_registry/components/details/additional_metadata_spec.js index 2e59c27cc1b..133941bbb2e 100644 --- a/spec/frontend/packages_and_registries/package_registry/components/details/additional_metadata_spec.js +++ b/spec/frontend/packages_and_registries/package_registry/components/details/additional_metadata_spec.js @@ -1,7 +1,7 @@ import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; import { GlAlert } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import createMockApollo from 'helpers/mock_apollo_helper'; import { diff --git a/spec/frontend/packages_and_registries/package_registry/components/details/package_files_spec.js b/spec/frontend/packages_and_registries/package_registry/components/details/package_files_spec.js index 5ba4b1f687e..7823b146aba 100644 --- a/spec/frontend/packages_and_registries/package_registry/components/details/package_files_spec.js +++ b/spec/frontend/packages_and_registries/package_registry/components/details/package_files_spec.js @@ -6,9 +6,9 @@ import { GlModal, GlKeysetPagination, } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { stubComponent } from 'helpers/stub_component'; import { mountExtended, extendedWrapper } from 'helpers/vue_test_utils_helper'; import createMockApollo from 'helpers/mock_apollo_helper'; diff --git a/spec/frontend/packages_and_registries/package_registry/components/details/package_history_spec.js b/spec/frontend/packages_and_registries/package_registry/components/details/package_history_spec.js index ed470f63b8a..d83d571872c 100644 --- a/spec/frontend/packages_and_registries/package_registry/components/details/package_history_spec.js +++ b/spec/frontend/packages_and_registries/package_registry/components/details/package_history_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import { GlAlert, GlLink, GlSprintf } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { stubComponent } from 'helpers/stub_component'; import createMockApollo from 'helpers/mock_apollo_helper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; diff --git a/spec/frontend/packages_and_registries/package_registry/components/details/package_versions_list_spec.js b/spec/frontend/packages_and_registries/package_registry/components/details/package_versions_list_spec.js index e9f2a2c5095..8e22e9a3b0c 100644 --- a/spec/frontend/packages_and_registries/package_registry/components/details/package_versions_list_spec.js +++ b/spec/frontend/packages_and_registries/package_registry/components/details/package_versions_list_spec.js @@ -1,7 +1,7 @@ import Vue from 'vue'; import VueApollo from 'vue-apollo'; import { GlAlert } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import createMockApollo from 'helpers/mock_apollo_helper'; import { stubComponent } from 'helpers/stub_component'; diff --git a/spec/frontend/security_configuration/components/training_provider_list_spec.js b/spec/frontend/security_configuration/components/training_provider_list_spec.js index 2982cef7c74..5b2b3f46df6 100644 --- a/spec/frontend/security_configuration/components/training_provider_list_spec.js +++ b/spec/frontend/security_configuration/components/training_provider_list_spec.js @@ -1,4 +1,3 @@ -import * as Sentry from '@sentry/browser'; import { GlAlert, GlLink, @@ -10,6 +9,7 @@ import { } from '@gitlab/ui'; import Vue from 'vue'; import VueApollo from 'vue-apollo'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; import createMockApollo from 'helpers/mock_apollo_helper'; import { mockTracking, unmockTracking } from 'helpers/tracking_helper'; diff --git a/spec/frontend/sidebar/components/sidebar_dropdown_widget_spec.js b/spec/frontend/sidebar/components/sidebar_dropdown_widget_spec.js index 27ab347775a..c1c3c1fea91 100644 --- a/spec/frontend/sidebar/components/sidebar_dropdown_widget_spec.js +++ b/spec/frontend/sidebar/components/sidebar_dropdown_widget_spec.js @@ -1,8 +1,8 @@ import { GlLink, GlLoadingIcon, GlSearchBoxByType } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; import { shallowMount, mount } from '@vue/test-utils'; import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import createMockApollo from 'helpers/mock_apollo_helper'; import { createMockDirective, getBinding } from 'helpers/vue_mock_directive'; import { extendedWrapper } from 'helpers/vue_test_utils_helper'; diff --git a/spec/frontend/super_sidebar/utils_spec.js b/spec/frontend/super_sidebar/utils_spec.js index 85c13a4c892..43eb82f5928 100644 --- a/spec/frontend/super_sidebar/utils_spec.js +++ b/spec/frontend/super_sidebar/utils_spec.js @@ -1,5 +1,5 @@ -import * as Sentry from '@sentry/browser'; import MockAdapter from 'axios-mock-adapter'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { getTopFrequentItems, trackContextAccess, @@ -16,7 +16,7 @@ import waitForPromises from 'helpers/wait_for_promises'; import { unsortedFrequentItems, sortedFrequentItems } from '../frequent_items/mock_data'; import { cachedFrequentProjects } from './mock_data'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); useLocalStorageSpy(); diff --git a/spec/frontend/time_tracking/components/timelogs_app_spec.js b/spec/frontend/time_tracking/components/timelogs_app_spec.js index 13188f3b937..4cc719ee09f 100644 --- a/spec/frontend/time_tracking/components/timelogs_app_spec.js +++ b/spec/frontend/time_tracking/components/timelogs_app_spec.js @@ -1,10 +1,10 @@ import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; -import * as Sentry from '@sentry/browser'; import { GlDatepicker, GlLoadingIcon, GlKeysetPagination } from '@gitlab/ui'; import getTimelogsEmptyResponse from 'test_fixtures/graphql/get_timelogs_empty_response.json'; import getPaginatedTimelogsResponse from 'test_fixtures/graphql/get_paginated_timelogs_response.json'; import getNonPaginatedTimelogsResponse from 'test_fixtures/graphql/get_non_paginated_timelogs_response.json'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { createAlert } from '~/alert'; import { mountExtended, extendedWrapper } from 'helpers/vue_test_utils_helper'; import createMockApollo from 'helpers/mock_apollo_helper'; @@ -14,7 +14,7 @@ import TimelogsApp from '~/time_tracking/components/timelogs_app.vue'; import TimelogsTable from '~/time_tracking/components/timelogs_table.vue'; jest.mock('~/alert'); -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); describe('Timelogs app', () => { Vue.use(VueApollo); diff --git a/spec/frontend/tracking/dispatch_snowplow_event_spec.js b/spec/frontend/tracking/dispatch_snowplow_event_spec.js index 5f4d065d504..8297a7088f2 100644 --- a/spec/frontend/tracking/dispatch_snowplow_event_spec.js +++ b/spec/frontend/tracking/dispatch_snowplow_event_spec.js @@ -1,10 +1,10 @@ -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { dispatchSnowplowEvent } from '~/tracking/dispatch_snowplow_event'; import getStandardContext from '~/tracking/get_standard_context'; import { extraContext, servicePingContext } from './mock_data'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); jest.mock('~/tracking/get_standard_context'); const category = 'Incident Management'; diff --git a/spec/frontend/vue_merge_request_widget/components/widget/widget_spec.js b/spec/frontend/vue_merge_request_widget/components/widget/widget_spec.js index 18fdba32f52..87c1ad7947e 100644 --- a/spec/frontend/vue_merge_request_widget/components/widget/widget_spec.js +++ b/spec/frontend/vue_merge_request_widget/components/widget/widget_spec.js @@ -1,5 +1,5 @@ import { nextTick } from 'vue'; -import * as Sentry from '@sentry/browser'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import { shallowMountExtended, mountExtended } from 'helpers/vue_test_utils_helper'; import HelpPopover from '~/vue_shared/components/help_popover.vue'; import waitForPromises from 'helpers/wait_for_promises'; diff --git a/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js b/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js index eb3d624dc04..9296e548081 100644 --- a/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js +++ b/spec/frontend/vue_merge_request_widget/mr_widget_options_spec.js @@ -3,13 +3,13 @@ import MockAdapter from 'axios-mock-adapter'; import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; import { createMockSubscription as createMockApolloSubscription } from 'mock-apollo-client'; -import * as Sentry from '@sentry/browser'; import approvedByCurrentUser from 'test_fixtures/graphql/merge_requests/approvals/approvals.query.graphql.json'; import getStateQueryResponse from 'test_fixtures/graphql/merge_requests/get_state.query.graphql.json'; import readyToMergeResponse from 'test_fixtures/graphql/merge_requests/states/ready_to_merge.query.graphql.json'; import createMockApollo from 'helpers/mock_apollo_helper'; import waitForPromises from 'helpers/wait_for_promises'; import { mountExtended, shallowMountExtended } from 'helpers/vue_test_utils_helper'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import api from '~/api'; import axios from '~/lib/utils/axios_utils'; import { HTTP_STATUS_OK, HTTP_STATUS_NO_CONTENT } from '~/lib/utils/http_status'; @@ -63,8 +63,8 @@ jest.mock('~/smart_interval'); jest.mock('~/lib/utils/favicon'); -jest.mock('@sentry/browser', () => ({ - ...jest.requireActual('@sentry/browser'), +jest.mock('~/sentry/sentry_browser_wrapper', () => ({ + ...jest.requireActual('~/sentry/sentry_browser_wrapper'), captureException: jest.fn(), })); diff --git a/spec/frontend/vue_shared/components/ensure_data_spec.js b/spec/frontend/vue_shared/components/ensure_data_spec.js index 217e795bc64..399fe19ea3f 100644 --- a/spec/frontend/vue_shared/components/ensure_data_spec.js +++ b/spec/frontend/vue_shared/components/ensure_data_spec.js @@ -1,6 +1,6 @@ import { GlEmptyState } from '@gitlab/ui'; -import * as Sentry from '@sentry/browser'; import { mount } from '@vue/test-utils'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import ensureData from '~/ensure_data'; const mockData = { message: 'Hello there' }; diff --git a/spec/frontend/work_items/components/work_item_parent_spec.js b/spec/frontend/work_items/components/work_item_parent_spec.js index a72eeabc43c..dcebfca7c68 100644 --- a/spec/frontend/work_items/components/work_item_parent_spec.js +++ b/spec/frontend/work_items/components/work_item_parent_spec.js @@ -1,12 +1,11 @@ -import * as Sentry from '@sentry/browser'; import { GlCollapsibleListbox, GlFormGroup } from '@gitlab/ui'; - import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; import waitForPromises from 'helpers/wait_for_promises'; import createMockApollo from 'helpers/mock_apollo_helper'; import { shallowMountExtended } from 'helpers/vue_test_utils_helper'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import WorkItemParent from '~/work_items/components/work_item_parent.vue'; import updateWorkItemMutation from '~/work_items/graphql/update_work_item.mutation.graphql'; import projectWorkItemsQuery from '~/work_items/graphql/project_work_items.query.graphql'; @@ -20,7 +19,7 @@ import { updateWorkItemMutationErrorResponse, } from '../mock_data'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); describe('WorkItemParent component', () => { Vue.use(VueApollo); diff --git a/spec/frontend/work_items/list/components/work_items_list_app_spec.js b/spec/frontend/work_items/list/components/work_items_list_app_spec.js index 96083478e77..401d7dcbbdb 100644 --- a/spec/frontend/work_items/list/components/work_items_list_app_spec.js +++ b/spec/frontend/work_items/list/components/work_items_list_app_spec.js @@ -1,7 +1,7 @@ -import * as Sentry from '@sentry/browser'; import { shallowMount } from '@vue/test-utils'; import Vue, { nextTick } from 'vue'; import VueApollo from 'vue-apollo'; +import * as Sentry from '~/sentry/sentry_browser_wrapper'; import IssueCardStatistics from 'ee_else_ce/issues/list/components/issue_card_statistics.vue'; import IssueCardTimeInfo from 'ee_else_ce/issues/list/components/issue_card_time_info.vue'; import createMockApollo from 'helpers/mock_apollo_helper'; @@ -12,7 +12,7 @@ import WorkItemsListApp from '~/work_items/list/components/work_items_list_app.v import getWorkItemsQuery from '~/work_items/list/queries/get_work_items.query.graphql'; import { groupWorkItemsQueryResponse } from '../../mock_data'; -jest.mock('@sentry/browser'); +jest.mock('~/sentry/sentry_browser_wrapper'); describe('WorkItemsListApp component', () => { let wrapper; |