byebug 1.5.0 → 1.6.0

data/test/conditions_test.rb

@@ -14,12 +14,12 @@ class TestConditions < TestDsl::TestCase
 
       it 'must stop at the breakpoint if condition is true' do
         enter ->{ "cond #{Byebug.breakpoints.first.id} b == 5" }, 'cont'
-        debug_file('conditions') { state.line.must_equal 3 }
+        debug_file('conditions') { $state.line.must_equal 3 }
       end
 
       it 'must work with full command name too' do
         enter ->{ "condition #{Byebug.breakpoints.first.id} b == 5" }, 'cont'
-        debug_file('conditions') { state.line.must_equal 3 }
+        debug_file('conditions') { $state.line.must_equal 3 }
       end
     end
 
@@ -28,7 +28,7 @@ class TestConditions < TestDsl::TestCase
 
       it 'must not stop at the breakpoint if condition is false' do
         enter ->{ "cond #{Byebug.breakpoints.first.id} b == 3" }, 'cont'
-        debug_file('conditions') { state.line.must_equal 4 }
+        debug_file('conditions') { $state.line.must_equal 4 }
       end
 
       it 'must assign expression to breakpoint in spite of incorrect syntax' do
@@ -39,7 +39,7 @@ class TestConditions < TestDsl::TestCase
 
       it 'must ignore the condition if when incorrect syntax' do
         enter ->{ "cond #{Byebug.breakpoints.first.id} b ==" },  'cont'
-        debug_file('conditions') { state.line.must_equal 4 }
+        debug_file('conditions') { $state.line.must_equal 4 }
       end
     end
   end
@@ -53,7 +53,7 @@ class TestConditions < TestDsl::TestCase
     end
 
     it 'must unconditionally stop on the breakpoint' do
-      debug_file('conditions') { state.line.must_equal 3 }
+      debug_file('conditions') { $state.line.must_equal 3 }
     end
   end
 
@@ -66,7 +66,7 @@ class TestConditions < TestDsl::TestCase
 
     it 'must not set breakpoint condition if breakpoint id is incorrect' do
       enter 'break 3', 'cond 8 b == 3', 'cont'
-      debug_file('conditions') { state.line.must_equal 3 }
+      debug_file('conditions') { $state.line.must_equal 3 }
     end
   end
 
@@ -74,7 +74,7 @@ class TestConditions < TestDsl::TestCase
     it 'must be able to set conditions in post-mortem mode' do
       enter 'cont', 'break 12', ->{ "cond #{Byebug.breakpoints.first.id} true" },
             'cont'
-      debug_file('post_mortem') { state.line.must_equal 12 }
+      debug_file('post_mortem') { $state.line.must_equal 12 }
     end
   end
 

data/test/continue_test.rb

@@ -5,29 +5,29 @@ class TestContinue < TestDsl::TestCase
   describe "successful" do
     it "must continue up to breakpoint if no line specified" do
       enter 'break 4', 'continue'
-      debug_file('continue') { state.line.must_equal 4 }
+      debug_file('continue') { $state.line.must_equal 4 }
     end
 
     it "must work in abbreviated mode too" do
       enter 'break 4', 'cont'
-      debug_file('continue') { state.line.must_equal 4 }
+      debug_file('continue') { $state.line.must_equal 4 }
     end
 
     it "must continue up to specified line" do
       enter 'cont 4'
-      debug_file('continue') { state.line.must_equal 4 }
+      debug_file('continue') { $state.line.must_equal 4 }
     end
   end
 
   describe "unsuccessful" do
     it "must ignore the command if specified line is not valid" do
       enter 'cont 123'
-      debug_file('continue') { state.line.must_equal 2 }
+      debug_file('continue') { $state.line.must_equal 2 }
     end
 
     it "must show error if specified line is not valid" do
       enter 'cont 123'
-      debug_file('continue')
+      debug_file 'continue'
       check_output_includes "Line 123 is not a stopping point in file " \
                             "\"#{fullpath('continue')}\"", interface.error_queue
     end

data/test/display_test.rb

@@ -16,7 +16,7 @@ class TestDisplay < TestDsl::TestCase
 
   it 'must save displayed expressions' do
     enter 'display d + 1'
-    debug_file('display') { state.display.must_equal [[true, 'd + 1']] }
+    debug_file('display') { $state.display.must_equal [[true, 'd + 1']] }
   end
 
   it 'displays all expressions available' do
@@ -47,7 +47,7 @@ class TestDisplay < TestDsl::TestCase
 
         it 'must set all expressions saved to "false"' do
           debug_file('display') {
-            state.display.must_equal [[false, 'abc'], [false, 'd']] }
+           $state.display.must_equal [[false, 'abc'], [false, 'd']] }
         end
 
         it 'must not show any output' do
@@ -61,7 +61,7 @@ class TestDisplay < TestDsl::TestCase
 
         it 'must set all expressions saved to "false"' do
           debug_file('display') {
-            state.display.must_equal [[true, 'abc'], [true, 'd']] }
+           $state.display.must_equal [[true, 'abc'], [true, 'd']] }
         end
 
         it 'must not show any output' do
@@ -81,7 +81,7 @@ class TestDisplay < TestDsl::TestCase
 
       it 'must set inactive positions' do
         debug_file('display') {
-          state.display.must_equal [[nil, 'abc'], [true, 'd']] }
+         $state.display.must_equal [[nil, 'abc'], [true, 'd']] }
       end
 
       it 'must display only the active position' do
@@ -99,7 +99,7 @@ class TestDisplay < TestDsl::TestCase
   describe 'disable' do
     it 'must disable a position' do
       enter 'display d', 'disable display 1'
-      debug_file('display') { state.display.must_equal [[false, 'd']] }
+      debug_file('display') { $state.display.must_equal [[false, 'd']] }
     end
 
     it 'must show an error if no displays are set' do
@@ -120,7 +120,7 @@ class TestDisplay < TestDsl::TestCase
   describe 'enable' do
     it 'must enable a position' do
       enter 'display d', 'disable display 1', 'enable display 1'
-      debug_file('display') { state.display.must_equal [[true, 'd']] }
+      debug_file('display') { $state.display.must_equal [[true, 'd']] }
     end
   end
 

data/test/edit_test.rb

@@ -29,8 +29,8 @@ class TestEdit < TestDsl::TestCase
 
     it 'must open specified line in specified file with configured editor' do
       Byebug::Edit.any_instance.expects(:system).
-                                with("editr +3 #{fullpath('breakpoint1')}")
-      enter "edit #{fullpath('breakpoint1')}:3"
+                                with("editr +3 #{fullpath('breakpoint')}")
+      enter "edit #{fullpath('breakpoint')}:3"
       debug_file 'edit'
     end
   end

data/test/examples/breakpoint_deep.rb

@@ -0,0 +1,24 @@
+class SteppingExample
+  def a
+    z = 2
+    b
+  end
+
+  def b
+    v2 = 5 if 1 == 2 ; [1,2,3].map { |a| a.to_f }
+    c
+  end
+
+  def c
+    z = 4
+    5
+    byebug
+  end
+end
+
+ex = SteppingExample.new.a
+2.times do
+  ex += 1
+end
+
+ex

data/test/finish_test.rb

@@ -4,22 +4,22 @@ class TestFinish < TestDsl::TestCase
 
   it 'must stop at the next frame by default' do
     enter 'break 16', 'cont', 'finish'
-    debug_file('finish') { state.line.must_equal 13 }
+    debug_file('finish') { $state.line.must_equal 13 }
   end
 
   it 'must stop at the #0 frame by default' do
     enter 'break 16', 'cont', 'finish 0'
-    debug_file('finish') { state.line.must_equal 13 }
+    debug_file('finish') { $state.line.must_equal 13 }
   end
 
   it 'must stop at the specified frame' do
     enter 'break 16', 'cont', 'finish 1'
-    debug_file('finish') { state.line.must_equal 9 }
+    debug_file('finish') { $state.line.must_equal 9 }
   end
 
   it 'must stop at the next frame if the current frame was changed' do
     enter 'break 16', 'cont', 'up', 'finish'
-    debug_file('finish') { state.line.must_equal 9 }
+    debug_file('finish') { $state.line.must_equal 9 }
   end
 
   describe 'not a number is specified for frame' do
@@ -31,7 +31,7 @@ class TestFinish < TestDsl::TestCase
     end
 
     it 'must be on the same line' do
-      debug_file('finish') { state.line.must_equal 16 }
+      debug_file('finish') { $state.line.must_equal 16 }
     end
   end
 

data/test/frame_test.rb

@@ -4,32 +4,32 @@ class TestFrame < TestDsl::TestCase
 
   it 'must go up' do
     enter 'break 16', 'cont', 'up'
-    debug_file('frame') { state.line.must_equal 12 }
+    debug_file('frame') { $state.line.must_equal 12 }
   end
 
   it 'must go up by specific number of frames' do
     enter 'break 16', 'cont', 'up 2'
-    debug_file('frame') { state.line.must_equal 8 }
+    debug_file('frame') { $state.line.must_equal 8 }
   end
 
   it 'must go down' do
     enter 'break 16', 'cont', 'up', 'down'
-    debug_file('frame') { state.line.must_equal 16 }
+    debug_file('frame') { $state.line.must_equal 16 }
   end
 
   it 'must go down by specific number of frames' do
     enter 'break 16', 'cont', 'up 3', 'down 2'
-    debug_file('frame') { state.line.must_equal 12 }
+    debug_file('frame') { $state.line.must_equal 12 }
   end
 
   it 'must set frame' do
     enter 'break 16', 'cont', 'frame 2'
-    debug_file('frame') { state.line.must_equal 8 }
+    debug_file('frame') { $state.line.must_equal 8 }
   end
 
   it 'must set frame to the first one by default' do
     enter 'break 16', 'cont', 'up', 'frame'
-    debug_file('frame') { state.line.must_equal 16 }
+    debug_file('frame') { $state.line.must_equal 16 }
   end
 
   it 'must print current stack frame when without arguments' do
@@ -40,29 +40,27 @@ class TestFrame < TestDsl::TestCase
 
   it 'must set frame to the first one' do
     enter 'break 16', 'cont', 'up', 'frame 0'
-    debug_file('frame') { state.line.must_equal 16 }
+    debug_file('frame') { $state.line.must_equal 16 }
   end
 
   it 'must set frame to the last one' do
     enter 'break 16', 'cont', 'bt', 'frame -1'
-    debug_file('frame') { state.file.must_match /minitest\/unit.rb/ }
+    debug_file('frame') { $state.file.must_match /minitest\/unit.rb/ }
     check_output_doesnt_include "at #{fullpath('frame')}:"
   end
 
   it 'must not set frame if the frame number is too low' do
     enter 'break 16', 'cont', 'down'
-    debug_file('frame') { state.line.must_equal 16 }
+    debug_file('frame') { $state.line.must_equal 16 }
     check_output_includes \
-      'Adjusting would put us beyond the newest (innermost) frame.',
-      interface.error_queue
+      'Adjusting would put us beyond the newest frame.', interface.error_queue
   end
 
   it 'must not set frame if the frame number is too high' do
     enter 'break 16', 'cont', 'up 100'
-    debug_file('frame') { state.line.must_equal 16 }
+    debug_file('frame') { $state.line.must_equal 16 }
     check_output_includes \
-      'Adjusting would put us beyond the oldest (initial) frame.',
-      interface.error_queue
+      'Adjusting would put us beyond the oldest frame.', interface.error_queue
   end
 
   describe 'when byebug is started deep in the callstack' do
@@ -77,17 +75,17 @@ class TestFrame < TestDsl::TestCase
 
     it 'must go up' do
       enter 'break 16', 'cont', 'up'
-      debug_file('frame_deep') { state.line.must_equal 13 }
+      debug_file('frame_deep') { $state.line.must_equal 13 }
     end
 
     it 'must go down' do
       enter 'break 16', 'cont', 'up', 'down'
-      debug_file('frame_deep') { state.line.must_equal 16 }
+      debug_file('frame_deep') { $state.line.must_equal 16 }
     end
 
     it 'must set frame' do
       enter 'break 16', 'cont', 'frame 2'
-      debug_file('frame_deep') { state.line.must_equal 8 }
+      debug_file('frame_deep') { $state.line.must_equal 8 }
     end
 
     it 'must eval properly when scaling the stack' do
@@ -131,17 +129,17 @@ class TestFrame < TestDsl::TestCase
   end
 
   describe 'callstyle' do
-    describe 'last' do
-      temporary_change_hash Byebug::Command.settings, :callstyle, :last
+    describe 'long' do
+      temporary_change_hash Byebug::Command.settings, :callstyle, :long
 
-      it 'displays current backtrace with callstyle "last"' do
+      it 'displays current backtrace with callstyle "long"' do
         enter 'break 16', 'cont', 'where'
         debug_file 'frame'
         check_output_includes \
-          /--> #0  A.d(e#String) at #{fullpath('frame')}:16/x,
-              /#1  A.c at #{fullpath('frame')}:12/x          ,
-              /#2  A.b at #{fullpath('frame')}:8/x           ,
-              /#3  A.a at #{fullpath('frame')}:5/x
+          /--> #0 A.d(e#String) at #{fullpath('frame')}:16/x,
+              /#1 A.c at #{fullpath('frame')}:12/x          ,
+              /#2 A.b at #{fullpath('frame')}:8/x           ,
+              /#3 A.a at #{fullpath('frame')}:5/x
       end
     end
 
@@ -151,19 +149,10 @@ class TestFrame < TestDsl::TestCase
       it 'displays current backtrace with callstyle "short"' do
           enter 'break 16', 'cont', 'where'
           debug_file 'frame'
-          check_output_includes /--> #0  d(e) at #{fullpath('frame')}:16/x,
-                                /#1  c at #{fullpath('frame')}:12/x,
-                                /#2  b at #{fullpath('frame')}:8/x,
-                                /#3  a at #{fullpath('frame')}:5/x
-      end
-    end
-
-    describe 'tracked' do
-      temporary_change_hash Byebug::Command.settings, :callstyle, :tracked
-
-      it 'displays current backtrace with callstyle "tracked"' do
-        skip 'XXX: Style supported but not working....'
-        debug_file 'frame'
+          check_output_includes /--> #0 d(e) at #{fullpath('frame')}:16/x,
+                                    /#1 c at #{fullpath('frame')}:12/x,
+                                    /#2 b at #{fullpath('frame')}:8/x,
+                                    /#3 a at #{fullpath('frame')}:5/x
       end
     end
   end
@@ -171,7 +160,7 @@ class TestFrame < TestDsl::TestCase
   describe 'Post Mortem' do
     it 'must work in post-mortem mode' do
       enter 'cont', 'frame'
-      debug_file('post_mortem') { state.line.must_equal 8 }
+      debug_file('post_mortem') { $state.line.must_equal 8 }
     end
   end
 

data/test/jump_test.rb

@@ -6,7 +6,7 @@ class TestJump < TestDsl::TestCase
     it "must jump with absolute line number" do
       skip("No jumping for now")
       enter 'break 6', 'cont', "jump 8 #{fullpath('jump')}"
-      debug_file('jump') { state.line.must_equal 8 }
+      debug_file('jump') { $state.line.must_equal 8 }
     end
 
     it "must not initialize skipped variables during jump" do
@@ -20,13 +20,13 @@ class TestJump < TestDsl::TestCase
     it "must jump with relative line number (-)" do
       skip("No jumping for now")
       enter 'break 8', 'cont', "jump -2 #{fullpath('jump')}"
-      debug_file('jump') { state.line.must_equal 6 }
+      debug_file('jump') { $state.line.must_equal 6 }
     end
 
     it "must jump with relative line number (+)" do
       skip("No jumping for now")
       enter 'break 8', 'cont', "jump +2 #{fullpath('jump')}"
-      debug_file('jump') { state.line.must_equal 10 }
+      debug_file('jump') { $state.line.must_equal 10 }
     end
   end
 
@@ -50,7 +50,7 @@ class TestJump < TestDsl::TestCase
       it "must not jump to there" do
         skip("No jumping for now")
         enter "jump 13 #{fullpath('jump')}"
-        debug_file('jump') { state.line.must_equal 3 }
+        debug_file('jump') { $state.line.must_equal 3 }
       end
 
       it "must show an error" do
@@ -68,11 +68,10 @@ class TestJump < TestDsl::TestCase
     it "must work in post-mortem mode" do
       skip 'No jumping for now plus this test fails with "Segmentation '     \
            'fault". Probably need to fix it somehow or forbid this command ' \
-           'in post mortem mode. Seems like state.context.frame_file and '   \
-           'state.context.frame_line cause that.'
+           'in post mortem mode. Seems like $state.context.frame_file and '  \
+           '$state.context.frame_line cause that.'
       enter 'cont', 'jump 12'
       debug_file 'post_mortem'
     end
   end
-
 end

data/test/list_test.rb

@@ -161,7 +161,7 @@ class TestList < TestDsl::TestCase
   end
 
   it 'must show an error when there is no such file' do
-    enter ->{state.file = 'blabla'; 'list 4-4'}
+    enter -> { $state.file = 'blabla'; 'list 4-4' }
     debug_file 'list'
     check_output_includes 'No sourcefile available for blabla',
                           interface.error_queue

data/test/post_mortem_test.rb

@@ -9,7 +9,7 @@ class TestPostMortem < TestDsl::TestCase
 
   it 'must stop at the correct line' do
     enter 'cont'
-    debug_file('post_mortem') { state.line.must_equal 8 }
+    debug_file('post_mortem') { $state.line.must_equal 8 }
   end
 
   it 'must exit from post mortem mode after stepping command' do

data/test/repl_test.rb

@@ -13,19 +13,19 @@ class TestRepl < TestDsl::TestCase
     it 'must support next command' do
       irb.stubs(:eval_input).throws(:IRB_EXIT, :next)
       enter 'irb'
-      debug_file('repl') { state.line.must_equal 3 }
+      debug_file('repl') { $state.line.must_equal 3 }
     end
 
     it 'must support step command' do
       irb.stubs(:eval_input).throws(:IRB_EXIT, :step)
       enter 'irb'
-      debug_file('repl') { state.line.must_equal 3 }
+      debug_file('repl') { $state.line.must_equal 3 }
     end
 
     it 'must support cont command' do
       irb.stubs(:eval_input).throws(:IRB_EXIT, :cont)
       enter 'break 4', 'irb'
-      debug_file('repl') { state.line.must_equal 4 }
+      debug_file('repl') { $state.line.must_equal 4 }
     end
 
     describe 'autoirb' do
@@ -36,31 +36,11 @@ class TestRepl < TestDsl::TestCase
       end
     end
 
-    describe 'setting context to $byebug_state' do
-      temporary_change_hash Byebug::Command.settings, :testing, false
-
-      it 'must set $byebug_state if irb is in the debug mode' do
-        byebug_state = nil
-        irb.stubs(:eval_input).calls { byebug_state = $byebug_state }
-        enter 'irb -d'
-        debug_file 'repl'
-        byebug_state.must_be_kind_of Byebug::CommandProcessor::State
-      end
-
-      it 'must not set $byebug_state if irb is not in the debug mode' do
-        byebug_state = nil
-        irb.stubs(:eval_input).calls { byebug_state = $byebug_state }
-        enter 'irb'
-        debug_file 'repl'
-        byebug_state.must_be_nil
-      end
-    end
-
     describe 'Post Mortem' do
       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 }
+        debug_file('post_mortem') { $state.line.must_equal 12 }
       end
     end
   end
@@ -86,22 +66,6 @@ class TestRepl < TestDsl::TestCase
       end
     end
 
-    describe 'setting context to $byebug_state' do
-      temporary_change_hash Byebug::Command.settings, :testing, false
-
-      it 'must set $byebug_state if irb is in the debug mode' do
-        enter 'pry -d'
-        debug_file 'repl'
-        $byebug_state.must_be_kind_of Byebug::CommandProcessor::State
-      end
-
-      it 'must not set $byebug_state if irb is not in the debug mode' do
-        enter 'pry'
-        debug_file 'repl'
-        $byebug_state.must_be_nil
-      end
-    end
-
     describe 'Post Mortem' do
       it 'must work in post-mortem mode' do
         skip 'TODO'