byebug 2.1.1 → 2.2.0

data/test/conditions_test.rb

@@ -6,19 +6,18 @@ class TestConditions < TestDsl::TestCase
     before { enter 'break 3' }
 
     describe 'successfully' do
+      before { enter ->{ "cond #{Byebug.breakpoints.first.id} b == 5" }, 'cont'}
+
       it 'must assign the expression to breakpoint' do
-        enter ->{ "cond #{Byebug.breakpoints.first.id} b == 5" }, 'cont'
         debug_file('conditions') {
           Byebug.breakpoints.first.expr.must_equal 'b == 5' }
       end
 
       it 'must stop at the breakpoint if condition is true' do
-        enter ->{ "cond #{Byebug.breakpoints.first.id} b == 5" }, 'cont'
         debug_file('conditions') { $state.line.must_equal 3 }
       end
 
       it 'must work with full command name too' do
-        enter ->{ "condition #{Byebug.breakpoints.first.id} b == 5" }, 'cont'
         debug_file('conditions') { $state.line.must_equal 3 }
       end
     end

data/test/continue_test.rb

@@ -1,5 +1,11 @@
 require_relative 'test_helper'
 
+class ContinueExample
+  def self.a(num)
+    num + 4
+  end
+end
+
 class TestContinue < TestDsl::TestCase
 
   describe "successful" do

data/test/edit_test.rb

@@ -16,9 +16,9 @@ class TestEdit < TestDsl::TestCase
   describe 'open default editor' do
     temporary_change_hash ENV, 'EDITOR', nil
 
-    it 'must call "ex" with current line and file if EDITOR env not set' do
+    it 'must call "vim" with current line and file if EDITOR env not set' do
       Byebug::Edit.any_instance.expects(:system).
-                                with("ex +2 #{fullpath('edit')}")
+                                with("vim +2 #{fullpath('edit')}")
       enter 'edit'
       debug_file 'edit'
     end
@@ -44,6 +44,6 @@ class TestEdit < TestDsl::TestCase
   it 'must show an error if there is incorrect syntax' do
     enter 'edit blabla'
     debug_file 'edit'
-    check_error_includes 'Invalid file/line number specification: blabla'
+    check_error_includes 'Invalid file[:line] number specification: blabla'
   end
 end

data/test/eval_test.rb

@@ -1,7 +1,16 @@
 require_relative 'test_helper'
 
-class TestEval < TestDsl::TestCase
+class EvalTest
+  def sum(a,b)
+    a + b
+  end
+
+  def inspect
+    raise "Broken"
+  end
+end
 
+class TestEval < TestDsl::TestCase
   it 'must evaluate an expression' do
     enter 'eval 3 + 2'
     debug_file 'eval'
@@ -21,8 +30,8 @@ class TestEval < TestDsl::TestCase
   end
 
   it 'must work when inspect raises an exception' do
-    enter 'c 14', 'p @foo'
-    debug_file('eval') { $state.line.must_equal 14 }
+    enter 'c 4', 'p @foo'
+    debug_file('eval') { $state.line.must_equal 4 }
     check_output_includes 'RuntimeError Exception: Broken'
   end
 
@@ -49,7 +58,7 @@ class TestEval < TestDsl::TestCase
       it 'must show a stack trace' do
         enter 'eval 2 / 0'
         debug_file 'eval'
-        check_output_includes /\s*from \S+:in \`eval\'/
+        check_output_includes(/\s*from \S+:in \`eval\'/)
         check_output_doesnt_include 'ZeroDivisionError Exception: divided by 0'
       end
     end
@@ -61,7 +70,7 @@ class TestEval < TestDsl::TestCase
         enter 'eval 2 / 0'
         debug_file 'eval'
         check_output_includes 'ZeroDivisionError Exception: divided by 0'
-        check_output_doesnt_include /\S+:\d+:in `eval':divided by 0/
+        check_output_doesnt_include(/\S+:\d+:in `eval':divided by 0/)
       end
     end
   end

data/test/examples/breakpoint.rb

@@ -1,15 +1,6 @@
-class BreakpointExample
-  def self.a
-    4
-  end
-  def b
-    3
-  end
-end
-
-a = 3
+y = 3
 # A comment
 byebug
-b = 5
-c = a + b
-load Pathname.new(__FILE__ + "/../breakpoint2.rb").cleanpath
+z = 5
+BreakpointExample.new.b
+BreakpointExample.a(y+z)

data/test/examples/breakpoint_deep.rb

@@ -1,24 +1,4 @@
-class SteppingExample
-  def a
-    z = 2
-    b
-  end
-
-  def b
-    v2 = 5 if 1 == 2 ; [1,2,3].map { |a| a.to_f }
-    c
-  end
-
-  def c
-    z = 4
-    5
-    byebug
-  end
-end
-
-ex = SteppingExample.new.a
+ex = BreakpointDeepExample.new.a
 2.times do
   ex += 1
 end
-
-ex

data/test/examples/conditions.rb

@@ -1,4 +1,4 @@
 byebug
 b = 5
 c = b + 5
-c
+c = Object.new

data/test/examples/continue.rb

@@ -1,4 +1,5 @@
 byebug
+
 b = 5
 c = b + 5
-c
+ContinueExample.a(c)

data/test/examples/edit.rb

@@ -1,3 +1,4 @@
 byebug
 d = 1
 b = 2
+DummyObject.new(b, d)

data/test/examples/eval.rb

@@ -1,14 +1,4 @@
 byebug
 
-b = 5
-c = b + 5
-c
-
-class EvalTest
-  def inspect
-    raise "Broken"
-  end
-end
-
 @foo = EvalTest.new
-b = 6
+@foo.sum(1, 2)

data/test/examples/finish.rb

@@ -1,20 +1,3 @@
 byebug
 
-class FinishExample
-  def a
-    b
-  end
-  def b
-    c
-    2
-  end
-  def c
-    d
-    3
-  end
-  def d
-    5
-  end
-end
-
 FinishExample.new.a

data/test/examples/frame.rb

@@ -1,28 +1,4 @@
 byebug
 
-class FrameExample
-  def initialize(f)
-    @f = f
-  end
-
-  def a
-    b
-  end
-
-  def b
-    c
-    2
-  end
-
-  def c
-    d('a')
-    3
-  end
-
-  def d(e)
-    5
-  end
-end
-
-local_var = "hola"
-FrameExample.new('f').a
+fr_ex = FrameExample.new('f')
+fr_ex.a()

data/test/examples/frame_deep.rb

@@ -1,20 +1 @@
-class FrameDeepExample
-  def a
-    z = 1
-    z += b
-  end
-  def b
-    z = 2
-    z += c
-  end
-  def c
-    z = 3
-    byebug
-    z += d('a')
-  end
-  def d(e)
-    z = 4
-  end
-end
-
 FrameDeepExample.new.a

data/test/examples/help.rb

@@ -1,2 +1 @@
 byebug
-1

data/test/examples/info.rb

@@ -1,38 +1,6 @@
 byebug
-def bla(a, b)
-  a + b
-end
-z = 5
-z = 6
-z = 7
-z = 8
-z = 9
-bla("a" * 30, "b")
 
-class InfoExample
-  def initialize
-    @foo = "bar"
-    @bla = "blabla"
-  end
-
-  def a
-    a = "1" * 30
-    b = 2
-    @foo
-  end
-
-  def c
-    a = BasicObject.new
-    a
-  end
-
-  def b
-    a
-    e = "%.2f"
-    e
-  end
-end
-
-InfoExample.new.b
-InfoExample.new.a
-InfoExample.new.c
+i = InfoExample.new
+i.b
+i.c
+i.d

data/test/examples/kill.rb

@@ -1,2 +1,2 @@
 byebug
-1
+KillExample.kill_me

data/test/examples/list.rb

@@ -20,4 +20,4 @@ a = 19
 a = 20
 a = 21
 a = 22
-a = '%23'
+a = '%23'

data/test/examples/method.rb

@@ -1,15 +1,4 @@
 byebug
-class MethodExample
-  def initialize
-    @a = 'b'
-    @c = 'd'
-  end
-  def self.foo
-    "asdf"
-  end
-  def bla
-    "asdf"
-  end
-end
+
 a = MethodExample.new
-a
+a.bla

data/test/examples/post_mortem.rb

@@ -1,19 +1,4 @@
 byebug
 
-class CatchExample
-  def a
-    begin
-      Byebug.post_mortem do
-        z = 4
-        raise 'blabla'
-        x = 6
-      end
-    rescue => e
-      e
-    end
-  end
-end
-
-c = CatchExample.new
+c = PostMortemExample.new
 c.a
-c

data/test/examples/quit.rb

@@ -1,2 +1,2 @@
 byebug
-1
+DummyObject.new

data/test/examples/reload.rb

@@ -3,4 +3,4 @@ a = 2
 a = 3
 a = 4
 a = 5
-a = 6
+a = 6

data/test/examples/restart.rb

@@ -3,4 +3,4 @@ byebug
 a = ARGV[0]
 b = ARGV[1]
 c = ARGV[2]
-d = a.to_s + b.to_s + c.to_s
+RestartExample.new.concat_args(a, b, c)

data/test/examples/show.rb

@@ -1,2 +1 @@
 byebug
-2

data/test/examples/stepping.rb

@@ -1,25 +1,8 @@
 byebug
 
-class SteppingExample
-  def a
-    z = 2
-    b
-  end
-
-  def b
-    v2 = 5 if 1 == 2 ; [1,2,3].map { |a| a.to_f }
-    c
-  end
-
-  def c
-    z = 4
-    5
-  end
-end
-
-ex = SteppingExample.new.a
+ex = SteppingExample.a(7)
 2.times do
   ex += 1
 end
 
-ex
+SteppingExample.b(ex)

data/test/examples/thread.rb

@@ -1,31 +1,4 @@
 byebug
-class ThreadExample
-  def initialize
-    Thread.main[:should_break] = false
-  end
-
-  def launch
-    @t1 = Thread.new do
-      while true
-        break if Thread.main[:should_break]
-        sleep 0.02
-      end
-    end
-
-    @t2 = Thread.new do
-      while true
-        sleep 0.02
-      end
-    end
-
-    @t1.join
-    Thread.main[:should_break]
-  end
-
-  def kill
-    @t2.kill
-  end
-end
 
 t = ThreadExample.new
 t.launch

data/test/examples/variables.rb

@@ -1,26 +1,4 @@
 byebug
-class VariablesExample
-  SOMECONST = 'foo' unless defined?(SOMECONST)
-
-  def initialize
-    $glob = 100
-    @inst_a = 1
-    @inst_b = 2
-    @inst_c = "1" * 40
-    @inst_d = BasicObject.new
-    @@class_c = 3
-  end
-
-  def run
-    a = 4
-    b = [1, 2, 3].map do |i|
-      a * i
-    end
-    b
-  end
-
-end
 
 v = VariablesExample.new
 v.run
-v