byebug 2.3.1 → 2.4.0

data/test/quit_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class TestQuit < TestDsl::TestCase
   it 'must quit if user confirmed' do
     Byebug::QuitCommand.any_instance.expects(:exit!)

data/test/reload_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class TestReload < TestDsl::TestCase
 
   describe 'autoreloading' do

data/test/repl_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class TestRepl < TestDsl::TestCase
 
   describe 'Irb Command' do
@@ -13,19 +11,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

data/test/restart_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class RestartExample
   def concat_args(a, b, c)
     a.to_s + b.to_s + c.to_s

data/test/save_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class TestSave < TestDsl::TestCase
 
   describe 'successful saving' do
@@ -11,7 +9,7 @@ class TestSave < TestDsl::TestCase
       debug_file 'save'
     end
     after do
-      FileUtils.rm(file_name)
+      File.delete(file_name)
     end
 
     it 'must save usual breakpoints' do

data/test/set_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class TestSet < TestDsl::TestCase
 
   describe 'setting to on' do
@@ -69,14 +67,14 @@ class TestSet < TestDsl::TestCase
   end
 
   describe 'testing' do
-    describe '$state' do
+    describe 'state' do
       describe 'when setting "testing" to on' do
         temporary_change_hash Byebug.settings, :testing, false
 
         it 'must get set' do
           enter 'set testing', 'break 3', 'cont'
           debug_file('set') {
-            $state.must_be_kind_of Byebug::CommandProcessor::State }
+            state.must_be_kind_of Byebug::CommandProcessor::State }
         end
       end
 
@@ -85,7 +83,7 @@ class TestSet < TestDsl::TestCase
 
         it 'must get unset' do
           enter 'set notesting', 'break 3', 'cont'
-          debug_file('set') { $state.must_be_nil }
+          debug_file('set') { state.must_be_nil }
         end
       end
     end

data/test/show_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class TestShow < TestDsl::TestCase
   describe 'args' do
     temporary_change_hash Byebug.settings, :argv, %w{foo bar}

data/test/source_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class TestSource < TestDsl::TestCase
   let(:filename) { 'source_example.txt' }
 

data/test/stepping_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class SteppingExample
   def self.a(num)
     num += 2
@@ -21,21 +19,21 @@ class TestStepping < TestDsl::TestCase
   describe 'Next Command' do
 
     describe 'method call behaviour' do
-      before { enter "break #{__FILE__}:10", 'cont' }
+      before { enter "break #{__FILE__}:8", 'cont' }
 
       it 'must leave on the same line by default' do
         enter 'next'
-        debug_file('stepping') { $state.line.must_equal 10 }
+        debug_file('stepping') { state.line.must_equal 8 }
       end
 
       it 'must go to the next line if forced by "plus" sign' do
         enter 'next+'
-        debug_file('stepping') { $state.line.must_equal 11 }
+        debug_file('stepping') { state.line.must_equal 9 }
       end
 
       it 'must leave on the same line if forced by "minus" sign' do
         enter 'next-'
-        debug_file('stepping') { $state.line.must_equal 10 }
+        debug_file('stepping') { state.line.must_equal 8 }
       end
 
       describe 'when forcestep is set' do
@@ -43,17 +41,17 @@ class TestStepping < TestDsl::TestCase
 
         it 'must go to the next line' do
           enter 'next'
-          debug_file('stepping') { $state.line.must_equal 11 }
+          debug_file('stepping') { state.line.must_equal 9 }
         end
 
         it 'must go to the next line (by shortcut)' do
           enter 'n'
-          debug_file('stepping') { $state.line.must_equal 11 }
+          debug_file('stepping') { state.line.must_equal 9 }
         end
 
         it 'must go the specified number of lines forward by default' do
           enter 'next 2'
-          debug_file('stepping') { $state.line.must_equal 4 }
+          debug_file('stepping') { state.line.must_equal 4 }
         end
 
         it 'must inform when not staying in the same frame' do
@@ -66,7 +64,7 @@ class TestStepping < TestDsl::TestCase
 
         it 'must ignore it if "minus" is specified' do
           enter 'next-'
-          debug_file('stepping') { $state.line.must_equal 10 }
+          debug_file('stepping') { state.line.must_equal 8 }
         end
       end
     end
@@ -76,7 +74,7 @@ class TestStepping < TestDsl::TestCase
 
       it 'must step over blocks' do
         enter 'next'
-        debug_file('stepping') { $state.line.must_equal 8 }
+        debug_file('stepping') { state.line.must_equal 8 }
       end
     end
   end
@@ -84,21 +82,21 @@ class TestStepping < TestDsl::TestCase
   describe 'Step Command' do
 
     describe 'method call behaviour' do
-      before { enter "break #{__FILE__}:10", 'cont' }
+      before { enter "break #{__FILE__}:8", 'cont' }
 
       it 'must leave on the same line if forced by a setting' do
         enter 'step'
-        debug_file('stepping') { $state.line.must_equal 10 }
+        debug_file('stepping') { state.line.must_equal 8 }
       end
 
       it 'must go to the step line if forced to do that by "plus" sign' do
         enter 'step+'
-        debug_file('stepping') { $state.line.must_equal 11 }
+        debug_file('stepping') { state.line.must_equal 9 }
       end
 
       it 'must leave on the same line if forced to do that by "minus" sign' do
         enter 'step-'
-        debug_file('stepping') { $state.line.must_equal 10 }
+        debug_file('stepping') { state.line.must_equal 8 }
       end
 
       describe 'when forcestep is set' do
@@ -106,17 +104,17 @@ class TestStepping < TestDsl::TestCase
 
         it 'must go to the step line if forced by a setting' do
           enter 'step'
-          debug_file('stepping') { $state.line.must_equal 11 }
+          debug_file('stepping') { state.line.must_equal 9 }
         end
 
         it 'must go to the next line if forced by a setting (by shortcut)' do
           enter 's'
-          debug_file('stepping') { $state.line.must_equal 11 }
+          debug_file('stepping') { state.line.must_equal 9 }
         end
 
         it 'must go the specified number of lines forward by default' do
           enter 'step 2'
-          debug_file('stepping') { $state.line.must_equal 15 }
+          debug_file('stepping') { state.line.must_equal 13 }
         end
       end
     end
@@ -126,7 +124,7 @@ class TestStepping < TestDsl::TestCase
 
       it 'must step into blocks' do
         enter 'step'
-        debug_file('stepping') { $state.line.must_equal 5 }
+        debug_file('stepping') { state.line.must_equal 5 }
       end
     end
   end

data/test/support/test_dsl.rb

@@ -6,6 +6,7 @@ module TestDsl
     def setup
       Byebug.handler = Byebug::CommandProcessor.new(TestInterface.new)
       Byebug.tracing = false
+      Byebug.breakpoints.clear if Byebug.breakpoints
     end
 
     def self.temporary_change_hash hash, key, value
@@ -79,20 +80,19 @@ module TestDsl
   #
   # Runs byebug with the provided basename for a file.
   #
-  # The file should be placed in the test/examples dir. You also can specify a
-  # block, which will be executed when Processor extracts all the commands from
-  # the input queue. You can use that for making asserts on the current test. If
-  # you specified the block and it never was executed, the test will fail.
+  # You also can specify a block, which will be executed when Processor extracts
+  # all the commands from the input queue. You can use that for making asserts
+  # on the current test. If you specified the block and it never was executed,
+  # the test will fail.
   #
   # Usage:
-  #   debug "ex1" # ex1 should be placed in test/examples/ex1.rb
+  #   debug_file '/path/to/ex1.rb'
   #
   #   enter 'b 4', 'cont'
-  #   debug("ex1") { $state.line.must_equal 4 }
+  #   debug_file('/path/to/ex2.rb') { state.line.must_equal 4 }
   #
-  def debug_file(filename, &block)
+  def debug_file(filename, options = {}, &block)
     is_test_block_called = false
-    debug_completed = false
     exception = nil
     Byebug.stubs(:run_init_script)
     if block
@@ -105,15 +105,19 @@ module TestDsl
           block.call
         rescue Exception => e
           exception = e
-          raise e
         end
       end
     end
-    Byebug.start do
+    begin
       load fullpath(filename)
-      debug_completed = true
+    rescue Exception => e
+      if options[:rescue]
+        interface.test_block.call if interface.test_block
+      else
+        raise e
+      end
     end
-    flunk "Debug block was not completed" unless debug_completed
+
     flunk "Test block was provided, but not called" if block && !is_test_block_called
     raise exception if exception
   end
@@ -153,8 +157,12 @@ module TestDsl
     Byebug.handler.interface
   end
 
+  def state
+    Thread.current.thread_variable_get('state')
+  end
+
   def context
-    $state.context
+    state.context
   end
 
   def force_set_const(klass, const, value)

data/test/test_helper.rb

@@ -1,4 +1,5 @@
-require 'minitest/autorun'
+require 'minitest'
+require 'minitest/spec'
 require 'pathname'
 require 'mocha/setup'
 require 'byebug'
@@ -15,3 +16,24 @@ end
 # Init globals to avoid warnings
 $bla = nil
 $binding = binding # this is from irb...
+
+# Load the test files from the command line.
+argv = ARGV.select do |argument|
+  case argument
+  when /^-/ then
+    argument
+  when /\*/ then
+    Dir.glob('test/*_test.rb').each do |file|
+      require File.expand_path file
+    end
+    false
+  else
+    require File.expand_path argument
+    false
+  end
+end
+
+ARGV.replace argv
+
+# Run the tests
+Minitest.run

data/test/thread_test.rb

@@ -1,5 +1,3 @@
-require_relative 'test_helper'
-
 class ThreadExample
   def initialize
     Thread.main[:should_break] = false
@@ -34,20 +32,20 @@ class TestThread < TestDsl::TestCase
   describe 'list' do
     it 'must show current thread by "plus" sign' do
       thnum = nil
-      enter "break #{__FILE__}:9", 'cont', 'thread list', release
+      enter "break #{__FILE__}:7", 'cont', 'thread list', release
       debug_file('thread') { thnum = Byebug.contexts.first.thnum }
-      check_output_includes(/\+ #{thnum} #<Thread:\S+ run>\t#{__FILE__}:9/)
+      check_output_includes(/\+ #{thnum} #<Thread:\S+ run>\t#{__FILE__}:7/)
     end
 
     it 'must work with shortcut' do
       thnum = nil
-      enter "break #{__FILE__}:9", 'cont', 'th list', release
+      enter "break #{__FILE__}:7", 'cont', 'th list', release
       debug_file('thread') { thnum = Byebug.contexts.first.thnum }
-      check_output_includes(/\+ #{thnum} #<Thread:\S+ run>\t#{__FILE__}:9/)
+      check_output_includes(/\+ #{thnum} #<Thread:\S+ run>\t#{__FILE__}:7/)
     end
 
     it 'must show 3 available threads' do
-      enter "break #{__FILE__}:22", 'cont', 'thread list', release
+      enter "break #{__FILE__}:20", 'cont', 'thread list', release
       debug_file 'thread'
       check_output_includes(/(\+)?\d+ #<Thread:\S+ (sleep|run)>/,
                             /(\+)?\d+ #<Thread:\S+ (sleep|run)>/,
@@ -58,28 +56,28 @@ class TestThread < TestDsl::TestCase
   describe 'stop' do
     it 'must mark thread as suspended' do
       thnum = nil
-      enter "break #{__FILE__}:22", 'cont',
+      enter "break #{__FILE__}:20", 'cont',
             ->{ "thread stop #{Byebug.contexts.last.thnum}" }, release
       debug_file('thread') { thnum = Byebug.contexts.last.thnum }
       check_output_includes(/\$ #{thnum} #<Thread:/)
     end
 
     it 'must actually suspend thread execution' do
-      enter "break #{__FILE__}:22", 'cont', 'trace on',
+      enter "break #{__FILE__}:20", 'cont', 'trace on',
             ->{ "thread stop #{Byebug.contexts.last.thnum}" }, release
       debug_file('thread')
-      check_output_doesnt_include(/Tracing: #{__FILE__}:17/,
-                                  /Tracing: #{__FILE__}:18/)
+      check_output_doesnt_include(/Tracing: #{__FILE__}:15/,
+                                  /Tracing: #{__FILE__}:16/)
     end
 
     it 'must show error message if thread number is not specified' do
-      enter "break #{__FILE__}:9", 'cont', 'thread stop', release
+      enter "break #{__FILE__}:7", 'cont', 'thread stop', release
       debug_file 'thread'
       check_error_includes '"thread stop" needs a thread number'
     end
 
     it 'must show error message when trying to stop current thread' do
-      enter "break #{__FILE__}:9", 'cont',
+      enter "break #{__FILE__}:7", 'cont',
             ->{"thread stop #{Byebug.contexts.first.thnum}"}, release
       debug_file 'thread'
       check_error_includes "It's the current thread"
@@ -89,7 +87,7 @@ class TestThread < TestDsl::TestCase
   describe 'resume' do
     it 'must mark remove thread from the suspended state' do
       thnum = nil
-      enter "break #{__FILE__}:22", 'cont',
+      enter "break #{__FILE__}:20", 'cont',
             -> { thnum = Byebug.contexts.last.thnum ; "thread stop #{thnum}" },
             -> { "thread resume #{thnum}" }, release
       debug_file('thread') { Byebug.contexts.last.suspended?.must_equal false }
@@ -97,20 +95,20 @@ class TestThread < TestDsl::TestCase
     end
 
     it 'must show error message if thread number is not specified' do
-      enter "break #{__FILE__}:9", 'cont', 'thread resume', release
+      enter "break #{__FILE__}:7", 'cont', 'thread resume', release
       debug_file 'thread'
       check_error_includes '"thread resume" needs a thread number'
     end
 
     it 'must show error message when trying to resume current thread' do
-      enter "break #{__FILE__}:9", 'cont',
+      enter "break #{__FILE__}:7", 'cont',
             ->{ "thread resume #{Byebug.contexts.first.thnum}" }, release
       debug_file 'thread'
       check_error_includes "It's the current thread"
     end
 
     it 'must show error message if it is not stopped' do
-      enter "break #{__FILE__}:22", 'cont',
+      enter "break #{__FILE__}:20", 'cont',
             ->{ "thread resume #{Byebug.contexts.last.thnum}" }, release
       debug_file 'thread'
       check_error_includes 'Already running'
@@ -119,19 +117,19 @@ class TestThread < TestDsl::TestCase
 
   describe 'switch' do
     it 'must switch to another thread' do
-      enter "break #{__FILE__}:22", 'cont',
+      enter "break #{__FILE__}:20", 'cont',
             ->{ "thread switch #{Byebug.contexts.last.thnum}" }, release
-      debug_file('thread') { $state.line.must_equal 17 }
+      debug_file('thread') { assert_equal state.line, 15 }
     end
 
     it 'must show error message if thread number is not specified' do
-      enter "break #{__FILE__}:9", 'cont', 'thread switch', release
+      enter "break #{__FILE__}:7", 'cont', 'thread switch', release
       debug_file 'thread'
       check_error_includes '"thread switch" needs a thread number'
     end
 
     it 'must show error message when trying to switch current thread' do
-      enter "break #{__FILE__}:9", 'cont',
+      enter "break #{__FILE__}:7", 'cont',
             ->{ "thread switch #{Byebug.contexts.first.thnum}" }, release
       debug_file 'thread'
       check_error_includes "It's the current thread"