wrong 0.3.0 → 0.3.1

data/test/adapters/rspec_test.rb

@@ -1,7 +1,7 @@
 require "./test/test_helper"
 require "wrong/adapters/rspec"
 
-regarding "testing rspec" do
+describe "testing rspec" do
   it "works" do
     # I would use
     #    out, err = capturing(:stdout, :stderr) do

data/test/adapters/test_unit_test.rb

@@ -6,19 +6,8 @@ require "wrong/assert"
 require "wrong/adapters/test_unit"
 
 class MyFailingAssertTest <  Test::Unit::TestCase
-  
-  def test_strip_out_other_assert_methods
-    #because they call into assert and we're redfining that method so it's potentially confusing
-    
-    begin
-      Class.new(Test::Unit::TestCase).assert_equal(1, 1)
-    rescue StandardError => e
-      e.message.include?("has been disabled")
-    end
-  end
-  
-  
-  def test_assert_and_deny_are_available_to_test_unit_tests
+
+  def test_wrong_assert_and_deny_are_available_to_test_unit_tests
     my_failing_assert_test = Class.new(Test::Unit::TestCase)
     my_failing_assert_test.class_eval do
       def test_fail
@@ -46,5 +35,20 @@ class MyFailingAssertTest <  Test::Unit::TestCase
     assert{ failures.length==1 }
     assert{ failures.first.long_display.include?("1 is equal to 1") }
   end
-  
+
+  def test_passes_asserts_with_no_block_up_to_the_frameworks_assert_method
+    e = rescuing { assert(1 == 2) }
+    assert { e.message == "<false> is not true." }
+
+    e = rescuing { assert(1 == 2, "black is white") }
+    assert { e.message == "black is white.\n<false> is not true." }
+  end
+
+  def test_passes_denys_with_no_block_up_to_the_frameworks_assert_method
+    e = rescuing { deny(2 + 2 == 4) }
+    assert { e.message == "<false> is not true." }
+
+    e = rescuing { deny(2 + 2 == 4, "up is down") }
+    assert { e.message == "up is down.\n<false> is not true." }
+  end
 end

data/test/assert_test.rb

@@ -1,7 +1,7 @@
 require "./test/test_helper"
 require "wrong/assert"
 
-regarding "basic assert features" do
+describe "basic assert features" do
 
   before do
     @m = Module.new do
@@ -9,8 +9,8 @@ regarding "basic assert features" do
     end
   end
 
-  regarding "pass/fail basics" do
-    test "passes when the result is true.  deny does the reverse" do
+  describe "pass/fail basics" do
+    it "passes when the result is true.  deny does the reverse" do
       @m.assert { true }
       @m.assert { 1==1 }
 
@@ -18,7 +18,7 @@ regarding "basic assert features" do
       @m.deny { 1==2 }
     end
 
-    test "fails when result is false.  deny does the reverse" do
+    it "fails when result is false.  deny does the reverse" do
       get_error {
         @m.assert { false }
       } || fail
@@ -37,31 +37,44 @@ regarding "basic assert features" do
     class MyError < StandardError;
     end
 
-    test "both deny and assert fail when an error is thrown.  bubbles up the error." do
-      assert_raises(MyError) { @m.assert { raise MyError.new } }
-      assert_raises(MyError) { @m.deny { raise MyError.new } }
-    end
+    describe "assert" do
+      it "fails when an error is thrown and bubbles up the error" do
+        assert_raises(MyError) { @m.assert { raise MyError.new } }
+      end
+
+      it "takes an optional explanation" do
+        e = get_error {
+          sky = "green"
+          @m.assert("the sky should be blue") { sky == "blue" }
+        }
+        assert e.message =~ /^the sky should be blue: /
+      end
 
-    test "assert takes an optional explanation" do
-      e = get_error {
-        sky = "green"
-        @m.assert("the sky should be blue") { sky == "blue" }
-      }
-      assert e.message =~ /^the sky should be blue: /
+      it "gives a meaningful error when passed no block" do
+        e = get_error {
+          @m.assert (2+2 == 5)
+        }
+        assert e.message =~ /a block/
+      end
     end
 
-    test "deny takes an optional explanation" do
-      e = get_error {
-        sky = "blue"
-        @m.deny("the sky should not be blue") { sky == "blue" }
-      }
-      assert e.message =~ /^the sky should not be blue: /
+    describe "deny" do
+      it "fails when an error is thrown and bubbles up the error" do
+        assert_raises(MyError) { @m.deny { raise MyError.new } }
+      end
+
+      it "takes an optional explanation" do
+        e = get_error {
+          sky = "blue"
+          @m.deny("the sky should not be blue") { sky == "blue" }
+        }
+        assert e.message =~ /^the sky should not be blue: /
+      end
     end
   end
 end
 
-
-regarding "advanced assert features" do
+describe "advanced assert features" do
   include Wrong::Assert
 
   def assert_many(*procs)
@@ -76,7 +89,7 @@ regarding "advanced assert features" do
     assert { failures.empty? }
   end
 
-  test "it's possible (but not advisable) to define procs in different places from the assert call" do
+  it "is possible (but not advisable) to define procs in different places from the assert call" do
     x = 10
     e = rescuing do
       assert_many(lambda { x == 10 })
@@ -87,4 +100,21 @@ regarding "advanced assert features" do
     assert { e.message =~ /x is 10/ }
   end
 
+  xit "can parse a here doc defined inside the block" do
+    # todo: test in Chunk too
+    assert { "123\n456" == <<-TEXT
+123
+456
+    TEXT
+    }
+  end
+
+  xit "can parse a here doc defined outside the block" do
+    # todo: test in Chunk too
+    assert { "123\n456" == <<-TEXT }
+123
+456
+    TEXT
+  end
+
 end

data/test/capturing_test.rb

@@ -3,21 +3,21 @@ require "./test/test_helper"
 require "wrong/assert"
 require "wrong/adapters/minitest"
 
-regarding "a tool for capturing output" do
+describe "a tool for capturing output" do
 
-  test "captures stdout" do
+  it "captures stdout" do
     assert {
       capturing { puts "hi" } == "hi\n"
     }
   end
 
-  test "captures stderr" do
+  it "captures stderr" do
     assert {
       capturing(:stderr) { $stderr.puts "hi" } == "hi\n"
     }
   end
 
-  test "captures both" do
+  it "captures both" do
     out, err = capturing(:stdout, :stderr) do
        $stdout.puts "hi"
        $stderr.puts "bye"
@@ -28,7 +28,7 @@ regarding "a tool for capturing output" do
 
   end
 
-  test "supports nesting" do
+  it "supports nesting" do
     outside = nil
     inside = nil
     outside = capturing do
@@ -44,7 +44,7 @@ regarding "a tool for capturing output" do
   end
 
 
-  test "bails if stream was reassigned" do
+  it "bails if stream was reassigned" do
     e = rescuing do
       capturing do
         $stdout = StringIO.new # uh-oh!

data/test/chunk_test.rb

@@ -5,9 +5,9 @@ unless Object.const_defined?(:Chunk)
   Chunk = Wrong::Chunk
 end
 
-regarding Chunk do
-  regarding "#from_block" do
-    test "reads the source location" do
+describe Chunk do
+  describe "#from_block" do
+    it "reads the source location" do
       file, line = __FILE__, __LINE__
       chunk = Chunk.from_block(proc { "hi" })
       assert(chunk.file == file)
@@ -15,20 +15,20 @@ regarding Chunk do
     end
   end
 
-  regarding "line numbers" do
+  describe "line numbers" do
     before do
       @chunk = Wrong::Chunk.new("foo.rb", 10)
     end
-    test "#line_index is zero-based" do
+    it "#line_index is zero-based" do
       assert(@chunk.line_index == 9)
     end
-    test "#location is one-based" do
+    it "#location is one-based" do
       assert(@chunk.location == "foo.rb:10")
     end
   end
 
-  regarding "#parse" do
-    test "reads a statement on a line by itself" do
+  describe "#parse" do
+    it "reads a statement on a line by itself" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         "hi"
       CODE
@@ -36,7 +36,7 @@ regarding Chunk do
       assert(code == '"hi"')
     end
 
-    test "reads a statement on multiple lines" do
+    it "reads a statement on multiple lines" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         proc do
           "hi"
@@ -46,28 +46,28 @@ regarding Chunk do
       assert(code == "proc { \"hi\" }")
     end
 
-    test "fails if there's a stray close-paren symbol on the last line (sorry)" do
+    it "fails if there's a stray close-paren symbol on the last line (sorry)" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         "hi" )
       CODE
       assert(chunk.parse.nil?)
     end
 
-    test "fails if there's a stray close-block symbol on the last line (sorry)" do
+    it "fails if there's a stray close-block symbol on the last line (sorry)" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         "hi" }
       CODE
       assert(chunk.parse.nil?)
     end
 
-    test "fails if it can't parse the code" do
+    it "fails if it can't parse the code" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         }
       CODE
       assert(chunk.parse.nil?)
     end
 
-    test "fails if it can't find the file" do
+    it "fails if it can't find the file" do
       chunk = Chunk.new("nonexistent_file.rb", 0)
       error = get_error { chunk.parse }
       assert error.is_a? Errno::ENOENT
@@ -75,8 +75,8 @@ regarding Chunk do
 
   end
 
-  regarding "#claim" do
-    test "returns the part of the assertion statement inside the curly braces" do
+  describe "#claim" do
+    it "returns the part of the assertion statement inside the curly braces" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         assert { x == 5 }
       CODE
@@ -87,7 +87,7 @@ regarding Chunk do
     end
 
 
-    test "reads an assert statement on a line by itself" do
+    it "reads an assert statement on a line by itself" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         assert { x == 5 }
       CODE
@@ -95,7 +95,7 @@ regarding Chunk do
       assert claim_code == "(x == 5)"
     end
 
-    test "reads an assert statement on multiple lines" do
+    it "reads an assert statement on multiple lines" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         assert do
            x == 5
@@ -110,7 +110,7 @@ regarding Chunk do
     end
 
     if RUBY_VERSION > "1.9"
-      test "reads an assert statement that's nested inside another yield block on the same line (Ruby 1.9 only)" do
+      it "reads an assert statement that's nested inside another yield block on the same line (Ruby 1.9 only)" do
         chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
           yielding { assert { x == 5 }}
         CODE
@@ -121,7 +121,7 @@ regarding Chunk do
 #      test "goes crazy if you try to nest two asserts on the same line"
     end
 
-    test "if it can't find an assertion, it uses the whole chunk" do
+    it "if it can't find an assertion, it uses the whole chunk" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         yielding { x == 5 }
       CODE
@@ -129,7 +129,7 @@ regarding Chunk do
       assert code == "yielding { (x == 5) }"
     end
 
-    test "fails if it can't parse the code" do
+    it "fails if it can't parse the code" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         }
       CODE
@@ -140,8 +140,8 @@ regarding Chunk do
     end
   end
 
-  regarding "#parts" do
-    test "returns all unique sub-expressions of the main sexpression" do
+  describe "#parts" do
+    it "returns all unique sub-expressions of the main sexpression" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         assert { (x == 5) && (y == (z + 10)) }
       CODE
@@ -160,7 +160,7 @@ z
     end
   end
 
-  regarding "#details" do
+  describe "#details" do
     def details(&block)
       chunk = Chunk.from_block(block, 1)
       d = chunk.details
@@ -168,23 +168,23 @@ z
       d
     end
 
-    test "returns an empty string if there are no parts" do
+    it "returns an empty string if there are no parts" do
       d = details { assert { true } }
       assert d == ""
     end
 
-    test "returns an string beginning with a newline if there are parts" do
+    it "returns an string beginning with a newline if there are parts" do
       x = 10
       d = details { assert { x == 10 } }
       assert d == "\n    x is 10\n"
     end
 
-    test "skips literals" do
+    it "skips literals" do
       d = details { assert { 10 == 11 } }
       assert d == ""
     end
 
-    test "shows lots of details" do
+    it "shows lots of details" do
       x = 10
       d = details { assert { (x * (x - 10)) == (x / (x + 10)) } }
       assert d == <<-DETAILS
@@ -197,7 +197,7 @@ z
       DETAILS
     end
 
-    test "skips duplicates" do
+    it "skips duplicates" do
       x = 10
       d = details { assert { (x + 5) == 1 + (x + 5) } }
       assert d == <<-DETAILS
@@ -208,24 +208,24 @@ z
       DETAILS
     end
 
-    test "shows exceptions" do
+    it "shows exceptions" do
       d = details { assert { (raise "hi") == 1} }
       assert d == "\n    raise(\"hi\") raises RuntimeError: hi\n"
     end
 
-    test "indents newlines inside the exception message" do
+    it "indents newlines inside the exception message" do
       d = details { assert { (raise "hello\nsailor") == 1} }
       assert d == "\n    raise(\"hello\\nsailor\") raises RuntimeError: hello\n      sailor\n"
     end
 
-    test "inspects values" do
+    it "inspects values" do
       x = "flavor:\tvanilla"
       d = details { assert { x == "flavor:\tchocolate" } }
       # this means it's a literal slash plus t inside double quotes -- i.e. it shows the escaped (inspected) string
       assert d == "\n" + '    x is "flavor:\tvanilla"' + "\n"
     end
 
-    test "indents unescaped newlines inside the inspected value" do
+    it "indents unescaped newlines inside the inspected value" do
       weirdo = Object.new
       def weirdo.inspect
         "first\nsecond\nthird"

data/test/close_to_test.rb

@@ -2,7 +2,7 @@ require "./test/test_helper"
 require "wrong/close_to"
 require "wrong/assert"
 
-regarding "#close_to? (monkey patch for float comparison)" do
+describe "#close_to? (monkey patch for float comparison)" do
   include Wrong::Assert
 
   it "says two equal floats are equal" do

data/test/config_test.rb

@@ -1,8 +1,10 @@
 require "./test/test_helper"
 require "wrong/config"
 require "wrong/assert"
+require "wrong/message/string_diff"
 
-regarding Wrong::Config do
+
+describe Wrong::Config do
 
   # hope this doesn't blow up, but I'll try to use Wrong to test the Config object
   include Wrong::Assert
@@ -11,22 +13,77 @@ regarding Wrong::Config do
     Wrong.config.clear
   end
 
-  test "singleton" do
+  it "singleton" do
     c = Wrong.config
     assert { c.is_a?(Wrong::Config) }
     c2 = Wrong.config
     assert { c.object_id == c2.object_id }
   end
 
-#  test "reading from a .wrong file"
+#  it "reading from a .wrong file"
 
-  test "getting an undeclared setting" do
+  it "getting an undeclared setting" do
     assert { Wrong.config[:foo].nil? }
   end
 
-  test "setting and getting" do
+  it "setting and getting" do
     Wrong.config[:foo] = "bar"
     assert { Wrong.config[:foo] == "bar" }
   end
-  
+
+  describe "adding aliases for assert" do
+    before do
+      Wrong.config.alias_assert(:is)
+    end
+
+    it "succeeds" do
+      is { 2 + 2 == 4 }
+    end
+
+    it "fails" do
+      e = rescuing {
+        is("math is hard") { 2 + 2 == 5 }
+      }
+      expected = <<-FAIL
+math is hard: Expected ((2 + 2) == 5), but 4 is not equal to 5
+    (2 + 2) is 4
+      FAIL
+      assert { e.message == expected }
+    end
+
+    it "doesn't keep aliasing the same word" do
+      Wrong.config.alias_assert(:is)
+      Wrong.config.alias_assert(:is)
+      assert { Wrong.config.assert_method_names == [:assert, :is] } 
+    end
+  end
+
+  describe "adding aliases for deny" do
+    before do
+      Wrong.config.alias_deny(:aint)
+    end
+
+    it "succeeds" do
+      aint { 2 + 2 == 5 }
+    end
+
+    it "fails" do
+      e = rescuing {
+        aint("math is hard") { 2 + 2 == 4 }
+      }
+      expected = <<-FAIL
+math is hard: Didn't expect ((2 + 2) == 4), but 4 is equal to 4
+    (2 + 2) is 4
+      FAIL
+      assert { e.message == expected }
+    end
+
+    it "doesn't keep aliasing the same word" do
+      Wrong.config.alias_deny(:aint)
+      Wrong.config.alias_deny(:aint)
+      assert { Wrong.config.deny_method_names == [:deny, :aint] }
+    end
+
+  end
+
 end