byebug 2.1.1 → 2.2.0

data/lib/byebug/commands/eval.rb

@@ -4,23 +4,7 @@ module Byebug
   module EvalFunctions
     def run_with_binding
       binding = get_binding
-      $__dbg_interface = @state.interface
-      eval(<<-EOC, binding)
-        __dbg_verbose_save=$VERBOSE; $VERBOSE=false
-        def dbg_print(*args)
-          $__dbg_interface.print(*args)
-        end
-        remove_method :puts if self.respond_to?(:puts) &&
-          defined?(remove_method)
-        def dbg_puts(*args)
-          $__dbg_interface.print(*args)
-          $__dbg_interface.print("\n")
-        end
-        $VERBOSE=__dbg_verbose_save
-      EOC
       yield binding
-    ensure
-      $__dbg_interface = nil
     end
   end
 

data/lib/byebug/commands/frame.rb

@@ -43,14 +43,10 @@ module Byebug
       return errmsg "Can't navigate beyond the newest frame\n" if
         abs_frame_pos < 0
 
-      if @state.frame_pos != abs_frame_pos
-        @state.previous_line = nil
-        @state.frame_pos = abs_frame_pos
-      end
-
+      @state.frame_pos = abs_frame_pos
       @state.file = @state.context.frame_file @state.frame_pos
       @state.line = @state.context.frame_line @state.frame_pos
-
+      @state.previous_line = nil
       ListCommand.new(@state).execute
     end
 
@@ -103,17 +99,11 @@ module Byebug
     end
 
     def print_backtrace
-      if Byebug.post_mortem?
-        realsize = @state.context.stack_size
-      else
-        realsize = Thread.current.backtrace_locations(1).
-          drop_while{ |l| IGNORED_FILES.include?(l.path) || l.path == '(eval)' }.
-          take_while{ |l| !IGNORED_FILES.include?(l.path) }.size
-        size = @state.context.stack_size
-        if size != realsize
-          errmsg "Byebug's stacksize (#{size}) should be #{realsize}. " \
-                 "This might be a bug in byebug or ruby's debugging API's\n"
-        end
+      realsize = Context.real_stack_size
+      size = @state.context.stack_size
+      if size != realsize
+        errmsg "Byebug's stacksize (#{size}) should be #{realsize}. " \
+               "This might be a bug in byebug or ruby's debugging API's\n"
       end
       (0...realsize).each do |idx|
         print_frame(idx)

data/lib/byebug/commands/info.rb

@@ -134,7 +134,7 @@ module Byebug
 
     def info_file_path(file)
       print "File #{file}"
-      path = LineCache.path(file)
+      path = File.expand_path(file)
       print " - #{path}\n" if path and path != file
     end
     private :info_file_path
@@ -171,12 +171,6 @@ module Byebug
       subcmd = Command.find(InfoFileSubcommands, args[1] || 'basic')
       return errmsg "Invalid parameter #{args[1]}\n" unless subcmd
 
-      unless LineCache::cached?(args[0])
-        return print "File #{args[0]} is not cached\n" unless
-          LineCache::cached_script?(args[0])
-        LineCache::cache(args[0], Command.settings[:autoreload])
-      end
-
       if %w(all basic).member?(subcmd.name)
         info_file_path(args[0])
         info_file_lines(args[0])
@@ -192,8 +186,7 @@ module Byebug
     end
 
     def info_files(*args)
-      files = LineCache::cached_files
-      files += SCRIPT_LINES__.keys unless 'stat' == args[0]
+      files = SCRIPT_LINES__.keys
       files.uniq.sort.each do |file|
         info_file_path(file)
         info_file_mtime(file)

data/lib/byebug/commands/list.rb

@@ -19,7 +19,7 @@ module Byebug
 
     def execute
       Byebug.source_reload if Command.settings[:autoreload]
-      lines = LineCache::getlines @state.file, Command.settings[:autoreload]
+      lines = getlines(@state.file, @state.line)
       if !lines
         errmsg "No sourcefile available for #{@state.file}\n"
         return @state.previous_line

data/lib/byebug/commands/reload.rb

@@ -1,5 +1,16 @@
 module Byebug
 
+  module ReloadFunctions
+    def getlines(file, line)
+      unless (lines = SCRIPT_LINES__[file]) and lines != true
+        Tracer::Single.get_line(file, line) if File.exist?(file)
+        lines = SCRIPT_LINES__[file]
+        lines = nil if lines == true
+      end
+      lines
+    end
+  end
+
   # Implements byebug "reload" command.
   class ReloadCommand < Command
     self.allow_in_control = true

data/lib/byebug/commands/repl.rb

@@ -1,5 +1,3 @@
-require 'irb'
-
 module IRB
   module ExtendCommand
     class Continue
@@ -18,12 +16,14 @@ module IRB
       end
     end
   end
+
+  require 'irb'
   ExtendCommandBundle.def_extend_command "cont", :Continue
   ExtendCommandBundle.def_extend_command "n", :Next
   ExtendCommandBundle.def_extend_command "step", :Step
 
   def self.start_session(binding)
-    unless @__initialized
+    unless @__initialized ||= false
       args = ARGV.dup
       ARGV.replace([])
       IRB.setup(nil)
@@ -51,7 +51,6 @@ module Byebug
 
   # Implements byebug's "irb" command.
   class IRBCommand < Command
-
     register_setting_get(:autoirb) do
       IRBCommand.always_run
     end
@@ -82,8 +81,6 @@ module Byebug
         @state.context.step_over 1, @state.frame_pos, force
         @state.proceed
       else
-        file = @state.context.frame_file(0)
-        line = @state.context.frame_line(0)
         print @state.location
         @state.previous_line = nil
       end

data/lib/byebug/commands/set.rb

@@ -21,6 +21,8 @@ module Byebug
         else
           print "Invalid callstyle. Should be one of: \"short\" or \"long\"\n"
         end
+      when /^verbose$/
+        Byebug.verbose = setting_value
       when /^history$/
         try_subcmd = setting_args[0]
         subcmd = Command.find(SetCommand::SetHistorySubcommands, try_subcmd)
@@ -49,11 +51,7 @@ module Byebug
         return unless width = get_int(setting_args[0], "Set width", 10, nil, 80)
         Command.settings[:width] = width
       when /^post_mortem$/
-        if setting_value
-          Byebug.post_mortem
-        else
-          Byebug.post_mortem = false
-        end
+        Byebug.post_mortem = setting_value
       when /^autoeval|autoreload|basename|forcestep|fullpath|linetrace_plus|
              testing|stack_trace_on_error$/x
         Command.settings[setting_name.to_sym] = setting_value
@@ -95,6 +93,8 @@ module Byebug
        ['post_mortem', 2, true, 'Enable post-mortem mode'],
        ['stack_trace_on_error', 1, true,
         'Display stack trace when "eval" raises exception'],
+       ['verbose', 1, true,
+        'Enable verbose output of TracePoint API events is enabled'],
        ['width', 1, false,
         'Number of characters per line for byebug\'s output']
       ].map do |name, min, is_bool, short_help, long_help|

data/lib/byebug/commands/show.rb

@@ -131,6 +131,9 @@ module Byebug
       when /^stack_trace_on_error$/
         on_off = Command.settings[:stack_trace_on_error]
         return "Displaying stack trace is #{show_onoff(on_off)}."
+      when /^verbose$/
+        on_off = Byebug.verbose
+        return "Verbose output of TracePoint API events is #{show_onoff(on_off)}."
       when /^version$/
         return "Byebug #{Byebug::VERSION}"
       when /^width$/
@@ -175,6 +178,8 @@ module Byebug
                           'debugging on an uncaught exception'],
        ['stack_trace_on_error', 1, 'Show whether a stack trace is displayed ' \
                                    'when "eval" raises an exception'],
+       ['verbose', 4, true,
+        'Show whether verbose output for debugging byebug itself is enabled'],
        ['version', 1, 'Show byebug\'s version'],
        ['width', 1, 'Show the number of characters per line for byebug']
       ].map do |name, min, short_help, long_help|

data/lib/byebug/commands/threads.rb

@@ -18,10 +18,10 @@ module Byebug
           file = @state.context.frame_file(0)
           line = @state.context.frame_line(0)
         else
-          if context.thread.backtrace_locations(1) &&
-             context.thread.backtrace_locations(1)[0]
-            file = context.thread.backtrace_locations(1)[0].path
-            line = context.thread.backtrace_locations(1)[0].lineno
+          if context.thread.backtrace_locations &&
+             context.thread.backtrace_locations[0]
+            file = context.thread.backtrace_locations[0].path
+            line = context.thread.backtrace_locations[0].lineno
           end
         end
         file_line = "#{file}:#{line}"

data/lib/byebug/commands/trace.rb

@@ -21,10 +21,11 @@ module Byebug
           else
             dbg_cmd = (@match[3] && @match[3] !~ /nostop/) ? 'byebug(1,0)' : ''
           end
-          eval("trace_var(:#{varname}) do |val|
+          eval("trace_var(:\"#{varname}\") do |val|
                   print \"traced variable \#{varname} has value \#{val}\n\"
                   #{dbg_cmd}
                 end")
+          print "Tracing variable \"#{varname}\".\n"
         else
           errmsg "#{varname} is not a global variable.\n"
         end

data/lib/byebug/context.rb

@@ -1,13 +1,22 @@
 module Byebug
 
-  class << self
+  class Context
 
-    # interface modules provide +handler+ object
-    attr_accessor :handler
+    class << self
+      def real_stack_size
+        if backtrace = Thread.current.backtrace_locations
+          backtrace.drop_while { |l| ignored(l.path) || l.path == '(eval)' }
+                   .take_while { |l| !ignored(l.path) }
+                   .size
+        end
+      end
 
-  end
+      def ignored(path)
+        IGNORED_FILES.include?(path)
+      end
+      private :ignored
+    end
 
-  class Context
     def frame_locals frame_no = 0
       bind = frame_binding frame_no
       eval "local_variables.inject({}){|h, v| h[v] = eval(v.to_s); h}", bind

data/lib/byebug/interface.rb

@@ -98,7 +98,7 @@ module Byebug
 
         def readline(prompt, hist)
           Readline::readline(prompt, hist)
-        rescue Interrupt => e
+        rescue Interrupt
           print "^C\n"
           retry
         end

data/lib/byebug/processor.rb

@@ -52,7 +52,6 @@ module Byebug
       if Command.settings[:basename]
         File.basename(filename)
       else
-        # Cache this?
         Pathname.new(filename).cleanpath.to_s
       end
     end
@@ -109,6 +108,7 @@ module Byebug
     protect :at_tracing
 
     def at_line(context, file, line)
+      Byebug.source_reload if Command.settings[:autoreload]
       process_commands(context, file, line)
     end
     protect :at_line

data/lib/byebug/remote.rb

@@ -19,21 +19,12 @@ module Byebug
       self.interface = nil
       start
 
-      if port.kind_of?(Array)
-        cmd_port, ctrl_port = port
-      else
-        cmd_port, ctrl_port = port, port + 1
-      end
-
-      ctrl_port = start_control(host, ctrl_port)
-
       yield if block_given?
 
       mutex = Mutex.new
       proceed = ConditionVariable.new
 
-      server = TCPServer.new(host, cmd_port)
-      @cmd_port = cmd_port = server.addr[1]
+      server = TCPServer.new(host, port)
       @thread = DebugThread.new do
         while (session = server.accept)
           self.interface = RemoteInterface.new(session)
@@ -51,20 +42,6 @@ module Byebug
       end
     end
 
-    def start_control(host = nil, ctrl_port = PORT + 1)
-      return @ctrl_port if @control_thread
-      server = TCPServer.new(host, ctrl_port)
-      @ctrl_port = server.addr[1]
-      @control_thread = Thread.new do
-        while (session = server.accept)
-          interface = RemoteInterface.new(session)
-          ControlCommandProcessor.new(interface).process_commands
-          processor.process_commands
-        end
-      end
-      @ctrl_port
-    end
-
     #
     # Connects to the remote byebug
     #

data/lib/byebug/version.rb

@@ -1,3 +1,3 @@
 module Byebug
-  VERSION = '2.1.1'
+  VERSION = '2.2.0'
 end

data/old_doc/byebug.1

@@ -174,9 +174,6 @@ Do not quit when script terminates. Instead rerun the program.
 .B \-\-version
 Show the version number and exit.
 .TP
-.B \-\-verbose
-Turn on verbose mode.
-.TP
 .B \-\-v
 Print the version number, then turn on verbose mode if a script name
 is given. If no script name is given just exit after printing the

data/old_doc/byebug.texi

@@ -929,7 +929,6 @@ Options:
     -x, --trace                Turn on line tracing
 
 Common options:
-        --verbose              Turn on verbose mode
         --help                 Show this message
         --version              Print the version
     -v                         Print version number, then turn on verbose mode
@@ -1056,8 +1055,8 @@ Here are the default values in @code{options}
 @smallexample
 #<OpenStruct server=false, client=false, frame_bind=false, cport=8990,
              tracing=false, nx=false, post_mortem=false, port=8989,
-             verbose_long=false, control=true, restart_script=nil, quit=true,
-             stop=true, script=nil, host=nil, wait=false>
+             control=true, restart_script=nil, quit=true, stop=true, script=nil,
+             host=nil, wait=false>
 @end smallexample
 
 @node Command Files

data/test/breakpoints_test.rb

@@ -1,13 +1,39 @@
 require_relative 'test_helper'
 
+class BreakpointExample
+  def self.a(num)
+    4
+  end
+  def b
+    3
+  end
+end
+
+class BreakpointDeepExample
+  def a
+    z = 2
+    b(z)
+  end
+
+  def b(num)
+    v2 = 5 if 1 == num ; [1,2,v2].map { |a| a.to_f }
+    c
+  end
+
+  def c
+    z = 4
+    z += 5
+    byebug
+  end
+end
+
 class TestBreakpoints < TestDsl::TestCase
   before do
     @tst_file = fullpath('breakpoint')
-    @tst_file_2 = fullpath('breakpoint2')
   end
 
   describe 'setting breakpoint in the current file' do
-    before { enter 'break 10' }
+    before { enter 'break 1' }
 
     subject { Byebug.breakpoints.first }
 
@@ -15,7 +41,7 @@ class TestBreakpoints < TestDsl::TestCase
       debug_file('breakpoint') { subject.send(field).must_equal value }
     end
 
-    it('must have correct pos')        { check_subject(:pos, 10)           }
+    it('must have correct pos')        { check_subject(:pos, 1)            }
     it('must have correct source')     { check_subject(:source, @tst_file) }
     it('must have correct expression') { check_subject(:expr, nil)         }
     it('must have correct hit count')  { check_subject(:hit_count, 0)      }
@@ -25,12 +51,12 @@ class TestBreakpoints < TestDsl::TestCase
     it('must return right response') do
       id = nil
       debug_file('breakpoint') { id = subject.id }
-      check_output_includes "Created breakpoint #{id} at #{@tst_file}:10"
+      check_output_includes "Created breakpoint #{id} at #{@tst_file}:1"
     end
   end
 
   describe 'using shortcut for the command' do
-    before { enter 'b 10' }
+    before { enter 'b 1' }
     it 'must set a breakpoint' do
       debug_file('breakpoint') { Byebug.breakpoints.size.must_equal 1 }
     end
@@ -52,7 +78,7 @@ class TestBreakpoints < TestDsl::TestCase
 
 
   describe 'setting breakpoint to incorrect line' do
-    before { enter 'break 11' }
+    before { enter 'break 2' }
 
     it 'must not create a breakpoint' do
       debug_file('breakpoint') { Byebug.breakpoints.must_be_empty }
@@ -61,28 +87,27 @@ class TestBreakpoints < TestDsl::TestCase
     it 'must show an error' do
       debug_file('breakpoint')
       check_error_includes \
-        "Line 11 is not a stopping point in file #{@tst_file}"
+        "Line 2 is not a stopping point in file #{@tst_file}"
     end
   end
 
   describe 'stopping at breakpoint' do
     it 'must stop at the correct line' do
-      enter 'break 14', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 14 }
+      enter 'break 5', 'cont'
+      debug_file('breakpoint') { $state.line.must_equal 5 }
     end
 
     it 'must stop at the correct file' do
-      enter 'break 14', 'cont'
+      enter 'break 5', 'cont'
       debug_file('breakpoint') { $state.file.must_equal @tst_file }
     end
 
     describe 'show a message' do
-
       describe 'with full filename' do
         it 'must show a message with full filename' do
-          enter 'break 14', 'cont'
+          enter 'break 5', 'cont'
           debug_file('breakpoint') { @id = Byebug.breakpoints.first.id }
-          check_output_includes "Created breakpoint #{@id} at #{@tst_file}:14"
+          check_output_includes "Created breakpoint #{@id} at #{@tst_file}:5"
         end
       end
 
@@ -90,9 +115,9 @@ class TestBreakpoints < TestDsl::TestCase
         temporary_change_hash Byebug.settings, :basename, true
 
         it 'must show a message with basename' do
-          enter 'break 14', 'cont'
+          enter 'break 5', 'cont'
           debug_file('breakpoint') { @id = Byebug.breakpoints.first.id }
-          check_output_includes "Created breakpoint #{@id} at breakpoint.rb:14"
+          check_output_includes "Created breakpoint #{@id} at breakpoint.rb:5"
         end
       end
     end
@@ -104,39 +129,37 @@ class TestBreakpoints < TestDsl::TestCase
 
       it 'must not reload source' do
         id = nil
-        enter \
-          ->{change_line_in_file(@tst_file, 14, ''); 'break 14'},
-          ->{change_line_in_file(@tst_file, 14, 'c = a + b');
-          'cont'}
+        enter ->{ change_line_in_file(@tst_file, 5, ''); 'break 5' },
+              ->{ change_line_in_file(@tst_file, 5, 'BreakpointExample.new.b');
+              cont }
         debug_file('breakpoint') { id = Byebug.breakpoints.first.id }
-        check_output_includes "Created breakpoint #{id} at #{@tst_file}:14"
+        check_output_includes "Created breakpoint #{id} at #{@tst_file}:5"
       end
     end
 
     describe 'autoreload set' do
       it 'must reload source' do
         enter \
-          ->{change_line_in_file(@tst_file, 14, ''); 'break 14'},
-          # 2nd breakpoint just to reload source code after rolling changes back
-          ->{change_line_in_file(@tst_file, 14, 'c = a + b');
-            'break 15'}, 'cont'
+          ->{change_line_in_file(@tst_file, 5, ''); 'break 5'},
+          ->{change_line_in_file(@tst_file, 5, 'BreakpointExample.new.b');
+            'next'}
         debug_file 'breakpoint'
         check_error_includes \
-          "Line 14 is not a stopping point in file #{@tst_file}"
+          "Line 5 is not a stopping point in file #{@tst_file}"
       end
     end
   end
 
   describe 'set breakpoint in a file' do
     describe 'successfully' do
-      before { enter "break #{@tst_file_2}:3", 'cont' }
+      before { enter "break #{__FILE__}:5", 'cont' }
 
       it 'must stop at the correct line' do
-        debug_file('breakpoint') { $state.line.must_equal 3 }
+        debug_file('breakpoint') { $state.line.must_equal 5 }
       end
 
       it 'must stop at the correct file' do
-        debug_file('breakpoint') { $state.file.must_equal @tst_file_2 }
+        debug_file('breakpoint') { $state.file.must_equal __FILE__ }
       end
     end
 
@@ -206,7 +229,7 @@ class TestBreakpoints < TestDsl::TestCase
 
   describe 'disabling breakpoints' do
     describe 'successfully' do
-      before { enter 'break 14', 'break 15' }
+      before { enter 'break 5', 'break 6' }
 
       describe 'short syntax' do
         before { enter ->{ "disable #{Byebug.breakpoints.first.id}" } }
@@ -218,7 +241,7 @@ class TestBreakpoints < TestDsl::TestCase
 
         it 'must not stop on the disabled breakpoint' do
           enter 'cont'
-          debug_file('breakpoint') { $state.line.must_equal 15 }
+          debug_file('breakpoint') { $state.line.must_equal 6 }
         end
       end
 
@@ -267,7 +290,7 @@ class TestBreakpoints < TestDsl::TestCase
       end
 
       it 'must show an error if a number is not provided as an argument' do
-        enter 'break 14', 'disable foo'
+        enter 'break 5', 'disable foo'
         debug_file('breakpoint')
         check_output_includes \
           '"disable breakpoints" argument "foo" needs to be a number.'
@@ -277,7 +300,7 @@ class TestBreakpoints < TestDsl::TestCase
 
   describe 'enabling breakpoints' do
     describe 'successfully' do
-      before { enter 'break 14', 'break 15', 'disable breakpoints' }
+      before { enter 'break 5', 'break 6', 'disable breakpoints' }
 
       describe 'short syntax' do
         before { enter ->{ "enable #{Byebug.breakpoints.first.id}" } }
@@ -289,7 +312,7 @@ class TestBreakpoints < TestDsl::TestCase
 
         it 'must stop on the enabled breakpoint' do
           enter 'cont'
-          debug_file('breakpoint') { $state.line.must_equal 14 }
+          debug_file('breakpoint') { $state.line.must_equal 5 }
         end
       end
 
@@ -306,12 +329,12 @@ class TestBreakpoints < TestDsl::TestCase
 
           it 'must stop on the first breakpoint' do
             enter 'cont'
-            debug_file('breakpoint') { $state.line.must_be 14 }
+            debug_file('breakpoint') { $state.line.must_be 5 }
           end
 
           it 'must stop on the last breakpoint' do
             enter 'cont', 'cont'
-            debug_file('breakpoint') { $state.line.must_be 15 }
+            debug_file('breakpoint') { $state.line.must_be 6 }
           end
         end
 
@@ -327,7 +350,7 @@ class TestBreakpoints < TestDsl::TestCase
 
           it 'must not stop on the enabled breakpoint' do
             enter 'cont'
-            debug_file('breakpoint') { $state.line.must_be 15 }
+            debug_file('breakpoint') { $state.line.must_be 6 }
           end
         end
       end
@@ -344,8 +367,8 @@ class TestBreakpoints < TestDsl::TestCase
   end
 
   describe 'deleting a breakpoint' do
-    before { enter 'break 14', ->{"delete #{Byebug.breakpoints.first.id}"},
-                   'break 15' }
+    before { enter 'break 5', ->{"delete #{Byebug.breakpoints.first.id}"},
+                   'break 6' }
 
     it 'must have only one breakpoint' do
       debug_file('breakpoint') { Byebug.breakpoints.size.must_equal 1 }
@@ -353,30 +376,30 @@ class TestBreakpoints < TestDsl::TestCase
 
     it 'must not stop on the disabled breakpoint' do
       enter 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 15 }
+      debug_file('breakpoint') { $state.line.must_equal 6 }
     end
   end
 
   describe 'Conditional breakpoints' do
     it 'must stop if the condition is true' do
-      enter 'break 14 if b == 5', 'break 15', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 14 }
+      enter 'break 5 if b == 5', 'break 6', 'cont'
+      debug_file('breakpoint') { $state.line.must_equal 5 }
     end
 
     it 'must skip if the condition is false' do
-      enter 'break 14 if b == 3', 'break 15', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 15 }
+      enter 'break 5 if b == 3', 'break 6', 'cont'
+      debug_file('breakpoint') { $state.line.must_equal 6 }
     end
 
     it 'must show an error when conditional syntax is wrong' do
-      enter 'break 14 ifa b == 3', 'break 15', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 15 }
+      enter 'break 5 ifa b == 3', 'break 6', 'cont'
+      debug_file('breakpoint') { $state.line.must_equal 6 }
       check_error_includes \
         'Expecting "if" in breakpoint condition; got: ifa b == 3.'
     end
 
     describe 'enabling with wrong conditional syntax' do
-      before { enter 'break 14',
+      before { enter 'break 5',
                      ->{"disable #{Byebug.breakpoints.first.id}"},
                      ->{"cond #{Byebug.breakpoints.first.id} b -=( 3"},
                      ->{"enable #{Byebug.breakpoints.first.id}"} }
@@ -394,14 +417,14 @@ class TestBreakpoints < TestDsl::TestCase
     end
 
     it 'must show an error if no file or line is specified' do
-      enter 'break ifa b == 3', 'break 15', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 15 }
+      enter 'break ifa b == 3', 'break 6', 'cont'
+      debug_file('breakpoint') { $state.line.must_equal 6 }
       check_error_includes 'Invalid breakpoint location: ifa b == 3.'
     end
 
     it 'must show an error if expression syntax is invalid' do
-      enter 'break if b -=) 3', 'break 15', 'cont'
-      debug_file('breakpoint') { $state.line.must_equal 15 }
+      enter 'break if b -=) 3', 'break 6', 'cont'
+      debug_file('breakpoint') { $state.line.must_equal 6 }
       check_error_includes \
         'Expression "b -=) 3" syntactically incorrect; breakpoint disabled.'
     end
@@ -410,7 +433,7 @@ class TestBreakpoints < TestDsl::TestCase
   describe 'Stopping through `byebug` keyword' do
     describe 'when not the last instruction of a method' do
       it 'must stop in the next line' do
-        debug_file('breakpoint') { $state.line.must_equal 13 }
+        debug_file('breakpoint') { $state.line.must_equal 4 }
       end
     end
 
@@ -425,7 +448,7 @@ class TestBreakpoints < TestDsl::TestCase
     it 'must show info about setting breakpoints when using just "break"' do
       enter 'break', 'cont'
       debug_file 'breakpoint'
-      check_output_includes /b\[reak\] file:line \[if expr\]/
+      check_output_includes(/b\[reak\] file:line \[if expr\]/)
     end
   end
 end