byebug 2.1.1 → 2.2.0

data/test/kill_test.rb

@@ -1,7 +1,12 @@
 require_relative 'test_helper'
 
-class TestKill < TestDsl::TestCase
+class KillExample
+  def self.kill_me
+    'dieeee'
+  end
+end
 
+class TestKill < TestDsl::TestCase
   it 'must send signal to some pid' do
     Process.expects(:kill).with('USR1', Process.pid)
     enter 'kill USR1'

data/test/list_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
 class TestList < TestDsl::TestCase
-
   describe 'listsize' do
     it 'must show lines according to :listsize setting' do
       enter 'break 5', 'cont'
@@ -108,7 +107,7 @@ class TestList < TestDsl::TestCase
       debug_file 'list'
       check_error_includes 'Invalid line range'
       check_output_doesnt_include "[44, 44] in #{fullpath('list')}"
-      check_output_doesnt_include /^44  \S/
+      check_output_doesnt_include(/^44  \S/)
     end
 
     it 'must show nothing if range is incorrect' do

data/test/method_test.rb

@@ -1,41 +1,58 @@
 require_relative 'test_helper'
 
+class MethodExample
+  def initialize
+    @a = 'b'
+    @c = 'd'
+  end
+  def self.foo
+    "asdf"
+  end
+  def bla
+    "asdf"
+  end
+end
+
 class TestMethod < TestDsl::TestCase
   temporary_change_hash Byebug.settings, :autolist, 0
 
   describe 'show instance method of a class' do
+    before { enter 'break 4', 'cont' }
+
     it 'must show using full command name' do
-      enter 'break 15', 'cont', 'method MethodExample'
+      enter 'method MethodExample'
       debug_file 'method'
-      check_output_includes /bla/
-      check_output_doesnt_include /foo/
+      check_output_includes(/bla/)
+      check_output_doesnt_include(/foo/)
     end
 
     it 'must show using shortcut' do
-      enter 'break 15', 'cont', 'm MethodExample'
+      enter 'm MethodExample'
       debug_file 'method'
-      check_output_includes /bla/
+      check_output_includes(/bla/)
     end
 
     it 'must show an error if specified object is not a class or module' do
-      enter 'break 15', 'cont', 'm a'
+      enter 'm a'
       debug_file 'method'
       check_output_includes 'Should be Class/Module: a'
     end
   end
 
   describe 'show methods of an object' do
+    before { enter 'break 4', 'cont' }
+
     it 'must show using full command name' do
-      enter 'break 15', 'cont', 'method instance a'
+      enter 'method instance a'
       debug_file 'method'
-      check_output_includes /bla/
-      check_output_doesnt_include /foo/
+      check_output_includes(/bla/)
+      check_output_doesnt_include(/foo/)
     end
 
     it 'must show using shortcut' do
-      enter 'break 15', 'cont', 'm i a'
+      enter 'm i a'
       debug_file 'method'
-      check_output_includes /bla/
+      check_output_includes(/bla/)
     end
   end
 
@@ -46,14 +63,16 @@ class TestMethod < TestDsl::TestCase
   end
 
   describe 'show instance variables of an object' do
+    before { enter 'break 4', 'cont' }
+
     it 'must show using full name command' do
-      enter 'break 15', 'cont', 'method iv a'
+      enter 'method iv a'
       debug_file 'method'
       check_output_includes '@a = "b"', '@c = "d"'
     end
 
     it 'must show using shortcut' do
-      enter 'break 15', 'cont', 'm iv a'
+      enter 'm iv a'
       debug_file 'method'
       check_output_includes '@a = "b"', '@c = "d"'
     end

data/test/post_mortem_test.rb

@@ -1,25 +1,38 @@
 require_relative 'test_helper'
 
-class TestPostMortem < TestDsl::TestCase
+class PostMortemExample
+  def a
+    begin
+      Byebug.post_mortem do
+        z = 4
+        raise 'blabla'
+        x = 6
+        x + z
+      end
+    rescue => e
+      e
+    end
+  end
+end
 
+class TestPostMortem < TestDsl::TestCase
   describe 'Features' do
+    before { enter 'cont' }
+
     it 'must enter into post-mortem mode' do
-      enter 'cont'
       debug_file('post_mortem') { Byebug.post_mortem?.must_equal true }
     end
 
     it 'must stop at the correct line' do
-      enter 'cont'
       debug_file('post_mortem') { $state.line.must_equal 8 }
     end
 
     it 'must exit from post-mortem mode after stepping command' do
-      enter 'cont', 'break 12', 'cont'
+      enter "break #{__FILE__}:13", 'cont'
       debug_file('post_mortem') { Byebug.post_mortem?.must_equal false }
     end
 
     it 'must save the raised exception' do
-      enter 'cont'
       debug_file('post_mortem') {
         Byebug.last_exception.must_be_kind_of RuntimeError }
     end
@@ -76,23 +89,23 @@ class TestPostMortem < TestDsl::TestCase
       it 'must work in post-mortem mode' do
         enter 'cont', 'frame'
         debug_file('post_mortem') { $state.line.must_equal 8 }
-        check_output_includes \
-          /--> #0  block in CatchExample\.a\s+at #{@tst_file}:8/
+        check_output_includes(
+          /--> #0  block in PostMortemExample\.a\s+at #{__FILE__}:8/)
       end
     end
 
     describe 'condition' do
       it 'must be able to set conditions in post-mortem mode' do
-        enter 'cont', 'break 12',
+        enter 'cont', "break #{__FILE__}:13",
               ->{ "cond #{Byebug.breakpoints.first.id} true" }, 'cont'
-        debug_file('post_mortem') { $state.line.must_equal 12 }
+        debug_file('post_mortem') { $state.line.must_equal 13 }
       end
     end
 
     describe 'break' do
       it 'must be able to set breakpoints in post-mortem mode' do
-        enter 'cont', 'break 12', 'cont'
-        debug_file('post_mortem') { $state.line.must_equal 12 }
+        enter 'cont', "break #{__FILE__}:13",
+        debug_file('post_mortem') { $state.line.must_equal 13 }
       end
     end
 
@@ -105,15 +118,15 @@ class TestPostMortem < TestDsl::TestCase
     end
 
     describe 'reload' do
-      after { change_line_in_file(@tst_file, 7, '        z = 4') }
+      after { change_line_in_file(@tst_file, 4, 'c.a') }
 
       it 'must work in post-mortem mode' do
         enter 'cont', -> do
-          change_line_in_file(@tst_file, 7, 'z = 100')
+          change_line_in_file(@tst_file, 4, 'bo = BasicObject.new')
           'reload'
-        end, 'l 7-7'
+        end, 'up 3', 'l 4-4'
         debug_file 'post_mortem'
-        check_output_includes '7: z = 100'
+        check_output_includes '=> 4: bo = BasicObject.new'
       end
     end
 
@@ -132,7 +145,7 @@ class TestPostMortem < TestDsl::TestCase
       it 'must work in post-mortem mode' do
         enter 'cont', 'info line'
         debug_file 'post_mortem'
-        check_output_includes "Line 8 of \"#{@tst_file}\""
+        check_output_includes "Line 8 of \"#{__FILE__}\""
       end
     end
 
@@ -141,8 +154,8 @@ class TestPostMortem < TestDsl::TestCase
 
       it 'must work in post-mortem mode' do
         irb.stubs(:eval_input).throws(:IRB_EXIT, :cont)
-        enter 'cont', 'break 12', 'irb'
-        debug_file('post_mortem') { $state.line.must_equal 12 }
+        enter 'cont', 'break 13', 'irb'
+        debug_file('post_mortem') { $state.line.must_equal 13 }
       end
     end
 
@@ -181,7 +194,7 @@ class TestPostMortem < TestDsl::TestCase
       it 'must work in post-mortem mode' do
         enter 'cont'
         debug_file 'post_mortem'
-        check_output_includes "[3, 12] in #{@tst_file}"
+        check_output_includes "[3, 12] in #{__FILE__}"
       end
     end
 
@@ -189,7 +202,7 @@ class TestPostMortem < TestDsl::TestCase
       it 'must work in post-mortem mode' do
         enter 'cont', 'm i self'
         debug_file 'post_mortem'
-        check_output_includes /to_s/
+        check_output_includes(/to_s/)
       end
     end
 
@@ -251,7 +264,7 @@ class TestPostMortem < TestDsl::TestCase
       it "must work in post-mortem mode" do
         enter 'cont', 'thread list'
         debug_file('post_mortem')
-        check_output_includes /\+ \d+ #<Thread:(\S+) run/
+        check_output_includes(/\+ \d+ #<Thread:(\S+) run/)
       end
     end
   end

data/test/quit_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
 class TestQuit < TestDsl::TestCase
-
   it 'must quit if user confirmed' do
     Byebug::QuitCommand.any_instance.expects(:exit!)
     enter 'quit', 'y'

data/test/restart_test.rb

@@ -1,5 +1,11 @@
 require_relative 'test_helper'
 
+class RestartExample
+  def concat_args(a, b, c)
+    a.to_s + b.to_s + c.to_s
+  end
+end
+
 class TestRestart < TestDsl::TestCase
   describe 'usual restarting' do
     temporary_change_const Byebug, 'BYEBUG_SCRIPT', 'byebug_script'

data/test/set_test.rb

@@ -184,7 +184,7 @@ class TestSet < TestDsl::TestCase
     it 'must show help when typing just "set"' do
       enter 'set', 'cont'
       debug_file 'set'
-      check_output_includes /List of "set" subcommands:/
+      check_output_includes(/List of "set" subcommands:/)
     end
   end
 end

data/test/show_test.rb

@@ -9,7 +9,7 @@ class TestShow < TestDsl::TestCase
         enter 'show args'
         debug_file 'show'
         check_output_includes 'Argument list to give program being debugged ' \
-                            'when it is started is "foo bar".'
+                              'when it is started is "foo bar".'
       end
     end
 
@@ -160,16 +160,16 @@ class TestShow < TestDsl::TestCase
       end
 
       it 'must show history file' do
-        check_output_includes \
-          /filename: The command history file is "hist_file\.txt"/
+        check_output_includes(
+          /filename: The command history file is "hist_file\.txt"/)
       end
 
       it 'must show history save setting' do
-        check_output_includes /save: Saving of history save is on\./
+        check_output_includes(/save: Saving of history save is on\./)
       end
 
       it 'must show history length' do
-        check_output_includes /size: Byebug history size is 25/
+        check_output_includes(/size: Byebug history size is 25/)
       end
     end
 
@@ -217,8 +217,8 @@ class TestShow < TestDsl::TestCase
         it 'must show records from readline history' do
           enter 'show commands'
           debug_file 'show'
-          check_output_includes /1  aaa/
-          check_output_includes /6  fff/
+          check_output_includes(/1  aaa/)
+          check_output_includes(/6  fff/)
         end
       end
 
@@ -228,9 +228,9 @@ class TestShow < TestDsl::TestCase
         it 'must show last 10 records from readline history' do
           enter 'show commands'
           debug_file 'show'
-          check_output_doesnt_include /3  ddd/
-          check_output_includes /4  eee/
-          check_output_includes /13  nnn/
+          check_output_doesnt_include(/3  ddd/)
+          check_output_includes(/4  eee/)
+          check_output_includes(/13  nnn/)
         end
       end
 
@@ -241,17 +241,17 @@ class TestShow < TestDsl::TestCase
           # Really don't know why it substracts 4, and shows starting from position 6
           enter 'show commands 10'
           debug_file 'show'
-          check_output_doesnt_include /5  fff/
-          check_output_includes /6  ggg/
-          check_output_includes /13  nnn/
+          check_output_doesnt_include(/5  fff/)
+          check_output_includes(/6  ggg/)
+          check_output_includes(/13  nnn/)
         end
 
         it 'must adjust first line if it is < 0' do
           enter 'show commands 3'
           debug_file 'show'
-          check_output_includes /1  bbb/
-          check_output_includes /8  iii/
-          check_output_doesnt_include /9  jjj/
+          check_output_includes(/1  bbb/)
+          check_output_includes(/8  iii/)
+          check_output_doesnt_include(/9  jjj/)
         end
       end
     end
@@ -261,7 +261,7 @@ class TestShow < TestDsl::TestCase
     it 'must show help when typing just "show"' do
       enter 'show', 'cont'
       debug_file 'show'
-      check_output_includes /List of "show" subcommands:/
+      check_output_includes(/List of "show" subcommands:/)
     end
   end
 end

data/test/source_test.rb

@@ -1,6 +1,7 @@
 require_relative 'test_helper'
 
 class TestSource < TestDsl::TestCase
+  let(:filename) { 'source_example.txt' }
 
   before { File.open(filename, 'w') do |f|
              f.puts 'break 2'
@@ -9,8 +10,6 @@ class TestSource < TestDsl::TestCase
 
   after { FileUtils.rm(filename) }
 
-  let(:filename) { 'source_example.txt' }
-
   it 'must run commands from file' do
     enter "source #{filename}"
     debug_file 'source' do
@@ -28,7 +27,7 @@ class TestSource < TestDsl::TestCase
   it 'must show an error if file is not found' do
     enter 'source blabla'
     debug_file 'source'
-    check_error_includes /File ".*blabla" not found/
+    check_error_includes(/File ".*blabla" not found/)
   end
 
   describe 'Help' do

data/test/stepping_test.rb

@@ -1,11 +1,27 @@
 require_relative 'test_helper'
 
-class TestStepping < TestDsl::TestCase
+class SteppingExample
+  def self.a(num)
+    num += 2
+    b(num)
+  end
+
+  def self.b(num)
+    v2 = 5 if 1 == num ; [1, 2, v2].map { |a| a.to_f }
+    c(num)
+  end
+
+  def self.c(num)
+    num += 4
+    num
+  end
+end
 
+class TestStepping < TestDsl::TestCase
   describe 'Next Command' do
 
     describe 'method call behaviour' do
-      before { enter 'break 10', 'cont' }
+      before { enter "break #{__FILE__}:10", 'cont' }
 
       it 'must leave on the same line by default' do
         enter 'next'
@@ -40,6 +56,14 @@ class TestStepping < TestDsl::TestCase
           debug_file('stepping') { $state.line.must_equal 21 }
         end
 
+        it 'must inform when not staying in the same frame' do
+          enter 'next 2'
+          debug_file('stepping')
+          check_output_includes \
+            'Next went up a frame because previous frame finished'
+        end
+
+
         it 'must ignore it if "minus" is specified' do
           enter 'next-'
           debug_file('stepping') { $state.line.must_equal 10 }
@@ -48,11 +72,11 @@ class TestStepping < TestDsl::TestCase
     end
 
     describe 'block behaviour' do
-      before { enter 'break 21', 'cont' }
+      before { enter 'break 4', 'cont' }
 
       it 'must step over blocks' do
         enter 'next'
-        debug_file('stepping') { $state.line.must_equal 25 }
+        debug_file('stepping') { $state.line.must_equal 8 }
       end
     end
   end
@@ -60,7 +84,7 @@ class TestStepping < TestDsl::TestCase
   describe 'Step Command' do
 
     describe 'method call behaviour' do
-      before { enter 'break 10', 'cont' }
+      before { enter "break #{__FILE__}:10", 'cont' }
 
       it 'must leave on the same line if forced by a setting' do
         enter 'step'
@@ -98,11 +122,11 @@ class TestStepping < TestDsl::TestCase
     end
 
     describe 'block behaviour' do
-      before { enter 'break 21', 'cont' }
+      before { enter 'break 4', 'cont' }
 
       it 'must step into blocks' do
         enter 'step'
-        debug_file('stepping') { $state.line.must_equal 22 }
+        debug_file('stepping') { $state.line.must_equal 5 }
       end
     end
   end