Skip to content

Commit 0e4dc1a

Browse files
rmm5trmm5t
committed
Remove --guard flag for minitest 6 support
1 parent c86cefe commit 0e4dc1a

File tree

2 files changed

+15
-24
lines changed

2 files changed

+15
-24
lines changed

‎lib/guard/minitest/runner.rb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ def ruby_command(paths)
193193
cmd_parts << '-e ""'
194194

195195
cmd_parts << '--'
196-
cmd_parts << '--guard'
197196
cmd_parts += cli_options
198197
cmd_parts
199198
end

‎spec/lib/guard/minitest/runner_spec.rb‎

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
end
189189

190190
it 'outputs command' do
191-
expect(Guard::Compat::UI).to receive(:debug).with("Running: ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard")
191+
expect(Guard::Compat::UI).to receive(:debug).with("Running: ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --")
192192
subject.run(['test/test_minitest.rb'])
193193
end
194194
end
@@ -200,7 +200,7 @@
200200
end
201201

202202
it 'shows an error' do
203-
expect(Guard::Compat::UI).to receive(:error).with("No such file or directory - ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard")
203+
expect(Guard::Compat::UI).to receive(:error).with("No such file or directory - ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --")
204204
catch(:task_has_failed) { subject.run(['test/test_minitest.rb']) }
205205
end
206206

@@ -214,7 +214,7 @@
214214

215215
it 'passes :cli arguments' do
216216
expect(Kernel).to receive(:system).with(
217-
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard --seed 12345 --verbose"
217+
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --seed 12345 --verbose"
218218
) { system('true') }
219219

220220
subject.run(['test/test_minitest.rb'])
@@ -225,7 +225,7 @@
225225
let(:options) { { include: %w(lib app) } }
226226
it 'runs with specified directories included' do
227227
expect(Kernel).to receive(:system).with(
228-
"ruby -I\"test\" -I\"spec\" -I\"lib\" -I\"app\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard"
228+
"ruby -I\"test\" -I\"spec\" -I\"lib\" -I\"app\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --"
229229
) { system('true') }
230230

231231
subject.run(['test/test_minitest.rb'])
@@ -237,7 +237,7 @@
237237

238238
it 'does not require minitest/autorun' do
239239
expect(Kernel).to receive(:system).with(
240-
"ruby -I\"test\" -I\"spec\" -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard"
240+
"ruby -I\"test\" -I\"spec\" -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --"
241241
) { system('true') }
242242

243243
subject.run(['test/test_minitest.rb'])
@@ -249,7 +249,7 @@
249249
it 'sets env via all_env if running the full suite' do
250250
expect(Kernel).to receive(:system).with(
251251
{ 'TESTS_ALL' => 'true' },
252-
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard"
252+
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --"
253253
) { system('true') }
254254

255255
subject.run(['test/test_minitest.rb'], all: true)
@@ -261,7 +261,7 @@
261261
it 'allows string setting of all_env' do
262262
expect(Kernel).to receive(:system).with(
263263
{ 'TESTS_ALL' => 'true' },
264-
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard"
264+
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --"
265265
) { system('true') }
266266

267267
subject.run(['test/test_minitest.rb'], all: true)
@@ -273,7 +273,7 @@
273273
it 'runs with the specified environment' do
274274
expect(Kernel).to receive(:system).with(
275275
{ 'MINITEST_TEST' => 'test' },
276-
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard"
276+
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --"
277277
) { system('true') }
278278

279279
subject.run(['test/test_minitest.rb'])
@@ -285,7 +285,7 @@
285285
it 'merges the specified environment' do
286286
expect(Kernel).to receive(:system).with(
287287
{ 'MINITEST_TEST' => 'all', 'MINITEST' => 'true' },
288-
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard"
288+
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --"
289289
) { system('true') }
290290

291291
subject.run(['test/test_minitest.rb'], all: true)
@@ -300,7 +300,7 @@
300300
it 'runs without bundler and rubygems' do
301301
expect(Guard::Compat::UI).to receive(:info)
302302
expect(Kernel).to receive(:system).with(
303-
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard"
303+
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --"
304304
) { system('true') }
305305

306306
subject.run(['test/test_minitest.rb'])
@@ -311,7 +311,7 @@
311311
it 'runs without bundler but rubygems' do
312312
expect(Guard::Compat::UI).to receive(:info)
313313
expect(Kernel).to receive(:system).with(
314-
"ruby -I\"test\" -I\"spec\" -r rubygems -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard"
314+
"ruby -I\"test\" -I\"spec\" -r rubygems -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --"
315315
) { system('true') }
316316

317317
subject.run(['test/test_minitest.rb'])
@@ -329,7 +329,7 @@
329329
it 'runs with bundler' do
330330
expect(Guard::Compat::UI).to receive(:info)
331331
expect(Kernel).to receive(:system).with(
332-
"bundle exec ruby -I\"test\" -I\"spec\" -r bundler/setup -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard"
332+
"bundle exec ruby -I\"test\" -I\"spec\" -r bundler/setup -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --"
333333
) { system('true') }
334334

335335
subject.run(['test/test_minitest.rb'])
@@ -341,7 +341,7 @@
341341
it 'runs without bundler' do
342342
expect(Guard::Compat::UI).to receive(:info)
343343
expect(Kernel).to receive(:system).with(
344-
"ruby -I\"test\" -I\"spec\" -r rubygems -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard"
344+
"ruby -I\"test\" -I\"spec\" -r rubygems -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --"
345345
) { system('true') }
346346

347347
subject.run(['test/test_minitest.rb'])
@@ -353,7 +353,7 @@
353353
it 'runs without bundler' do
354354
expect(Guard::Compat::UI).to receive(:info)
355355
expect(Kernel).to receive(:system).with(
356-
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" -- --guard"
356+
"ruby -I\"test\" -I\"spec\" -r minitest/autorun -r ./test/test_minitest.rb#{@require_old_runner} -e \"\" --"
357357
) { system('true') }
358358

359359
subject.run(['test/test_minitest.rb'])
@@ -526,19 +526,11 @@
526526

527527
it 'still runs all if requested' do
528528
expect(Kernel).to receive(:system)
529-
.with("ruby -I\"test\" -I\"spec\" -r minitest/autorun#{@require_old_runner} -e \"\" -- --guard") { system('true') }
529+
.with("ruby -I\"test\" -I\"spec\" -r minitest/autorun#{@require_old_runner} -e \"\" --") { system('true') }
530530

531531
expect(subject.run([], all: true)).to eq true
532532
end
533533
end
534-
535-
it 'includes the --guard flag to signal minitest to load the plugin' do
536-
expect(Kernel).to receive(:system).with(
537-
a_string_starting_with('ruby').and(a_string_including('-- --guard'))
538-
) { system('true') }
539-
540-
subject.run(['test/test_minitest.rb'])
541-
end
542534
end
543535

544536
describe 'run_all' do

0 commit comments

Comments
 (0)