Skip to content

Commit baa5f15

Browse files
deivid-rodriguezk0kubun
authored andcommitted
Sync Bundler and adapt to new spec setup
1 parent 89bcc63 commit baa5f15

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

spec/bin/parallel_rspec

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
#!/usr/bin/env ruby
22
# frozen_string_literal: true
33

4-
require_relative "../../spec/bundler/support/rubygems_ext"
5-
6-
require_relative "../../spec/bundler/support/switch_rubygems"
7-
8-
require "rubygems"
9-
$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
4+
require_relative "../bundler/support/setup"
105

116
require "turbo_tests"
127
TurboTests::CLI.new(ARGV).run

spec/bundler/bin/parallel_rspec

Lines changed: 0 additions & 7 deletions
This file was deleted.

tool/sync_default_gems.rb

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,12 @@ def sync_default_gems(gem)
145145
File.write("lib/bundler/bundler.gemspec", gemspec_content)
146146

147147
cp_r("#{upstream}/bundler/spec", "spec/bundler")
148+
rm_rf("spec/bundler/bin")
149+
150+
parallel_tests_content = File.read("#{upstream}/bundler/bin/parallel_rspec").gsub("../spec", "../bundler")
151+
File.write("spec/bin/parallel_rspec", parallel_tests_content)
152+
chmod("+x", "spec/bin/parallel_rspec")
153+
148154
%w[dev_gems test_gems rubocop_gems standard_gems].each do |gemfile|
149155
cp_r("#{upstream}/tool/bundler/#{gemfile}.rb", "tool/bundler")
150156
end

0 commit comments

Comments
 (0)