diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-16 12:09:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-16 12:09:30 +0000 |
| commit | e3748b81ca29b24197276767e245158d8f84fda3 (patch) | |
| tree | 02b2dbe099f8e09e9e85dc71cce1bd8e858be7ac /qa | |
| parent | 4e1af5260dc9187ca0637fcfcf56b450f6443192 (diff) | |
| download | gitlab-ce-e3748b81ca29b24197276767e245158d8f84fda3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/qa/specs/spec_helper.rb | 2 | ||||
| -rw-r--r-- | qa/spec/tools/test_resources_data_processor_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qa/qa/specs/spec_helper.rb b/qa/qa/specs/spec_helper.rb index 8fb0ce0ab2f..a4721040683 100644 --- a/qa/qa/specs/spec_helper.rb +++ b/qa/qa/specs/spec_helper.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require_relative '../../qa' +require 'active_support/testing/time_helpers' QA::Specs::QaDeprecationToolkitEnv.configure! @@ -18,6 +19,7 @@ RSpec.configure(&:disable_monkey_patching!) require_relative('../../../jh/qa/qa/specs/spec_helper') if GitlabEdition.jh? RSpec.configure do |config| + config.include ActiveSupport::Testing::TimeHelpers config.include QA::Support::Matchers::EventuallyMatcher config.include QA::Support::Matchers::HaveMatcher diff --git a/qa/spec/tools/test_resources_data_processor_spec.rb b/qa/spec/tools/test_resources_data_processor_spec.rb index 2ae43974a0c..73fc2f6e853 100644 --- a/qa/spec/tools/test_resources_data_processor_spec.rb +++ b/qa/spec/tools/test_resources_data_processor_spec.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true - require 'active_support/testing/time_helpers' - RSpec.describe QA::Tools::TestResourceDataProcessor do include QA::Support::Helpers::StubEnv include ActiveSupport::Testing::TimeHelpers |