byebug 3.0.0 → 3.1.0

data/test/conditions_test.rb

@@ -1,69 +1,82 @@
-class TestConditions < TestDsl::TestCase
+module ConditionsTest
+  class ConditionsTestCase < TestDsl::TestCase
+    before do
+      @example = lambda do
+        byebug
+        b = 5
+        c = b + 5
+        c = Object.new
+      end
+    end
 
-  describe 'setting condition' do
-    before { enter 'break 3' }
+    def first
+      Byebug.breakpoints.first
+    end
 
-    describe 'successfully' do
-      before { enter ->{ "cond #{Byebug.breakpoints.first.id} b == 5" }, 'cont'}
+    describe 'setting condition' do
+      before { enter 'break 7' }
 
-      it 'must assign the expression to breakpoint' do
-        debug_file('conditions') {
-          Byebug.breakpoints.first.expr.must_equal 'b == 5' }
-      end
+      describe 'successfully' do
+        before { enter ->{ "cond #{first.id} b == 5" }, 'cont' }
 
-      it 'must stop at the breakpoint if condition is true' do
-        debug_file('conditions') { state.line.must_equal 3 }
-      end
+        it 'must assign the expression to breakpoint' do
+          debug_proc(@example) { first.expr.must_equal 'b == 5' }
+        end
 
-      it 'must work with full command name too' do
-        debug_file('conditions') { state.line.must_equal 3 }
+        it 'must stop at the breakpoint if condition is true' do
+          debug_proc(@example) { state.line.must_equal 7 }
+        end
+
+        it 'must work with full command name too' do
+          debug_proc(@example) { state.line.must_equal 7 }
+        end
       end
-    end
 
-    describe 'unsuccessfully' do
-      before { enter 'break 4' }
+      describe 'unsuccessfully' do
+        before { enter 'break 8' }
 
-      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 }
-      end
+        it 'must not stop at the breakpoint if condition is false' do
+          enter ->{ "cond #{first.id} b == 3" }, 'cont'
+          debug_proc(@example) { state.line.must_equal 8 }
+        end
 
-      it 'must assign expression to breakpoint in spite of incorrect syntax' do
-        enter ->{ "cond #{Byebug.breakpoints.first.id} b =="}, 'cont'
-        debug_file('conditions') {
-          Byebug.breakpoints.first.expr.must_equal 'b ==' }
-      end
+        it 'must assign expression to breakpoint in spite of incorrect syntax' do
+          enter ->{ "cond #{first.id} b =="}, 'cont'
+          debug_proc(@example) { first.expr.must_equal 'b ==' }
+        end
 
-      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 }
+        it 'must ignore the condition if when incorrect syntax' do
+          enter ->{ "cond #{first.id} b ==" },  'cont'
+          debug_proc(@example) { state.line.must_equal 8 }
+        end
       end
     end
-  end
 
-  describe 'removing conditions' do
-    before { enter 'break 3 if b == 3', 'break 4',
-                   ->{"cond #{Byebug.breakpoints.first.id}"}, 'cont' }
+    describe 'removing conditions' do
+      before do
+        enter 'break 7 if b == 3', 'break 8', -> { "cond #{first.id}" }, 'cont'
+      end
 
-    it 'must remove the condition from the breakpoint' do
-      debug_file('conditions') { Byebug.breakpoints.first.expr.must_be_nil }
-    end
+      it 'must remove the condition from the breakpoint' do
+        debug_proc(@example) { first.expr.must_be_nil }
+      end
 
-    it 'must unconditionally stop on the breakpoint' do
-      debug_file('conditions') { state.line.must_equal 3 }
+      it 'must unconditionally stop on the breakpoint' do
+        debug_proc(@example) { state.line.must_equal 7 }
+      end
     end
-  end
 
-  describe 'errors' do
-    it 'must show error if there are no breakpoints' do
-      enter 'cond 1 true'
-      debug_file('conditions')
-      check_output_includes 'No breakpoints have been set.'
-    end
+    describe 'errors' do
+      it 'must show error if there are no breakpoints' do
+        enter 'cond 1 true'
+        debug_proc(@example)
+        check_output_includes 'No breakpoints have been set.'
+      end
 
-    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 }
+      it 'must not set breakpoint condition if breakpoint id is incorrect' do
+        enter 'break 7', 'cond 8 b == 3', 'cont'
+        debug_proc(@example) { state.line.must_equal 7 }
+      end
     end
   end
 end

data/test/continue_test.rb

@@ -1,39 +1,50 @@
-class ContinueExample
-  def self.a(num)
-    num + 4
+module ContinueTest
+  class Example
+    def self.a(num)
+      num + 4
+    end
   end
-end
 
-class TestContinue < TestDsl::TestCase
+  class ContinueTestCase < TestDsl::TestCase
+    before do
+      @example = lambda do
+        byebug
 
-  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 }
+        b = 5
+        c = b + 5
+        Example.a(c)
+      end
     end
 
-    it "must work in abbreviated mode too" do
-      enter 'break 4', 'cont'
-      debug_file('continue') { state.line.must_equal 4 }
-    end
+    describe 'successful' do
+      it 'must continue up to breakpoint if no line specified' do
+        enter 'break 14', 'continue'
+        debug_proc(@example) { state.line.must_equal 14 }
+      end
 
-    it "must continue up to specified line" do
-      enter 'cont 4'
-      debug_file('continue') { state.line.must_equal 4 }
-    end
-  end
+      it 'must work in abbreviated mode too' do
+        enter 'break 14', 'cont'
+        debug_proc(@example) { state.line.must_equal 14 }
+      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 3 }
+      it 'must continue up to specified line' do
+        enter 'cont 14'
+        debug_proc(@example) { state.line.must_equal 14 }
+      end
     end
 
-    it "must show error if specified line is not valid" do
-      enter 'cont 123'
-      debug_file 'continue'
-      check_error_includes \
-        "Line 123 is not a stopping point in file \"#{fullpath('continue')}\""
+    describe 'unsuccessful' do
+      before { enter 'cont 100' }
+
+      it 'must ignore the command if specified line is not valid' do
+        debug_proc(@example) { state.line.must_equal 13 }
+      end
+
+      it 'must show error if specified line is not valid' do
+        debug_proc(@example)
+        check_error_includes \
+          "Line 100 is not a stopping point in file \"#{__FILE__}\""
+      end
     end
   end
 end

data/test/debugger_alias_test.rb

@@ -1,5 +1,7 @@
-class TestDebuggerAlias < MiniTest::Spec
-  it 'aliases "debugger" to "byebug"' do
-    Kernel.method(:debugger).must_equal(Kernel.method(:byebug))
+module DebuggerAliasTest
+  class DebuggerAliasSpec < MiniTest::Spec
+    it 'aliases "debugger" to "byebug"' do
+      Kernel.method(:debugger).must_equal(Kernel.method(:byebug))
+    end
   end
 end

data/test/display_test.rb

@@ -1,124 +1,135 @@
-class TestDisplay < TestDsl::TestCase
-
-  it 'must show expressions' do
-    enter 'break 3', 'cont', 'display d + 1'
-    debug_file 'display'
-    check_output_includes '1: ', 'd + 1 = 5'
-  end
+module DisplayTest
+  class DisplayTestCase < TestDsl::TestCase
+    before do
+      @example = -> do
+        byebug
+        d = 4
+        d = d + 2
+        d = d + 3
+        d = d + 6
+      end
+    end
 
-  it 'must work with shortcut' do
-    enter 'break 3', 'cont', 'disp d + 1'
-    debug_file 'display'
-    check_output_includes '1: ', 'd + 1 = 5'
-  end
+    it 'must show expressions' do
+      enter 'break 7', 'cont', 'display d + 1'
+      debug_proc(@example)
+      check_output_includes '1: ', 'd + 1 = 5'
+    end
 
-  it 'must save displayed expressions' do
-    enter 'display d + 1'
-    debug_file('display') { state.display.must_equal [[true, 'd + 1']] }
-  end
+    it 'must work with shortcut' do
+      enter 'break 7', 'cont', 'disp d + 1'
+      debug_proc(@example)
+      check_output_includes '1: ', 'd + 1 = 5'
+    end
 
-  it 'displays all expressions available' do
-    enter 'break 3', 'cont', -> do
-      Byebug.handler.display.concat([[true, 'abc'], [true, 'd']]); 'display'
+    it 'must save displayed expressions' do
+      enter 'display d + 1'
+      debug_proc(@example) { state.display.must_equal [[true, 'd + 1']] }
     end
-    debug_file 'display'
-    check_output_includes '1: ', 'abc = nil', '2: ', 'd = 4'
-  end
 
-  describe 'undisplay' do
-    describe 'undisplay all' do
-      before do
-        enter 'break 3', 'cont', -> do
-          Byebug.handler.display.concat([[true, 'abc'], [true, 'd']])
-          'undisplay'
-        end, confirm_response, 'display'
+    it 'displays all expressions available' do
+      enter 'break 7', 'cont', -> do
+        Byebug.handler.display.concat([[true, 'abc'], [true, 'd']]); 'display'
       end
+      debug_proc(@example)
+      check_output_includes '1: ', 'abc = nil', '2: ', 'd = 4'
+    end
 
-      describe 'confirmation is successful' do
-        let(:confirm_response) { 'y' }
-
-        it 'must ask about confirmation' do
-          debug_file 'display'
-          check_output_includes \
-            'Clear all expressions? (y/n)', interface.confirm_queue
+    describe 'undisplay' do
+      describe 'undisplay all' do
+        before do
+          enter 'break 7', 'cont', -> do
+            Byebug.handler.display.concat([[true, 'abc'], [true, 'd']])
+            'undisplay'
+          end, confirm_response, 'display'
         end
 
-        it 'must set all expressions saved to "false"' do
-          debug_file('display') { state.display.must_equal [[false, 'abc'],
-                                                            [false, 'd']] }
+        describe 'confirmation is successful' do
+          let(:confirm_response) { 'y' }
+
+          it 'must ask about confirmation' do
+            debug_proc(@example)
+            check_output_includes \
+              'Clear all expressions? (y/n)', interface.confirm_queue
+          end
+
+          it 'must set all expressions saved to "false"' do
+            debug_proc(@example) { state.display.must_equal [[false, 'abc'],
+                                                              [false, 'd']] }
+          end
+
+          it 'must not show any output' do
+            debug_proc(@example)
+            check_output_doesnt_include '1: ', 'abc = nil', '2: ', 'd = 4'
+          end
         end
 
-        it 'must not show any output' do
-          debug_file 'display'
-          check_output_doesnt_include '1: ', 'abc = nil', '2: ', 'd = 4'
+        describe 'confirmation is unsuccessful' do
+          let(:confirm_response) { 'n' }
+
+          it 'must set all expressions saved to "false"' do
+            debug_proc(@example) { state.display.must_equal [[true, 'abc'],
+                                                              [true, 'd']] }
+          end
+
+          it 'must not show any output' do
+            debug_proc(@example)
+            check_output_includes '1: ', 'abc = nil', '2: ', 'd = 4'
+          end
         end
       end
 
-      describe 'confirmation is unsuccessful' do
-        let(:confirm_response) { 'n' }
+      describe 'undisplay specific position' do
+        before do
+          enter 'break 7', 'cont', -> do
+            Byebug.handler.display.concat([[true, 'abc'], [true, 'd']])
+            'undisplay 1'
+          end, 'display'
+        end
 
-        it 'must set all expressions saved to "false"' do
-          debug_file('display') { state.display.must_equal [[true, 'abc'],
+        it 'must set inactive positions' do
+          debug_proc(@example) { state.display.must_equal [[nil, 'abc'],
                                                             [true, 'd']] }
         end
 
-        it 'must not show any output' do
-          debug_file 'display'
-          check_output_includes '1: ', 'abc = nil', '2: ', 'd = 4'
+        it 'must display only the active position' do
+          debug_proc(@example)
+          check_output_includes '2: ', 'd = 4'
         end
-      end
-    end
 
-    describe 'undisplay specific position' do
-      before do
-        enter 'break 3', 'cont', -> do
-          Byebug.handler.display.concat([[true, 'abc'], [true, 'd']])
-          'undisplay 1'
-        end, 'display'
+        it 'must not display the disabled position' do
+          debug_proc(@example)
+          check_output_doesnt_include '1: ', 'abc'
+        end
       end
+    end
 
-      it 'must set inactive positions' do
-        debug_file('display') { state.display.must_equal [[nil, 'abc'],
-                                                          [true, 'd']] }
+    describe 'disable' do
+      it 'must disable a position' do
+        enter 'display d', 'disable display 1'
+        debug_proc(@example) { state.display.must_equal [[false, 'd']] }
       end
 
-      it 'must display only the active position' do
-        debug_file 'display'
-        check_output_includes '2: ', 'd = 4'
+      it 'must show an error if no displays are set' do
+        enter 'disable display 1'
+        debug_proc(@example)
+        check_output_includes \
+          'No display expressions have been set.', interface.error_queue
       end
 
-      it 'must not display the disabled position' do
-        debug_file 'display'
-        check_output_doesnt_include '1: ', 'abc'
+      it 'must show an error if there is no such display position' do
+        enter 'display d', 'disable display 4'
+        debug_proc(@example)
+        check_output_includes \
+          '"disable display" argument "4" needs to be at most 1'
       end
     end
-  end
 
-  describe 'disable' do
-    it 'must disable a position' do
-      enter 'display d', 'disable display 1'
-      debug_file('display') { state.display.must_equal [[false, 'd']] }
-    end
-
-    it 'must show an error if no displays are set' do
-      enter 'disable display 1'
-      debug_file 'display'
-      check_output_includes \
-        'No display expressions have been set.', interface.error_queue
-    end
-
-    it 'must show an error if there is no such display position' do
-      enter 'display d', 'disable display 4'
-      debug_file 'display'
-      check_output_includes \
-        '"disable display" argument "4" needs to be at most 1.'
-    end
-  end
-
-  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']] }
+    describe 'enable' do
+      it 'must enable a position' do
+        enter 'display d', 'disable display 1', 'enable display 1'
+        debug_proc(@example) { state.display.must_equal [[true, 'd']] }
+      end
     end
   end
 end

data/test/edit_test.rb

@@ -1,47 +1,55 @@
-class TestEdit < TestDsl::TestCase
+module EditTest
+  class EditTestCase < TestDsl::TestCase
+    before do
+      @example = -> do
+        byebug
+        Object.new
+      end
+    end
 
-  describe 'open configured editor' do
-    temporary_change_hash ENV, 'EDITOR', 'editr'
+    describe 'open configured editor' do
+      temporary_change_hash ENV, 'EDITOR', 'editr'
 
-    it 'must open current file in current line in configured editor' do
-      Byebug::EditCommand.any_instance.expects(:system)
-                                      .with("editr +2 #{fullpath('edit')}")
-      enter 'edit'
-      debug_file 'edit'
+      it 'must open current file in current line in configured editor' do
+        file = __FILE__
+        Byebug::EditCommand.any_instance.expects(:system).with("editr +6 #{file}")
+        enter 'edit'
+        debug_proc(@example)
+      end
     end
-  end
 
-  describe 'open default editor' do
-    temporary_change_hash ENV, 'EDITOR', nil
+    describe 'open default editor' do
+      temporary_change_hash ENV, 'EDITOR', nil
 
-    it 'must call "vim" with current line and file if EDITOR env not set' do
-      Byebug::EditCommand.any_instance.expects(:system)
-                                      .with("vim +2 #{fullpath('edit')}")
-      enter 'edit'
-      debug_file 'edit'
+      it 'must call "vim" with current line and file if EDITOR env not set' do
+        file = __FILE__
+        Byebug::EditCommand.any_instance.expects(:system).with("vim +6 #{file}")
+        enter 'edit'
+        debug_proc(@example)
+      end
     end
-  end
 
-  describe 'open configured editor specifying line and file' do
-    temporary_change_hash ENV, 'EDITOR', 'editr'
+    describe 'open configured editor specifying line and file' do
+      temporary_change_hash ENV, 'EDITOR', 'editr'
 
-    it 'must open specified line in specified file with configured editor' do
-      Byebug::EditCommand.any_instance.expects(:system)
-                                      .with("editr +3 #{fullpath('breakpoint')}")
-      enter "edit #{fullpath('breakpoint')}:3"
-      debug_file 'edit'
+      it 'must open specified line in specified file with configured editor' do
+        file = File.expand_path('test/test_helper.rb')
+        Byebug::EditCommand.any_instance.expects(:system).with("editr +3 #{file}")
+        enter "edit #{file}:3"
+        debug_proc(@example)
+      end
     end
-  end
 
-  it 'must show an error if there is no such line' do
-    enter "edit #{fullpath('edit3')}:6"
-    debug_file 'edit'
-    check_error_includes "File \"#{fullpath('edit3')}\" is not readable."
-  end
+    it 'must show an error if there is no such file' do
+      enter "edit no_such_file:6"
+      debug_proc(@example)
+      check_error_includes 'File "no_such_file" is not readable.'
+    end
 
-  it 'must show an error if there is incorrect syntax' do
-    enter 'edit blabla'
-    debug_file 'edit'
-    check_error_includes 'Invalid file[:line] number specification: blabla'
+    it 'must show an error if there is incorrect syntax' do
+      enter 'edit blabla'
+      debug_proc(@example)
+      check_error_includes 'Invalid file[:line] number specification: blabla'
+    end
   end
 end