Skip to content

Commit 2f0f152

Browse files
authored
Merge pull request #35 from hsbt/avoid-always-under-bundler
Set bundler environmental variables when they are provided
2 parents 586f3ed + 2daa4bd commit 2f0f152

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
turbo_tests (2.0.0)
4+
turbo_tests (2.1.0)
55
bundler (>= 2.1)
66
parallel_tests (>= 3.3.0, < 5)
77
rspec (>= 3.10)

lib/turbo_tests/runner.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,15 @@ def start_subprocess(env, extra_args, tests, process_id, record_runtime:)
148148
end
149149

150150
command = [
151-
ENV["BUNDLE_BIN_PATH"], "exec", "rspec",
151+
"rspec",
152152
*extra_args,
153153
"--seed", rand(0xFFFF).to_s,
154154
"--format", "TurboTests::JsonRowsFormatter",
155155
"--out", tmp_filename,
156156
*record_runtime_options,
157157
*tests
158158
]
159+
command.unshift(ENV["BUNDLE_BIN_PATH"], "exec") if ENV["BUNDLE_BIN_PATH"]
159160

160161
if @verbose
161162
command_str = [

lib/turbo_tests/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module TurboTests
2-
VERSION = "2.0.0"
2+
VERSION = "2.1.0"
33
end

0 commit comments

Comments
 (0)