byebug 1.2.0 → 1.3.0

data/test/frame_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Frame Command' do
-  include TestDsl
+class TestFrame < TestDsl::TestCase
 
   # XXX: Calculate magic number dinamically, like
   # "longest_string_in_test_output".size

data/test/help_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Help Command' do
-  include TestDsl
+class TestHelp < TestDsl::TestCase
   include Columnize
 
   let(:available_commands) {

data/test/info_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Info Command' do
-  include TestDsl
+class TestInfo < TestDsl::TestCase
   include Columnize
 
    describe 'Args info' do

data/test/jump_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe "Jump Command" do
-  include TestDsl
+class TestJump < TestDsl::TestCase
 
   describe "successful" do
     it "must jump with absolute line number" do

data/test/kill_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Kill Command' do
-  include TestDsl
+class TestKill < TestDsl::TestCase
 
   it 'must send signal to some pid' do
     Process.expects(:kill).with('USR1', Process.pid)

data/test/list_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'List Command' do
-  include TestDsl
+class TestList < TestDsl::TestCase
 
   describe 'listsize' do
     it 'must show lines according to :listsize setting' do

data/test/method_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Method Command' do
-  include TestDsl
+class TestMethod < TestDsl::TestCase
 
   temporary_change_hash Byebug::Command.settings, :autolist, 0
 

data/test/post_mortem_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Post Mortem' do
-  include TestDsl
+class TestPostMortem < TestDsl::TestCase
 
   it 'must enter into post mortem mode' do
     enter 'cont'

data/test/quit_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Quit Command' do
-  include TestDsl
+class TestQuit < TestDsl::TestCase
 
   it 'must quit if user confirmed' do
     Byebug::QuitCommand.any_instance.expects(:exit!)

data/test/reload_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Reload Command' do
-  include TestDsl
+class TestReload < TestDsl::TestCase
 
   describe 'autoreloading' do
     after { Byebug::Command.settings[:autoreload] = true }

data/test/repl_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Repl commands' do
-  include TestDsl
+class TestRepl < TestDsl::TestCase
 
   describe 'Irb Command' do
     before do

data/test/restart_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Restart Command' do
-  include TestDsl
+class TestRestart < TestDsl::TestCase
 
   def must_restart
     Byebug::RestartCommand.any_instance.unstub(:exec)

data/test/save_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Save Command' do
-  include TestDsl
+class TestSave < TestDsl::TestCase
 
   describe 'successful saving' do
     let(:file_name) { 'save_output.txt' }

data/test/set_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Set Command' do
-  include TestDsl
+class TestSet < TestDsl::TestCase
 
   describe 'setting to on' do
     temporary_change_hash Byebug::Command.settings, :autolist, 0
@@ -170,15 +169,11 @@ describe 'Set Command' do
 
   describe 'width' do
     temporary_change_hash Byebug::Command.settings, :width, 20
-    let(:old_columns) { ENV['COLUMNS'] }
-
-    it 'must set ENV[\'COLUMNS\'] by the "set width" command' do
-      begin
-        enter 'set width 10'
-        debug_file('set') { ENV['COLUMNS'].must_equal '10' }
-      ensure
-        ENV['COLUMNS'] = old_columns
-      end
+
+    it 'must get correctly set' do
+      enter 'set width 10'
+      debug_file('set')
+      Byebug::Command.settings[:width].must_equal 10
     end
   end
 

data/test/show_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Show Command' do
-  include TestDsl
+class TestShow < TestDsl::TestCase
 
   describe 'annotate' do
     it 'must show annotate setting' do
@@ -143,10 +142,12 @@ describe 'Show Command' do
   end
 
   describe 'width' do
-    it 'must show width' do
+    let(:cols) { `stty size`.scan(/\d+/)[1].to_i }
+
+    it 'must show default width' do
       enter 'show width'
       debug_file 'show'
-      check_output_includes 'width is 80.'
+      check_output_includes "width is #{cols}."
     end
   end
 

data/test/source_test.rb

@@ -1,7 +1,6 @@
 require_relative 'test_helper'
 
-describe 'Source Command' do
-  include TestDsl
+class TestSource < TestDsl::TestCase
 
   before { File.open(filename, 'w') do |f|
              f.puts 'break 2'

data/test/stepping_test.rb

@@ -1,51 +1,63 @@
 require_relative 'test_helper'
 
-describe 'Stepping Commands' do
-  include TestDsl
+class TestStepping < TestDsl::TestCase
 
   describe 'Next Command' do
 
     describe 'Usual mode' do
-      before { enter 'break 10', 'cont' }
 
-      it 'must leave on the same line by default' do
-        enter 'next'
-        debug_file('stepping') { state.line.must_equal 10 }
-      end
-
-      it 'must go to the next line if forced by "plus" sign' do
-        enter 'next+'
-        debug_file('stepping') { state.line.must_equal 11 }
-      end
-
-      it 'must leave on the same line if forced by "minus" sign' do
-        enter 'next-'
-        debug_file('stepping') { state.line.must_equal 10 }
-      end
-
-      describe 'when force_stepping is set' do
-        temporary_change_hash Byebug::Command.settings, :force_stepping, true
+      describe 'method call behaviour' do
+        before { enter 'break 10', 'cont' }
 
-        it 'must go to the next line' do
+        it 'must leave on the same line by default' do
           enter 'next'
-          debug_file('stepping') { state.line.must_equal 11 }
+          debug_file('stepping') { state.line.must_equal 10 }
         end
 
-        it 'must go to the next line (by shortcut)' do
-          enter 'n'
+        it 'must go to the next line if forced by "plus" sign' do
+          enter 'next+'
           debug_file('stepping') { state.line.must_equal 11 }
         end
 
-        it 'must go the specified number of lines forward by default' do
-          enter 'next 2'
-          debug_file('stepping') { state.line.must_equal 21 }
-        end
-
-        it 'must ignore it if "minus" is specified' do
+        it 'must leave on the same line if forced by "minus" sign' do
           enter 'next-'
           debug_file('stepping') { state.line.must_equal 10 }
         end
+
+        describe 'when force_stepping is set' do
+          temporary_change_hash Byebug::Command.settings, :force_stepping, true
+
+          it 'must go to the next line' do
+            enter 'next'
+            debug_file('stepping') { state.line.must_equal 11 }
+          end
+
+          it 'must go to the next line (by shortcut)' do
+            enter 'n'
+            debug_file('stepping') { state.line.must_equal 11 }
+          end
+
+          it 'must go the specified number of lines forward by default' do
+            enter 'next 2'
+            debug_file('stepping') { state.line.must_equal 21 }
+          end
+
+          it 'must ignore it if "minus" is specified' do
+            enter 'next-'
+            debug_file('stepping') { state.line.must_equal 10 }
+          end
+        end
       end
+
+      describe 'block behaviour' do
+        before { enter 'break 21', 'cont' }
+
+        it 'must step over blocks' do
+          enter 'next'
+          debug_file('stepping') { state.line.must_equal 25 }
+        end
+      end
+
     end
 
     describe 'Post Mortem' do
@@ -58,46 +70,60 @@ describe 'Stepping Commands' do
           'Unknown command: "next".  Try "help".', interface.error_queue
       end
     end
+
   end
 
   describe 'Step Command' do
 
     describe 'Usual mode' do
-      before { enter 'break 10', 'cont' }
-
-      it 'must leave on the same line if forced by a setting' do
-        enter 'step'
-        debug_file('stepping') { state.line.must_equal 10 }
-      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 }
-      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 }
-      end
+      describe 'method call behaviour' do
+        before { enter 'break 10', 'cont' }
 
-      describe 'when force_stepping is set' do
-        temporary_change_hash Byebug::Command.settings, :force_stepping, true
-
-        it 'must go to the step line if forced by a setting' do
+        it 'must leave on the same line if forced by a setting' do
           enter 'step'
-          debug_file('stepping') { state.line.must_equal 11 }
+          debug_file('stepping') { state.line.must_equal 10 }
         end
 
-        it 'must go to the next line if forced by a setting (by shortcut)' do
-          enter 's'
+        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 }
         end
 
-        it 'must go the specified number of lines forward by default' do
-          enter 'step 2'
-          debug_file('stepping') { state.line.must_equal 15 }
+        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 }
+        end
+
+        describe 'when force_stepping is set' do
+          temporary_change_hash Byebug::Command.settings, :force_stepping, true
+
+          it 'must go to the step line if forced by a setting' do
+            enter 'step'
+            debug_file('stepping') { state.line.must_equal 11 }
+          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 }
+          end
+
+          it 'must go the specified number of lines forward by default' do
+            enter 'step 2'
+            debug_file('stepping') { state.line.must_equal 15 }
+          end
+        end
+      end
+
+      describe 'block behaviour' do
+        before { enter 'break 21', 'cont' }
+
+        it 'must step into blocks' do
+          enter 'step'
+          debug_file('stepping') { state.line.must_equal 22 }
         end
       end
+
     end
 
     describe 'Post Mortem' do

data/test/support/test_dsl.rb

@@ -1,12 +1,60 @@
 module TestDsl
 
-  def self.included(base)
-    base.class_eval do
-      extend ClassUtils
-      before do
-        Byebug.interface = TestInterface.new
-        Byebug.handler.display.clear
+  module ClassUtils
+
+    def temporary_change_hash hash, key, value
+      mod = Module.new do
+        extend Minitest::Spec::DSL
+
+        before do
+          @old_hashes ||= {}
+          @old_hashes.merge!({ hash => { key => hash[key] } }) do |k, v1, v2|
+            v1.merge(v2)
+          end
+          hash[key] = value
+        end
+
+        after do
+          hash[key] = @old_hashes[hash][key]
+        end
+      end
+
+      include mod
+    end
+
+    def temporary_change_const klass, const, value
+      mod = Module.new do
+        extend Minitest::Spec::DSL
+
+        before do
+          @old_consts ||= {}
+          old_value = klass.const_defined?(const) ?
+                      klass.const_get(const) : :__undefined__
+          @old_consts.merge!({ klass => { const => old_value } }) do |k, v1, v2|
+            v1.merge(v2)
+          end
+          klass.send :remove_const, const if klass.const_defined?(const)
+          klass.const_set const, value unless value == :__undefined__
+        end
+
+        after do
+          klass.send :remove_const, const if klass.const_defined?(const)
+          klass.const_set const, @old_consts[klass][const] unless
+            @old_consts[klass][const] == :__undefined__
+        end
       end
+
+      include mod
+    end
+  end
+
+  class TestCase < Minitest::Spec
+    extend TestDsl::ClassUtils
+    include TestDsl
+
+    def setup
+      Byebug.interface = TestInterface.new
+      Byebug.handler.display.clear
     end
   end
 
@@ -136,52 +184,4 @@ module TestDsl
     File.open(file, 'w') { |f| f.write(new_content) }
   end
 
-
-  module ClassUtils
-    def temporary_change_hash hash, key, value
-      mod = Module.new do
-        extend Minitest::Spec::DSL
-
-        before do
-          @old_hashes ||= {}
-          @old_hashes.merge!({ hash => { key => hash[key] } }) do |k, v1, v2|
-            v1.merge(v2)
-          end
-          hash[key] = value
-        end
-
-        after do
-          hash[key] = @old_hashes[hash][key]
-        end
-      end
-
-      include mod
-    end
-
-    def temporary_change_const klass, const, value
-      mod = Module.new do
-        extend Minitest::Spec::DSL
-
-        before do
-          @old_consts ||= {}
-          old_value = klass.const_defined?(const) ?
-                      klass.const_get(const) : :__undefined__
-          @old_consts.merge!({ klass => { const => old_value } }) do |k, v1, v2|
-            v1.merge(v2)
-          end
-          klass.send :remove_const, const if klass.const_defined?(const)
-          klass.const_set const, value unless value == :__undefined__
-        end
-
-        after do
-          klass.send :remove_const, const if klass.const_defined?(const)
-          klass.const_set const, @old_consts[klass][const] unless
-            @old_consts[klass][const] == :__undefined__
-        end
-      end
-
-      include mod
-    end
-  end
-
 end