diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-06 12:07:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-07-06 12:07:41 +0300 |
commit | d2485dbfedc4759eba5243e0d155e34494c4429b (patch) | |
tree | 0cdd51c58aef728db2e3c7e9de09976e85c062bb /spec/tooling | |
parent | d111e00680d2b3e46a7ee37af5499407c4a93a22 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/tooling')
-rw-r--r-- | spec/tooling/rspec_flaky/flaky_example_spec.rb | 1 | ||||
-rw-r--r-- | spec/tooling/rspec_flaky/flaky_examples_collection_spec.rb | 2 | ||||
-rw-r--r-- | spec/tooling/rspec_flaky/listener_spec.rb | 1 | ||||
-rw-r--r-- | spec/tooling/rspec_flaky/report_spec.rb | 3 |
4 files changed, 2 insertions, 5 deletions
diff --git a/spec/tooling/rspec_flaky/flaky_example_spec.rb b/spec/tooling/rspec_flaky/flaky_example_spec.rb index 68e40bc1050..c100756d734 100644 --- a/spec/tooling/rspec_flaky/flaky_example_spec.rb +++ b/spec/tooling/rspec_flaky/flaky_example_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'gitlab/rspec/all' -require_relative '../../support/time_travel' require_relative '../../../tooling/rspec_flaky/flaky_example' diff --git a/spec/tooling/rspec_flaky/flaky_examples_collection_spec.rb b/spec/tooling/rspec_flaky/flaky_examples_collection_spec.rb index 9d75c97febe..8304bcb426e 100644 --- a/spec/tooling/rspec_flaky/flaky_examples_collection_spec.rb +++ b/spec/tooling/rspec_flaky/flaky_examples_collection_spec.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -require_relative '../../support/time_travel' +require 'gitlab/rspec/all' require_relative '../../../tooling/rspec_flaky/flaky_examples_collection' diff --git a/spec/tooling/rspec_flaky/listener_spec.rb b/spec/tooling/rspec_flaky/listener_spec.rb index c0b71403347..d1ed84dad76 100644 --- a/spec/tooling/rspec_flaky/listener_spec.rb +++ b/spec/tooling/rspec_flaky/listener_spec.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require 'gitlab/rspec/all' -require_relative '../../support/time_travel' require_relative '../../../tooling/rspec_flaky/listener' diff --git a/spec/tooling/rspec_flaky/report_spec.rb b/spec/tooling/rspec_flaky/report_spec.rb index e7365c1e150..543a69cd8ee 100644 --- a/spec/tooling/rspec_flaky/report_spec.rb +++ b/spec/tooling/rspec_flaky/report_spec.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true require 'tempfile' - -require_relative '../../support/time_travel' +require 'gitlab/rspec/all' require_relative '../../../tooling/rspec_flaky/report' |