Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

JRuby specs need to be able to pass args to in_sub_process #152

Merged
merged 1 commit into from
Jan 7, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/rspec/support/spec/in_sub_process.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
module RSpec
module Support
module InSubProcess
if Process.respond_to?(:fork) && !(RUBY_PLATFORM == 'java' && RUBY_VERSION == '1.8.7')
if Process.respond_to?(:fork) && !(Ruby.jruby? && RUBY_VERSION == '1.8.7')

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

# Useful as a way to isolate a global change to a subprocess.

# rubocop:disable MethodLength
Expand Down Expand Up @@ -35,7 +36,7 @@ def in_sub_process(prevent_warnings=true)
raise exception if exception
end
else
def in_sub_process
def in_sub_process(*)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

skip "This spec requires forking to work properly, " \
"and your platform does not support forking"
end
Expand Down
2 changes: 1 addition & 1 deletion script/functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ function check_documentation_coverage {
}

function check_style_and_lint {
echo "bin/rubucop lib"
echo "bin/rubocop lib"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

bin/rubocop lib
}

Expand Down