2 files changed, 45 insertions, 1 deletions
diff --git a/spec/ruby/core/kernel/rand_spec.rb b/spec/ruby/core/kernel/rand_spec.rb
index 843b5d10a2..a82b4fba74 100644
--- a/spec/ruby/core/kernel/rand_spec.rb
+++ b/spec/ruby/core/kernel/rand_spec.rb
@@ -138,6 +138,16 @@ describe "Kernel.rand" do
     rand(KernelSpecs::CustomRangeFloat.new(1.0)..KernelSpecs::CustomRangeFloat.new(42.0)).should be_an_instance_of(KernelSpecs::CustomRangeFloat)
     rand(Time.now..Time.now).should be_an_instance_of(Time)
   end
+
+  it "is random on boot" do
+    results = 2.times.map {
+      out = ruby_exe('p rand', options: '--disable-gems')
+      Float(out)
+    }
+    results.size.should == 2
+    # this is technically flaky, but very unlikely in a good distribution
+    results[0].should_not == results[1]
+  end
 end
 
 describe "Kernel#rand" do
diff --git a/spec/ruby/core/kernel/shared/load.rb b/spec/ruby/core/kernel/shared/load.rb
index 14bf5f27da..120619abef 100644
--- a/spec/ruby/core/kernel/shared/load.rb
+++ b/spec/ruby/core/kernel/shared/load.rb
@@ -1,3 +1,5 @@
+main = self
+
 describe :kernel_load, shared: true do
   before :each do
     CodeLoadingSpecs.spec_setup
@@ -95,13 +97,45 @@ describe :kernel_load, shared: true do
       @object.load(path, true)
 
       Object.const_defined?(:LoadSpecWrap).should be_false
+
+      wrap_module = ScratchPad.recorded[1]
+      wrap_module.should be_an_instance_of(Module)
     end
 
     it "allows referencing outside namespaces" do
       path = File.expand_path "wrap_fixture.rb", CODE_LOADING_DIR
       @object.load(path, true)
 
-      ScratchPad.recorded.first.should be_an_instance_of(Class)
+      ScratchPad.recorded[0].should equal(String)
+    end
+
+    it "sets self as a copy of the top-level main" do
+      path = File.expand_path "wrap_fixture.rb", CODE_LOADING_DIR
+      @object.load(path, true)
+
+      top_level = ScratchPad.recorded[2]
+      top_level.to_s.should == "main"
+      top_level.method(:to_s).owner.should == top_level.singleton_class
+      top_level.should_not equal(main)
+      top_level.should be_an_instance_of(Object)
+    end
+
+    it "includes modules included in main's singleton class in self's class" do
+      mod = Module.new
+      main.extend(mod)
+
+      main_ancestors = main.singleton_class.ancestors[1..-1]
+      main_ancestors.first.should == mod
+
+      path = File.expand_path "wrap_fixture.rb", CODE_LOADING_DIR
+      @object.load(path, true)
+
+      top_level = ScratchPad.recorded[2]
+      top_level_ancestors = top_level.singleton_class.ancestors[-main_ancestors.size..-1]
+      top_level_ancestors.should == main_ancestors
+
+      wrap_module = ScratchPad.recorded[1]
+      top_level.singleton_class.ancestors.should == [top_level.singleton_class, wrap_module, *main_ancestors]
     end
 
     describe "with top-level methods" do