From 155f106fd5b5214c387e9b9143e9fa5725daed54 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 19 Aug 2021 15:10:29 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../design_management/pages/design/index_spec.js | 27 +++++----------------- spec/support/database_cleaner.rb | 4 ++++ 2 files changed, 10 insertions(+), 21 deletions(-) (limited to 'spec') diff --git a/spec/frontend/design_management/pages/design/index_spec.js b/spec/frontend/design_management/pages/design/index_spec.js index 1332e872246..6ce384b4869 100644 --- a/spec/frontend/design_management/pages/design/index_spec.js +++ b/spec/frontend/design_management/pages/design/index_spec.js @@ -390,28 +390,13 @@ describe('Design management design index page', () => { ); }); - describe('with usage_data_design_action enabled', () => { - it('tracks design view service ping', () => { - createComponent( - { loading: true }, - { - provide: { - glFeatures: { usageDataDesignAction: true }, - }, - }, - ); - expect(Api.trackRedisHllUserEvent).toHaveBeenCalledTimes(1); - expect(Api.trackRedisHllUserEvent).toHaveBeenCalledWith( - DESIGN_SERVICE_PING_EVENT_TYPES.DESIGN_ACTION, - ); - }); - }); + it('tracks design view service ping', () => { + createComponent({ loading: true }); - describe('with usage_data_design_action disabled', () => { - it("doesn't track design view service ping", () => { - createComponent({ loading: true }); - expect(Api.trackRedisHllUserEvent).toHaveBeenCalledTimes(0); - }); + expect(Api.trackRedisHllUserEvent).toHaveBeenCalledTimes(1); + expect(Api.trackRedisHllUserEvent).toHaveBeenCalledWith( + DESIGN_SERVICE_PING_EVENT_TYPES.DESIGN_ACTION, + ); }); }); }); diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb index 6a0e398daa1..01bf390d9e9 100644 --- a/spec/support/database_cleaner.rb +++ b/spec/support/database_cleaner.rb @@ -52,6 +52,8 @@ RSpec.configure do |config| example.run delete_from_all_tables!(except: deletion_except_tables) + + self.class.use_transactional_tests = true end config.around(:each, :migration) do |example| @@ -60,5 +62,7 @@ RSpec.configure do |config| example.run delete_from_all_tables! + + self.class.use_transactional_tests = true end end -- cgit v1.2.3