Update to ruby/spec@519df35

5 files changed, 76 insertions, 0 deletions

diff --git a/spec/ruby/core/thread/backtrace/location/fixtures/classes.rb b/spec/ruby/core/thread/backtrace/location/fixtures/classes.rb
index 3e42d8cf81..e903c3e450 100644
--- a/spec/ruby/core/thread/backtrace/location/fixtures/classes.rb
+++ b/spec/ruby/core/thread/backtrace/location/fixtures/classes.rb
@@ -14,4 +14,22 @@ module ThreadBacktraceLocationSpecs
       return caller_locations(0)
     end
   end
+
+  def self.locations_inside_nested_blocks
+    first_level_location = nil
+    second_level_location = nil
+    third_level_location = nil
+
+    1.times do
+      first_level_location = locations[0]
+      1.times do
+        second_level_location = locations[0]
+        1.times do
+          third_level_location = locations[0]
+        end
+      end
+    end
+
+    [first_level_location, second_level_location, third_level_location]
+  end
 end
diff --git a/spec/ruby/core/thread/backtrace/location/fixtures/locations_in_main.rb b/spec/ruby/core/thread/backtrace/location/fixtures/locations_in_main.rb
new file mode 100644
index 0000000000..b124c8161c
--- /dev/null
+++ b/spec/ruby/core/thread/backtrace/location/fixtures/locations_in_main.rb
@@ -0,0 +1,5 @@
+1.times do
+  puts Thread.current.backtrace_locations(1..1)[0].label
+end
+
+require_relative 'locations_in_required'
diff --git a/spec/ruby/core/thread/backtrace/location/fixtures/locations_in_required.rb b/spec/ruby/core/thread/backtrace/location/fixtures/locations_in_required.rb
new file mode 100644
index 0000000000..5f5ed89e98
--- /dev/null
+++ b/spec/ruby/core/thread/backtrace/location/fixtures/locations_in_required.rb
@@ -0,0 +1,3 @@
+1.times do
+  puts Thread.current.backtrace_locations(1..1)[0].label
+end
diff --git a/spec/ruby/core/thread/backtrace/location/label_spec.rb b/spec/ruby/core/thread/backtrace/location/label_spec.rb
index be8da5646f..7312d017e5 100644
--- a/spec/ruby/core/thread/backtrace/location/label_spec.rb
+++ b/spec/ruby/core/thread/backtrace/location/label_spec.rb
@@ -17,4 +17,21 @@ describe 'Thread::Backtrace::Location#label' do
   it 'returns the module name for a module location' do
     ThreadBacktraceLocationSpecs::MODULE_LOCATION[0].label.should include "ThreadBacktraceLocationSpecs"
   end
+
+  it 'includes the nesting level of a block as part of the location label' do
+    first_level_location, second_level_location, third_level_location =
+      ThreadBacktraceLocationSpecs.locations_inside_nested_blocks
+
+    first_level_location.label.should == 'block in locations_inside_nested_blocks'
+    second_level_location.label.should == 'block (2 levels) in locations_inside_nested_blocks'
+    third_level_location.label.should == 'block (3 levels) in locations_inside_nested_blocks'
+  end
+
+  it 'sets the location label for a top-level block differently depending on it being in the main file or a required file' do
+    path = fixture(__FILE__, "locations_in_main.rb")
+    main_label, required_label = ruby_exe(path).lines
+
+    main_label.should == "block in <main>\n"
+    required_label.should == "block in <top (required)>\n"
+  end
 end
diff --git a/spec/ruby/core/thread/backtrace_locations_spec.rb b/spec/ruby/core/thread/backtrace_locations_spec.rb
new file mode 100644
index 0000000000..66947f8ea6
--- /dev/null
+++ b/spec/ruby/core/thread/backtrace_locations_spec.rb
@@ -0,0 +1,33 @@
+require_relative '../../spec_helper'
+
+describe "Thread#backtrace_locations" do
+  it "returns an Array" do
+    locations = Thread.current.backtrace_locations
+    locations.should be_an_instance_of(Array)
+    locations.should_not be_empty
+  end
+
+  it "sets each element to a Thread::Backtrace::Location" do
+    locations = Thread.current.backtrace_locations
+    locations.each { |loc| loc.should be_an_instance_of(Thread::Backtrace::Location) }
+  end
+
+  it "can be called on any Thread" do
+    locations = Thread.new { Thread.current.backtrace_locations }.value
+    locations.should be_an_instance_of(Array)
+    locations.should_not be_empty
+    locations.each { |loc| loc.should be_an_instance_of(Thread::Backtrace::Location) }
+  end
+
+  it "without argument is the same as showing all locations with 0..-1" do
+    Thread.current.backtrace_locations.map(&:to_s).should == Thread.current.backtrace_locations(0..-1).map(&:to_s)
+  end
+
+  it "the first location reports the call to #backtrace_locations" do
+    Thread.current.backtrace_locations(0..0)[0].to_s.should == "#{__FILE__ }:#{__LINE__ }:in `backtrace_locations'"
+  end
+
+  it "[1..-1] is the same as #caller_locations(0..-1) for Thread.current" do
+    Thread.current.backtrace_locations(1..-1).map(&:to_s).should == caller_locations(0..-1).map(&:to_s)
+  end
+end