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: 6fa17513a89a
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1638c2f19ae1
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 16, 2015

  1. Squashed 'spec/ruby/' changes from 77c82b3..a27965a 

    a27965a Always splat the argument in Kernel#singleton_methods specs.
b74f8a3 Add spec for z super with a block.
dca8864 Added keyword argument specs for Proc#parameters.
bca8881 String#each_char should taint the resulting strings if self is tainted.
28bee91 Added specs for int coercion to String#setbyte.
8774b86 Remove completely implementation-dependent behavior.
f2fc11e remove implementation details

git-subtree-dir: spec/ruby
git-subtree-split: a27965a426ffe12f7c033784f581c94b479f5fc5
    @eregon
    eregon committed May 16, 2015
    Copy the full SHA
    c75a7c3 View commit details

  2. Merge commit 'c75a7c39f86feed83736a0b25417dce79b03c8f4'

    @eregon
    eregon committed May 16, 2015
    Copy the full SHA
    1638c2f View commit details
Showing with 0 additions and 36 deletions.
  1. +0 −33 spec/ruby/core/module/autoload_spec.rb
  2. +0 −3 spec/ruby/core/module/fixtures/autoload_n.rb
33 changes: 0 additions & 33 deletions spec/ruby/core/module/autoload_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -441,36 +441,3 @@ class ModuleSpecs::Autoload::Z < ModuleSpecs::Autoload::ZZ
end
end
end

describe "Module#autoload" do
# It would be nice to check this with a simple obj.should_not_receive,
# but getting at that obj is implementation specific. This method is the
# least implementation specific because it inserts the method that raises
# an exception into the dynamic lookup chain.
before :all do
module Kernel
alias_method :original_require, :require
alias_method :original_load, :load

def require(name)
raise Exception, "Kernel#require called"
end

def load(name)
raise Exception, "Kernel#load called"
end
end
end

after :all do
module Kernel
alias_method :require, :original_require
alias_method :load, :original_load
end
end

it "does not call Kernel#require or Kernel#load dynamically" do
ModuleSpecs::Autoload.autoload :N, fixture(__FILE__, "autoload_n.rb")
ModuleSpecs::Autoload::N.should == :autoload_n
end
end
3 changes: 0 additions & 3 deletions spec/ruby/core/module/fixtures/autoload_n.rb
View file

This file was deleted.