byebug 1.1.1 → 1.2.0

data/test/restart_test.rb

@@ -9,31 +9,35 @@ describe 'Restart Command' do
   end
 
   describe 'usual restarting' do
-    before do
-      force_set_const Byebug, 'BYEBUG_SCRIPT', 'byebug_script'
-    end
+    temporary_change_const Byebug, 'BYEBUG_SCRIPT', 'byebug_script'
 
     it 'must be restarted with arguments' do
       Byebug::RestartCommand.any_instance.expects(:exec).
-        with("#{Byebug::BYEBUG_SCRIPT} 1 2 3")
+        with("#{Byebug::BYEBUG_SCRIPT} #{Byebug::PROG_SCRIPT} 1 2 3")
       enter 'restart 1 2 3'
       debug_file 'restart'
     end
 
-    it 'arguments must be correctly escaped' do
-      Byebug::Command.settings[:argv] = ['argv1', 'argv 2']
-      Byebug::RestartCommand.any_instance.expects(:exec).with \
-        "#{Byebug::BYEBUG_SCRIPT} argv1 argv\\ 2"
-      enter 'restart'
-      debug_file 'restart'
+    describe 'when arguments have spaces' do
+      temporary_change_hash Byebug::Command.settings, :argv, ['argv1', 'argv 2']
+
+      it 'must be correctly escaped' do
+        Byebug::RestartCommand.any_instance.expects(:exec).with \
+          "#{Byebug::BYEBUG_SCRIPT} #{Byebug::PROG_SCRIPT} argv1 argv\\ 2"
+        enter 'restart'
+        debug_file 'restart'
+      end
     end
 
-    it 'must specify arguments by "set" command' do
-      Byebug::Command.settings[:argv] = []
-      Byebug::RestartCommand.any_instance.expects(:exec).
-        with("#{Byebug::BYEBUG_SCRIPT} 1 2 3")
-      enter 'set args 1 2 3', 'restart'
-      debug_file 'restart'
+    describe 'when arguments specified by set command' do
+      temporary_change_hash Byebug::Command.settings, :argv, []
+
+      it 'must specify arguments by "set" command' do
+        Byebug::RestartCommand.any_instance.expects(:exec).
+          with("#{Byebug::BYEBUG_SCRIPT} #{Byebug::PROG_SCRIPT} 1 2 3")
+        enter 'set args 1 2 3', 'restart'
+        debug_file 'restart'
+      end
     end
   end
 
@@ -41,71 +45,70 @@ describe 'Restart Command' do
     before { enter 'restart' }
 
     describe 'reexecing' do
-      it 'must restart and show a message about reexecing' do
-        force_set_const Byebug, 'BYEBUG_SCRIPT', 'byebug_script'
-        Byebug::Command.settings[:argv] = ['argv']
-        must_restart
-        debug_file 'restart'
-        check_output_includes \
-          "Re exec'ing:\n\t#{Byebug::BYEBUG_SCRIPT} argv"
+      temporary_change_const Byebug, 'BYEBUG_SCRIPT', 'byebug_script'
+
+      describe 'with set args' do
+        temporary_change_hash Byebug::Command.settings, :argv, ['argv']
+
+        it 'must restart and show a message about reexecing' do
+          must_restart
+          debug_file 'restart'
+          check_output_includes \
+            "Re exec'ing:\n"    \
+            "\t#{Byebug::BYEBUG_SCRIPT} #{Byebug::PROG_SCRIPT} argv"
+        end
       end
     end
 
-    describe 'no script specified and no $0 used instead' do
-      before do
-        force_unset_const Byebug, 'PROG_SCRIPT'
-        force_set_const Byebug,
-                        'DEFAULT_START_SETTINGS',
-                        init: false, post_mortem: false, tracing: nil
-      end
+    describe 'no script specified' do
+      temporary_change_const Byebug, 'PROG_SCRIPT', :__undefined__
 
-      it 'must not restart and show error messages instead' do
-        must_restart.never
-        debug_file 'restart'
-        check_output_includes 'Don\'t know name of debugged program',
-                              interface.error_queue
-      end
-    end
+      describe 'and no $0 used' do
+        temporary_change_const Byebug, 'DEFAULT_START_SETTINGS',
+          { init: false, post_mortem: false, tracing: nil }
 
-    describe 'no script specified, $0 used instead' do
-      before do
-        @old_prog_name = $0
-        $0 = 'prog-0'
-        force_unset_const Byebug, 'PROG_SCRIPT'
+        it 'must not restart and show error messages instead' do
+          must_restart.never
+          debug_file 'restart'
+          check_output_includes 'Don\'t know name of debugged program',
+                                interface.error_queue
+        end
       end
-      after { $0 = @old_prog_name }
 
-      it 'must use prog_script from $0 if PROG_SCRIPT is undefined' do
-        debug_file 'restart'
-        check_output_includes 'Ruby program prog-0 doesn\'t exist',
-                              interface.error_queue
+      describe 'but initialized from $0' do
+        it 'must use prog_script from $0' do
+          old_prog_name = $0
+          $0 = 'prog-0'
+          debug_file 'restart'
+          check_output_includes 'Ruby program prog-0 doesn\'t exist',
+                                interface.error_queue
+          $0 = old_prog_name
+        end
       end
     end
 
     describe 'no script at the specified path' do
-      before do
-        force_set_const Byebug, 'PROG_SCRIPT', 'blabla'
-        force_set_const Byebug,
-                        'DEFAULT_START_SETTINGS',
-                        init: false, post_mortem: false, tracing: nil
-      end
-
-      it 'must not restart' do
-        must_restart.never
-        debug_file 'restart'
-      end
-
-      it 'must show an error message' do
-        debug_file 'restart'
-        check_output_includes 'Ruby program blabla doesn\'t exist',
-                              interface.error_queue
+      temporary_change_const Byebug, 'PROG_SCRIPT', 'blabla'
+
+      describe 'and no restart params set' do
+        temporary_change_const Byebug, 'DEFAULT_START_SETTINGS',
+          init: false, post_mortem: false, tracing: nil
+
+        it 'must not restart' do
+          must_restart.never
+          debug_file 'restart'
+        end
+
+        it 'must show an error message' do
+          debug_file 'restart'
+          check_output_includes 'Ruby program blabla doesn\'t exist',
+                                interface.error_queue
+        end
       end
     end
 
     describe 'byebug runner script is not specified' do
-      before do
-        must_restart
-      end
+      before { must_restart }
 
       it 'must restart anyway' do
         debug_file 'restart'
@@ -124,16 +127,15 @@ describe 'Restart Command' do
     end
 
     describe 'when can\'t change the dir to INITIAL_DIR' do
-      before do
-        force_set_const(Byebug, 'INITIAL_DIR', '/unexistent/path')
-        must_restart
-      end
+      temporary_change_const Byebug, 'INITIAL_DIR', '/unexistent/path'
 
       it 'must restart anyway' do
+        must_restart
         debug_file 'restart'
       end
 
       it 'must show an error message ' do
+        must_restart
         debug_file 'restart'
         check_output_includes \
           'Failed to change initial directory /unexistent/path'

data/test/set_test.rb

@@ -4,7 +4,7 @@ describe 'Set Command' do
   include TestDsl
 
   describe 'setting to on' do
-    Byebug::Command.settings[:autolist] = 0
+    temporary_change_hash Byebug::Command.settings, :autolist, 0
 
     it 'must set a setting to on' do
       enter 'set autolist on'
@@ -32,7 +32,7 @@ describe 'Set Command' do
   end
 
   describe 'setting to off' do
-    Byebug::Command.settings[:autolist] = 1
+    temporary_change_hash Byebug::Command.settings, :autolist, 1
 
     it 'must set a setting to off' do
       enter 'set autolist off'
@@ -51,10 +51,16 @@ describe 'Set Command' do
       debug_file 'set'
       Byebug::Command.settings[:autolist].must_equal 0
     end
+
+    it 'must set a setting to off by "no" prefix and shortcut' do
+      enter 'set noautol'
+      debug_file 'set'
+      Byebug::Command.settings[:autolist].must_equal 0
+    end
   end
 
   describe 'messages' do
-    Byebug::Command.settings[:autolist] = 0
+    temporary_change_hash Byebug::Command.settings, :autolist, 0
 
     it 'must show a message after setting' do
       enter 'set autolist on'
@@ -64,23 +70,35 @@ describe 'Set Command' do
   end
 
   describe 'testing' do
-    it '$byebug_state must get set if "testing" is on' do
-      enter 'set testing', 'break 3', 'cont'
-      debug_file('set') {
-        $byebug_state.must_be_kind_of Byebug::CommandProcessor::State }
-    end
+    describe '$byebug_state' do
+      describe 'when setting "testing" to on' do
+        temporary_change_hash Byebug::Command.settings, :testing, 0
+
+        it 'must get set' do
+          enter 'set testing', 'break 3', 'cont'
+          debug_file('set') {
+            $byebug_state.must_be_kind_of Byebug::CommandProcessor::State }
+        end
+      end
 
-    it 'basename must get set if "testing" is on' do
-      temporary_change_hash_value(Byebug::Command.settings, :basename, false) do
-        enter 'set testing', 'show basename'
-        debug_file('set')
-        check_output_includes 'basename is on.'
+      describe 'when setting "testing" to off' do
+        temporary_change_hash Byebug::Command.settings, :testing, 1
+
+        it 'must get unset' do
+          enter 'set notesting', 'break 3', 'cont'
+          debug_file('set') { $byebug_state.must_be_nil }
+        end
       end
     end
 
-    it '$byebug_state must get unset if "testing" is off' do
-      enter 'set notesting', 'break 3', 'cont'
-      debug_file('set') { $byebug_state.must_be_nil }
+    describe 'basename' do
+      temporary_change_hash Byebug::Command.settings, :basename, false
+
+      it 'must get set if "testing" is on' do
+        enter 'set testing'
+        debug_file('set')
+        Byebug::Command.settings[:basename].must_equal true
+      end
     end
   end
 
@@ -120,19 +138,19 @@ describe 'Set Command' do
     end
 
     describe 'filename' do
+      let(:filename) {
+        File.join(ENV['HOME']||ENV['HOMEPATH']||'.', '.byebug-hist') }
+
       it 'must set history filename' do
         enter 'set history filename .byebug-hist'
         debug_file 'set'
-        interface.histfile.must_equal \
-          File.join(ENV['HOME']||ENV['HOMEPATH']||'.', '.byebug-hist')
+        interface.histfile.must_equal filename
       end
 
       it 'must show a message' do
         enter 'set history filename .byebug-hist'
         debug_file 'set'
-        check_output_includes \
-          'The filename in which to record the command history is ' \
-          "\"#{File.join(ENV['HOME']||ENV['HOMEPATH']||'.', '.byebug-hist')}\""
+        check_output_includes "The command history file is \"#{filename}\""
       end
     end
 
@@ -151,14 +169,13 @@ describe 'Set Command' do
   end
 
   describe 'width' do
-    Byebug::Command.settings[:width] = 20
+    temporary_change_hash Byebug::Command.settings, :width, 20
+    let(:old_columns) { ENV['COLUMNS'] }
 
     it 'must set ENV[\'COLUMNS\'] by the "set width" command' do
-      old_columns = ENV['COLUMNS']
       begin
         enter 'set width 10'
-        debug_file 'set'
-        ENV['COLUMNS'].must_equal '10'
+        debug_file('set') { ENV['COLUMNS'].must_equal '10' }
       ensure
         ENV['COLUMNS'] = old_columns
       end
@@ -174,7 +191,7 @@ describe 'Set Command' do
   end
 
   describe 'Post Mortem' do
-    Byebug::Command.settings[:autolist] = 0
+    temporary_change_hash Byebug::Command.settings, :autolist, 0
 
     it 'must work in post-mortem mode' do
       enter 'cont', 'set autolist on'
@@ -182,5 +199,4 @@ describe 'Set Command' do
       check_output_includes 'autolist is on.'
     end
   end
-
 end

data/test/show_test.rb

@@ -13,19 +13,21 @@ describe 'Show Command' do
   end
 
   describe 'args' do
-    before do
-      Byebug::Command.settings[:argv] = %w{foo bar}
-    end
+    temporary_change_hash Byebug::Command.settings, :argv, %w{foo bar}
 
-    it 'must show args' do
-      enter 'show args'
-      debug_file 'show'
-      check_output_includes 'Argument list to give program being debugged ' \
+    describe 'default behaviour' do
+      it 'must show args' do
+        enter 'show args'
+        debug_file 'show'
+        check_output_includes 'Argument list to give program being debugged ' \
                             'when it is started is "foo bar".'
+      end
     end
 
-    it 'must not show the first arg if BYEBUG_SCRIPT is defined' do
-      temporary_set_const(Byebug, 'BYEBUG_SCRIPT', 'bla') do
+    describe 'when BYEBUG_SCRIPT is defined' do
+      temporary_change_const Byebug, 'BYEBUG_SCRIPT', 'bla'
+
+      it 'must not show the first arg' do
         enter 'show args'
         debug_file 'show'
         check_output_includes 'Argument list to give program being debugged ' \
@@ -34,141 +36,128 @@ describe 'Show Command' do
     end
   end
 
-
-  it 'must show autolist' do
-    temporary_change_hash_value(Byebug::Command.settings, :autolist, 1) do
+  describe 'autolist' do
+    it 'must show default value' do
       enter 'show autolist'
       debug_file 'show'
       check_output_includes 'autolist is on.'
     end
   end
 
-  it 'must show autoeval' do
-    temporary_change_hash_value(Byebug::Command.settings, :autoeval, true) do
+  describe 'autoeval' do
+    it 'must show default value' do
       enter 'show autoeval'
       debug_file 'show'
       check_output_includes 'autoeval is on.'
     end
   end
 
-  it 'must show autoreload' do
-    temporary_change_hash_value(Byebug::Command.settings, :reload_source_on_change, true) do
+  describe 'autoreload' do
+    it 'must show default value' do
       enter 'show autoreload'
       debug_file 'show'
       check_output_includes 'autoreload is on.'
     end
   end
 
-  it 'must show autoirb' do
-    Byebug::IRBCommand.any_instance.stubs(:execute)
-    temporary_change_hash_value(Byebug::Command.settings, :autoirb, 1) do
+  describe 'autoirb' do
+    before { Byebug::IRBCommand.any_instance.stubs(:execute) }
+
+    it 'must show default value' do
       enter 'show autoirb'
       debug_file 'show'
-      check_output_includes 'autoirb is on.'
+      check_output_includes 'autoirb is off.'
     end
   end
 
-  it 'must show basename' do
-    temporary_change_hash_value(Byebug::Command.settings, :basename, true) do
+  describe 'basename' do
+    it 'must show default value' do
       enter 'show basename'
       debug_file 'show'
-      check_output_includes 'basename is on.'
+      check_output_includes 'basename is off.'
     end
   end
 
-  it 'must show callstyle' do
-    temporary_change_hash_value(Byebug::Command.settings, :callstyle, :short) do
+  describe 'callstyle' do
+    it 'must show default value' do
       enter 'show callstyle'
       debug_file 'show'
-      check_output_includes 'Frame call-display style is short.'
+      check_output_includes 'Frame call-display style is last.'
     end
   end
 
-  it 'must show forcestep' do
-    temporary_change_hash_value(Byebug::Command.settings, :force_stepping, true) do
+  describe 'forcestep' do
+    it 'must show default value' do
       enter 'show forcestep'
       debug_file 'show'
-      check_output_includes 'force-stepping is on.'
+      check_output_includes 'force-stepping is off.'
     end
   end
 
-  it 'must show fullpath' do
-    temporary_change_hash_value(Byebug::Command.settings, :full_path, true) do
+  describe 'fullpath' do
+    it 'must show default value' do
       enter 'show fullpath'
       debug_file 'show'
       check_output_includes 'Displaying frame\'s full file names is on.'
     end
   end
 
-  it 'must show linetrace' do
-    enter 'trace on', 'show linetrace', 'trace off'
-    debug_file 'show'
-    check_output_includes 'line tracing is on.'
+  describe 'linetrace' do
+    it 'must show default value' do
+      enter 'show linetrace'
+      debug_file 'show'
+      check_output_includes 'line tracing is off.'
+    end
   end
 
   describe 'linetrace+' do
-    it 'must show a message when linetrace+ is on' do
-      temporary_change_hash_value(Byebug::Command.settings, :tracing_plus, true) do
-        enter 'show linetrace+'
-        debug_file 'show'
-        check_output_includes 'line tracing style is different consecutive lines.'
-      end
-    end
-
-    it 'must show a message when linetrace+ is off' do
-      temporary_change_hash_value(Byebug::Command.settings, :tracing_plus, false) do
-        enter 'show linetrace+'
-        debug_file 'show'
-        check_output_includes 'line tracing style is every line.'
-      end
+    it 'must show default value' do
+      enter 'show linetrace+'
+      debug_file 'show'
+      check_output_includes 'line tracing style is every line.'
     end
   end
 
-  it 'must show listsize' do
-    temporary_change_hash_value(Byebug::Command.settings, :listsize, 10) do
+  describe 'listsize' do
+    it 'must show listsize' do
       enter 'show listsize'
       debug_file 'show'
       check_output_includes 'Number of source lines to list is 10.'
     end
   end
 
-  it 'must show port' do
-    temporary_set_const(Byebug, 'PORT', 12345) do
-      enter 'show port'
+  describe 'trace' do
+    it 'must show trace' do
+      enter 'show trace'
       debug_file 'show'
-      check_output_includes 'server port is 12345.'
+      check_output_includes 'Displaying stack trace is off.'
     end
   end
 
-  it 'must show trace' do
-    temporary_change_hash_value(Byebug::Command.settings, :stack_trace_on_error, true) do
-      enter 'show trace'
+  describe 'version' do
+    it 'must show version' do
+      enter 'show version'
       debug_file 'show'
-      check_output_includes 'Displaying stack trace is on.'
+      check_output_includes "byebug #{Byebug::VERSION}"
     end
   end
 
-  it 'must show version' do
-    enter 'show version'
-    debug_file 'show'
-    check_output_includes "byebug #{Byebug::VERSION}"
-  end
-
-  it 'must show forcestep' do
-    temporary_change_hash_value(Byebug::Command.settings, :width, 35) do
+  describe 'width' do
+    it 'must show width' do
       enter 'show width'
       debug_file 'show'
-      check_output_includes 'width is 35.'
+      check_output_includes 'width is 80.'
     end
   end
 
-  it 'must show a message about unknown command' do
-    enter 'show bla'
-    debug_file 'show'
-    check_output_includes 'Unknown show command bla'
+  describe 'unknown command' do
+    it 'must show a message' do
+      enter 'show bla'
+      debug_file 'show'
+      check_output_includes 'Unknown show command bla'
+    end
   end
 
-
   describe 'history' do
     describe 'without arguments' do
       before do
@@ -181,7 +170,7 @@ describe 'Show Command' do
 
       it 'must show history file' do
         check_output_includes \
-          /The filename in which to record the command history is "hist_file\.txt"/
+          /filename: The command history file is "hist_file\.txt"/
       end
 
       it 'must show history save setting' do
@@ -198,8 +187,7 @@ describe 'Show Command' do
         interface.histfile = 'hist_file.txt'
         enter 'show history filename'
         debug_file 'show'
-        check_output_includes 'The filename in which to record the command ' \
-                              'history is "hist_file.txt"'
+        check_output_includes 'The command history file is "hist_file.txt"'
       end
 
       it 'must show history save setting' do
@@ -219,37 +207,46 @@ describe 'Show Command' do
   end
 
   describe 'commands' do
-    before { interface.readline_support = true }
-
-    it 'must not show records from readline if there is no readline support' do
-      interface.readline_support = false
-      enter 'show commands'
-      debug_file 'show'
-      check_output_includes 'No readline support'
-    end
+    describe 'no readline support' do
+      before { interface.readline_support = false }
 
-    it 'must show records from readline history' do
-      temporary_set_const(Readline, 'HISTORY', %w{aaa bbb ccc ddd eee fff}) do
+      it 'must not show records from readline' do
         enter 'show commands'
         debug_file 'show'
-        check_output_includes /1  aaa/
-        check_output_includes /6  fff/
+        check_output_includes 'No readline support'
       end
     end
 
-    it 'must show last 10 records from readline history' do
-      temporary_set_const(Readline, 'HISTORY', %w{aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm nnn}) do
-        enter 'show commands'
-        debug_file 'show'
-        check_output_doesnt_include /3  ccc/
-        check_output_includes /4  eee/
-        check_output_includes /13  nnn/
+    describe 'readline support' do
+      before { interface.readline_support = true }
+
+      describe 'show records' do
+        temporary_change_const Readline, 'HISTORY', %w{aaa bbb ccc ddd eee fff}
+
+        it 'must show records from readline history' do
+          enter 'show commands'
+          debug_file 'show'
+          check_output_includes /1  aaa/
+          check_output_includes /6  fff/
+        end
+      end
+
+      describe 'max records' do
+        temporary_change_const Readline, 'HISTORY', %w{aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm nnn}
+
+        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/
+        end
       end
-    end
 
-    describe 'with specified positions' do
-      it 'must show records within boundaries' do
-        temporary_set_const(Readline, 'HISTORY', %w{aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm nnn}) do
+      describe 'with specified positions' do
+        temporary_change_const Readline, 'HISTORY', %w{aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm nnn}
+
+        it 'must show records within boundaries' do
           # Really don't know why it substracts 4, and shows starting from position 6
           enter 'show commands 10'
           debug_file 'show'
@@ -257,10 +254,8 @@ describe 'Show Command' do
           check_output_includes /6  ggg/
           check_output_includes /13  nnn/
         end
-      end
 
-      it 'must adjust first line if it is < 0' do
-        temporary_set_const(Readline, 'HISTORY', %w{aaa bbb ccc ddd eee fff ggg hhh iii jjj kkk lll mmm nnn}) do
+        it 'must adjust first line if it is < 0' do
           enter 'show commands 3'
           debug_file 'show'
           check_output_includes /1  bbb/