byebug 3.2.0 → 3.3.0

data/test/{delete_test.rb → commands/delete_test.rb}

@@ -12,13 +12,13 @@ module Byebug
     end
 
     def test_deleting_a_breakpoint_removes_it_from_breakpoints_list
-      enter 'break 7', -> { "delete #{first_brkpt.id}" }
+      enter 'break 7', -> { "delete #{Breakpoint.first.id}" }
 
       debug_proc(@example) { assert_empty Byebug.breakpoints }
     end
 
     def test_does_not_stop_at_the_deleted_breakpoint
-      enter 'break 7', 'break 8', -> { "delete #{first_brkpt.id}" }, 'cont'
+      enter 'b 7', 'b 8', -> { "delete #{Breakpoint.first.id}" }, 'cont'
 
       debug_proc(@example) { assert_equal 8, state.line }
     end

data/test/commands/display_test.rb

@@ -0,0 +1,37 @@
+module Byebug
+  class DisplayTestCase < TestCase
+    def setup
+      @example = -> do
+        d = 0
+        byebug
+        d = d + 3
+        d = d + 6
+      end
+
+      super
+    end
+
+    def test_shows_expressions
+      enter 'display d + 1'
+      debug_proc(@example)
+      check_output_includes '1: d + 1 = 1'
+    end
+
+    def test_works_when_using_a_shortcut
+      enter 'disp d + 1'
+      debug_proc(@example)
+      check_output_includes '1: d + 1 = 1'
+    end
+
+    def test_saves_displayed_expressions
+      enter 'display d + 1'
+      debug_proc(@example) { assert_equal [[true, 'd + 1']], state.display }
+    end
+
+    def test_displays_all_expressions_available
+      enter 'display d', 'display d + 1', 'display'
+      debug_proc(@example)
+      check_output_includes '1: d = 0', '2: d + 1 = 1'
+    end
+  end
+end

data/test/{eval_test.rb → commands/eval_test.rb}

@@ -29,6 +29,7 @@ module Byebug
     end
 
     def test_eval_properly_evaluates_an_expression_using_timeout
+      skip 'for now'
       enter 'eval Timeout::timeout(60) { 1 }'
       debug_proc(@example)
       check_output_includes '1'

data/test/{finish_test.rb → commands/finish_test.rb}

@@ -45,6 +45,11 @@ module Byebug
       debug_proc(@example) { assert_equal 14, state.line }
     end
 
+    def test_finish_works_for_frame_numbers_higher_than_one
+      enter 'finish 2'
+      debug_proc(@example) { assert_equal 9, state.line }
+    end
+
     def test_finish_behaves_consistenly_even_if_current_frame_has_been_changed
       enter 'up', 'finish'
       debug_proc(@example) { assert_equal 9, state.line }
@@ -53,12 +58,17 @@ module Byebug
     def test_finish_shows_an_error_if_incorrect_frame_number_specified
       enter 'finish foo'
       debug_proc(@example)
-      check_output_includes '"finish" argument "foo" needs to be a number'
+      check_error_includes '"finish" argument "foo" needs to be a number'
     end
 
     def test_finish_stays_at_the_same_line_if_incorrect_frame_number_specified
       enter 'finish foo'
       debug_proc(@example) { assert_equal 18, state.line }
     end
+
+    def test_finish_does_not_stop_in_byebug_internal_frames
+      enter 'finish 4'
+      debug_proc(@example) { refute_match(/byebug.test.support/, state.file) }
+    end
   end
 end

data/test/{frame_test.rb → commands/frame_test.rb}

@@ -72,23 +72,19 @@ module Byebug
 
     def test_frame_minus_one_sets_frame_to_the_last_one
       enter 'break 22', 'cont', 'frame -1'
-      debug_proc(@example) do
-        assert_equal 'test_helper.rb', File.basename(state.file)
-      end
+      debug_proc(@example) { assert_match 'frame_test.rb', state.file }
     end
 
     def test_down_does_not_move_if_frame_number_to_too_low
       enter 'break 22', 'cont', 'down'
       debug_proc(@example) { assert_equal 22, state.line }
-      check_output_includes \
-        "Can't navigate beyond the newest frame", interface.error_queue
+      check_error_includes "Can't navigate beyond the newest frame"
     end
 
     def test_up_does_not_move_if_frame_number_to_too_high
       enter 'break 22', 'cont', 'up 100'
       debug_proc(@example) { assert_equal 22, state.line }
-      check_output_includes \
-        "Can't navigate beyond the oldest frame", interface.error_queue
+      check_error_includes "Can't navigate beyond the oldest frame"
     end
 
     def test_where_displays_current_backtrace_with_fullpaths
@@ -157,7 +153,7 @@ module Byebug
     def test_frame_cannot_navigate_to_c_frames
       enter 'break 4', 'cont', 'frame 1'
       debug_proc(@example)
-      check_output_includes "Can't navigate to c-frame", interface.error_queue
+      check_error_includes "Can't navigate to c-frame"
     end
   end
 
@@ -190,32 +186,32 @@ module Byebug
       end
 
       super
-      enter 'break 182', 'cont'
+      enter 'break 178', 'cont'
     end
 
     def test_where_correctly_prints_the_backtrace
       enter 'where'
       debug_proc(@deep_example)
       check_output_includes(
-        /--> #0  Byebug::DeepFrameExample\.d\(e#String\)\s+at #{__FILE__}:182/,
-            /#1  Byebug::DeepFrameExample\.c\s+at #{__FILE__}:178/,
-            /#2  Byebug::DeepFrameExample\.b\s+at #{__FILE__}:172/,
-            /#3  Byebug::DeepFrameExample\.a\s+at #{__FILE__}:167/)
+        /--> #0  Byebug::DeepFrameExample\.d\(e#String\)\s+at #{__FILE__}:178/,
+            /#1  Byebug::DeepFrameExample\.c\s+at #{__FILE__}:174/,
+            /#2  Byebug::DeepFrameExample\.b\s+at #{__FILE__}:168/,
+            /#3  Byebug::DeepFrameExample\.a\s+at #{__FILE__}:163/)
     end
 
     def test_up_moves_up_in_the_callstack
       enter 'up'
-      debug_proc(@deep_example) { assert_equal 178, state.line }
+      debug_proc(@deep_example) { assert_equal 174, state.line }
     end
 
     def test_down_moves_down_in_the_callstack
       enter 'up', 'down'
-      debug_proc(@deep_example) { assert_equal 182, state.line }
+      debug_proc(@deep_example) { assert_equal 178, state.line }
     end
 
     def test_frame_moves_to_a_specific_frame
       enter 'frame 2'
-      debug_proc(@deep_example) { assert_equal 172, state.line }
+      debug_proc(@deep_example) { assert_equal 168, state.line }
     end
 
     def test_eval_works_properly_when_moving_through_the_stack

data/test/{help_test.rb → commands/help_test.rb}

@@ -11,8 +11,7 @@ module Byebug
     end
 
     def available_cmds
-      @available_cmds ||=
-        Command.commands.map(&:names).flatten.uniq.sort
+      @available_cmds ||= Command.commands.map(&:names).flatten.uniq.sort
     end
 
     %w(help h).each do |cmd_alias|
@@ -37,13 +36,31 @@ module Byebug
     def test_help_with_undefined_command_shows_an_error
       enter 'help foobar'
       debug_proc(@example)
-      check_error_includes 'Undefined command: "foobar". Try "help".'
+      check_error_includes 'Undefined command: "foobar". Try "help"'
     end
 
     def test_help_with_command_and_subcommand_shows_subcommands_help
       enter 'help info breakpoints'
       debug_proc(@example)
-      check_output_includes "Status of user-settable breakpoints.\n"
+      check_output_includes(/Status of user-settable breakpoints/)
+    end
+
+    def test_help_set_shows_help_for_set_command
+      enter 'help set'
+      debug_proc(@example)
+      check_output_includes(/Modifies parts of byebug environment/)
+    end
+
+    def test_help_set_plus_a_setting_shows_help_for_that_setting
+      enter 'help set width'
+      debug_proc(@example)
+      check_output_includes(/Number of characters per line in byebug's output/)
+    end
+
+    def test_help_show_shows_help_for_show_command
+      enter 'help show'
+      debug_proc(@example)
+      check_output_includes(/Generic command for showing byebug settings/)
     end
   end
 end

data/test/{info_test.rb → commands/info_test.rb}

@@ -58,8 +58,7 @@ module Byebug
     end
 
     def test_info_about_specific_breakpoints
-      enter 'break 38', 'break 39',
-            -> { "info breakpoints #{first_brkpt.id}" }
+      enter 'b 38', 'b 39', -> { "info breakpoints #{Breakpoint.first.id}" }
       debug_proc(@example)
       check_output_includes 'Num Enb What', /\d+ +y   at #{__FILE__}:38/
       check_output_doesnt_include(/\d+ +y   at #{__FILE__}:39/)
@@ -74,7 +73,7 @@ module Byebug
     def test_info_breakpoints_shows_error_if_specific_breakpoint_do_not_exist
       enter 'break 38', 'info breakpoints 100'
       debug_proc(@example)
-      check_error_includes 'No breakpoints found among list given.'
+      check_error_includes 'No breakpoints found among list given'
     end
 
     def test_info_breakpoints_shows_hit_counts
@@ -87,7 +86,7 @@ module Byebug
     def test_info_display_shows_all_display_expressions
       enter 'display 3 + 3', 'display a + b', 'info display'
       debug_proc(@example)
-      check_output_includes "Auto-display expressions now in effect:\n" \
+      check_output_includes "Auto-display expressions now in effect:",
                             'Num Enb Expression',
                             '1: y  3 + 3',
                             '2: y  a + b'
@@ -131,7 +130,7 @@ module Byebug
     def breakpoint_line_numbers
       @breakpoint_line_numbers ||=
         columnize(LineCache.trace_line_numbers(__FILE__).to_a.sort,
-                  Setting[:width])
+                  Byebug::Setting[:width])
     end
 
     def test_info_file_basic_shows_basic_info_about_a_specific_file
@@ -186,30 +185,12 @@ module Byebug
       check_error_includes 'Invalid parameter blabla'
     end
 
-    def test_info_instance_variables_shows_instance_variables
-      enter 'break 11', 'cont', 'info instance_variables'
-      debug_proc(@example)
-      check_output_includes '@bla = "blabla"', '@foo = "bar"'
-    end
-
     def test_info_line_shows_info_about_the_current_line
       enter 'break 11', 'cont', 'info line'
       debug_proc(@example)
       check_output_includes "Line 11 of \"#{__FILE__}\""
     end
 
-    def test_info_locals_shows_info_about_the_current_local_variables
-      enter 'break 11', 'cont', 'set width 28', 'info locals'
-      debug_proc(@example)
-      check_output_includes 'w = "11111111111111111111...', 'x = 2'
-    end
-
-    def test_info_locals_fail_if_local_variable_does_not_have_to_s_or_inspect
-      enter 'break 16', 'cont', 'info locals'
-      debug_proc(@example)
-      check_output_includes 'a = *Error in evaluation*'
-    end
-
     def test_info_program_shows_the_initial_stop_reason
       enter 'info program'
       debug_proc(@example)
@@ -241,44 +222,13 @@ module Byebug
       enter 'break 39', 'cont',
              ->{ context.stubs(:stop_reason).returns('blabla'); 'info program' }
       debug_proc(@example)
-      check_output_includes 'Program stopped.', 'unknown reason: blabla'
+      check_output_includes 'Program stopped.', 'Unknown reason: blabla'
     end
 
     def test_shows_an_error_if_the_program_is_crashed
       skip('TODO')
     end
 
-    def test_info_global_variables_shows_global_variables
-      enter 'info global_variables'
-      debug_proc(@example)
-      check_output_includes "$$ = #{Process.pid}"
-    end
-
-    def test_info_variables_shows_all_variables
-      enter 'break 11', 'cont', 'set width 45', 'info variables'
-      debug_proc(@example)
-      check_output_includes(/self = #<Byebug::InfoExample:\S*.../,
-                            'w = "1111111111111111111111111111111111111...',
-                            'x = 2',
-                            '@bla = "blabla"',
-                            '@foo = "bar"')
-    end
-
-    def test_info_variables_fails_if_variables_has_no_to_s_or_inspect_methods
-      enter 'break 16', 'cont', 'info variables'
-      debug_proc(@example)
-      check_output_includes 'a = *Error in evaluation*',
-                            /self = #<Byebug::InfoExample:\S*.../,
-                            '@bla = "blabla"',
-                            '@foo = "bar"'
-    end
-
-    def test_info_variables_correctly_print_variables_containing_percentage
-      enter 'break 22', 'cont', 'info variables'
-      debug_proc(@example)
-      check_output_includes 'e = "%.2f"'
-    end
-
     def test_shows_help_when_typing_just_info
       enter 'info', 'cont'
       debug_proc(@example)

data/test/commands/irb_test.rb

@@ -0,0 +1,28 @@
+module Byebug
+  class IrbTestCase < TestCase
+    def setup
+      @example = -> do
+        byebug
+        a = 2
+        a = 3
+        a = 4
+      end
+
+      super
+
+      interface.stubs(:kind_of?).with(LocalInterface).returns(true)
+    end
+
+    def test_irb_command_starts_an_irb_session
+      IrbCommand.any_instance.expects(:execute)
+      enter 'irb'
+      debug_proc(@example)
+    end
+
+    def test_autoirb_calls_irb_automatically_after_every_stop
+      IrbCommand.any_instance.expects(:execute)
+      enter 'set autoirb', 'break 8', 'cont'
+      debug_proc(@example)
+    end
+  end
+end

data/test/{kill_test.rb → commands/kill_test.rb}

@@ -32,7 +32,7 @@ module Byebug
       Process.expects(:kill).with('KILL', Process.pid)
       enter 'kill', 'y'
       debug_proc(@example)
-      check_output_includes 'Really kill? (y/n)', interface.confirm_queue
+      check_confirm_includes 'Really kill? (y/n)'
     end
 
     def test_kill_does_not_send_an_unknown_signal

data/test/{list_test.rb → commands/list_test.rb}

@@ -32,7 +32,7 @@ module Byebug
     def lines_between(min, max, mark_current = true)
       lines = [*File.open(__FILE__)][min-1..max-1]
       numbers = (min..max).to_a
-      output = numbers.zip(lines).map { |l| sprintf("%2d: %s", l[0], l[1]) }
+      output = numbers.zip(lines).map { |l| format("%2d: %s", l[0], l[1]) }
       if mark_current
         middle = (output.size/2.0).ceil
         output[middle] = "=> #{output[middle]}"

data/test/{post_mortem_test.rb → commands/post_mortem_test.rb}

@@ -19,19 +19,15 @@ module Byebug
       super
     end
 
-    def teardown
-      Byebug.post_mortem = false
-    end
-
     def test_rises_before_exit_in_post_mortem_mode
-      enter 'set post_mortem', 'cont'
+      enter 'set post_mortem', 'cont', 'set nopost_mortem'
       assert_raises(RuntimeError) do
         debug_proc(@example)
       end
     end
 
     def test_post_mortem_mode_sets_post_mortem_flag_to_true
-      enter 'set post_mortem', 'cont'
+      enter 'set post_mortem', 'cont', 'set nopost_mortem'
       begin
         debug_proc(@example)
       rescue
@@ -40,7 +36,7 @@ module Byebug
     end
 
     def test_execution_is_stop_at_the_correct_line_after_exception
-      enter 'set post_mortem', 'cont'
+      enter 'set post_mortem', 'cont', 'set nopost_mortem'
       begin
         debug_proc(@example)
       rescue
@@ -50,8 +46,8 @@ module Byebug
 
     %w(step next finish break condition display reload).each do |cmd|
       define_method "test_#{cmd}_is_forbidden_in_post_mortem_mode" do
-        enter 'set noautoeval', cmd
-        state.context.stubs(:dead?).returns(:true)
+        enter 'set noautoeval', 'set post_mortem', "#{cmd}", 'set no_postmortem'
+        Context.any_instance.stubs(:dead?).returns(:true)
         begin
           debug_proc(@example)
         rescue RuntimeError
@@ -64,7 +60,7 @@ module Byebug
      'var class', 'list', 'method', 'kill', 'eval', 'set', 'save', 'show',
      'trace', 'thread list'].each do |cmd|
       define_method "test_#{cmd}_is_permitted_in_post_mortem_mode" do
-        enter "#{cmd}"
+        enter 'set post_mortem', "#{cmd}", 'set no_postmortem'
         class_name = cmd.gsub(/(^| )\w/) { |b| b[-1,1].upcase } + 'Command'
 
         Byebug.const_get(class_name).any_instance.stubs(:execute)

data/test/{pry_test.rb → commands/pry_test.rb}

@@ -13,26 +13,17 @@ module Byebug
         a = 2
         a = 3
         a = 4
-        a = 5
-        a = 6
       end
 
       super
 
       interface.stubs(:kind_of?).with(LocalInterface).returns(true)
-      PryCommand.any_instance.expects(:pry)
     end
 
-    def test_pry_supports_next_command
-      skip 'TODO'
-    end
-
-    def test_pry_supports_step_command
-      skip 'TODO'
-    end
-
-    def test_pry_supports_cont_command
-      skip 'TODO'
+    def test_pry_command_starts_a_pry_session
+      PryCommand.any_instance.expects(:execute)
+      enter 'pry'
+      debug_proc(@example)
     end
 
     def test_autopry_calls_pry_automatically_after_every_stop