Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: eabb23a1ffeb
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 40ffc7d54b63
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 3, 2015

  1. Add a spec to ensure Module#prepended is called by #prepend

    @eregon
    eregon committed Jul 3, 2015
    Copy the full SHA
    273b498 View commit details

  2. [Truffle] Do not add flags when running explicitely with MRI.

    @eregon
    eregon committed Jul 3, 2015
    Copy the full SHA
    40ffc7d View commit details
Showing with 20 additions and 1 deletion.
  1. +16 −0 spec/ruby/core/module/prepended_spec.rb
  2. +4 −1 spec/truffle/truffle.mspec
16 changes: 16 additions & 0 deletions spec/ruby/core/module/prepended_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,23 @@
require File.expand_path('../../../spec_helper', __FILE__)

describe "Module#prepended" do
before :each do
ScratchPad.clear
end

it "is a private method" do
Module.should have_private_instance_method(:prepended, true)
end

it "is invoked when self is prepended to another module or class" do
m = Module.new do
def self.prepended(o)
ScratchPad.record o
end
end

c = Class.new { prepend m }

ScratchPad.recorded.should == c
end
end
5 changes: 4 additions & 1 deletion spec/truffle/truffle.mspec
View file
Original file line number Diff line number Diff line change
@@ -5,7 +5,10 @@ class MSpecScript
end

set :target, File.expand_path("../../../bin/jruby#{windows? ? '.bat' : ''}", __FILE__)
set :flags, %w[-X+T -J-ea -J-Xmx2G]

if ARGV[-2..-1] != %w[-t ruby] # No flags for MRI
set :flags, %w[-X+T -J-ea -J-Xmx2G]
end

set :language, [
"spec/ruby/language"