From 8bb837c4d180720d4d923ef2e7bd2c9a46ca97a0 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 19 Jun 2023 15:09:36 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/tooling/danger/project_helper_spec.rb | 2 +- spec/tooling/lib/tooling/find_changes_spec.rb | 2 +- spec/tooling/lib/tooling/find_tests_spec.rb | 2 +- spec/tooling/lib/tooling/gettext_extractor_spec.rb | 2 +- spec/tooling/lib/tooling/predictive_tests_spec.rb | 2 +- spec/tooling/rspec_flaky/config_spec.rb | 2 +- spec/tooling/rspec_flaky/flaky_example_spec.rb | 2 +- spec/tooling/rspec_flaky/listener_spec.rb | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'spec/tooling') diff --git a/spec/tooling/danger/project_helper_spec.rb b/spec/tooling/danger/project_helper_spec.rb index 3910f569400..fb0603a207a 100644 --- a/spec/tooling/danger/project_helper_spec.rb +++ b/spec/tooling/danger/project_helper_spec.rb @@ -5,9 +5,9 @@ require 'gitlab-dangerfiles' require 'danger' require 'danger/plugins/internal/helper' require 'gitlab/dangerfiles/spec_helper' +require 'gitlab/rspec/all' require_relative '../../../danger/plugins/project_helper' -require_relative '../../../spec/support/helpers/stub_env' RSpec.describe Tooling::Danger::ProjectHelper do include StubENV diff --git a/spec/tooling/lib/tooling/find_changes_spec.rb b/spec/tooling/lib/tooling/find_changes_spec.rb index 43c3da5699d..fef29ad3f2c 100644 --- a/spec/tooling/lib/tooling/find_changes_spec.rb +++ b/spec/tooling/lib/tooling/find_changes_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require_relative '../../../../tooling/lib/tooling/find_changes' -require_relative '../../../support/helpers/stub_env' +require 'gitlab/rspec/all' require 'json' require 'tempfile' diff --git a/spec/tooling/lib/tooling/find_tests_spec.rb b/spec/tooling/lib/tooling/find_tests_spec.rb index 905f81c4bbd..67b6650b335 100644 --- a/spec/tooling/lib/tooling/find_tests_spec.rb +++ b/spec/tooling/lib/tooling/find_tests_spec.rb @@ -2,7 +2,7 @@ require 'tempfile' require_relative '../../../../tooling/lib/tooling/find_tests' -require_relative '../../../support/helpers/stub_env' +require 'gitlab/rspec/all' RSpec.describe Tooling::FindTests, feature_category: :tooling do include StubENV diff --git a/spec/tooling/lib/tooling/gettext_extractor_spec.rb b/spec/tooling/lib/tooling/gettext_extractor_spec.rb index 3c0f91342c2..14310c804f1 100644 --- a/spec/tooling/lib/tooling/gettext_extractor_spec.rb +++ b/spec/tooling/lib/tooling/gettext_extractor_spec.rb @@ -1,9 +1,9 @@ # frozen_string_literal: true require 'rspec/parameterized' +require 'gitlab/rspec/all' require_relative '../../../../tooling/lib/tooling/gettext_extractor' -require_relative '../../../support/helpers/stub_env' require_relative '../../../support/tmpdir' RSpec.describe Tooling::GettextExtractor, feature_category: :tooling do diff --git a/spec/tooling/lib/tooling/predictive_tests_spec.rb b/spec/tooling/lib/tooling/predictive_tests_spec.rb index b82364fe6f6..fdb7d09a3e2 100644 --- a/spec/tooling/lib/tooling/predictive_tests_spec.rb +++ b/spec/tooling/lib/tooling/predictive_tests_spec.rb @@ -2,8 +2,8 @@ require 'tempfile' require 'fileutils' +require 'gitlab/rspec/all' require_relative '../../../../tooling/lib/tooling/predictive_tests' -require_relative '../../../support/helpers/stub_env' RSpec.describe Tooling::PredictiveTests, feature_category: :tooling do include StubENV diff --git a/spec/tooling/rspec_flaky/config_spec.rb b/spec/tooling/rspec_flaky/config_spec.rb index 63f42d7c6cc..8ba4dd1640e 100644 --- a/spec/tooling/rspec_flaky/config_spec.rb +++ b/spec/tooling/rspec_flaky/config_spec.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true require 'rspec-parameterized' -require_relative '../../support/helpers/stub_env' +require 'gitlab/rspec/all' require_relative '../../../tooling/rspec_flaky/config' diff --git a/spec/tooling/rspec_flaky/flaky_example_spec.rb b/spec/tooling/rspec_flaky/flaky_example_spec.rb index 511f3286f56..68e40bc1050 100644 --- a/spec/tooling/rspec_flaky/flaky_example_spec.rb +++ b/spec/tooling/rspec_flaky/flaky_example_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative '../../support/helpers/stub_env' +require 'gitlab/rspec/all' require_relative '../../support/time_travel' require_relative '../../../tooling/rspec_flaky/flaky_example' diff --git a/spec/tooling/rspec_flaky/listener_spec.rb b/spec/tooling/rspec_flaky/listener_spec.rb index 0bbd6454969..c0b71403347 100644 --- a/spec/tooling/rspec_flaky/listener_spec.rb +++ b/spec/tooling/rspec_flaky/listener_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative '../../support/helpers/stub_env' +require 'gitlab/rspec/all' require_relative '../../support/time_travel' require_relative '../../../tooling/rspec_flaky/listener' -- cgit v1.2.3