wrong 0.3.0 → 0.3.1

data/test/failures_test.rb

@@ -2,7 +2,7 @@ require "./test/test_helper"
 
 require "wrong/assert"
 
-regarding "failures" do
+describe "failures" do
 
   before do
     @m = Module.new do
@@ -10,15 +10,15 @@ regarding "failures" do
     end
   end
 
-  regarding "simple" do
+  describe "simple" do
 
-    test "raw boolean assert failure" do
+    it "raw boolean assert failure" do
       error = get_error { @m.assert { false } }
 #      puts error.message
       assert_match "false", error.message
     end
 
-    test "raw boolean deny failure" do
+    it "raw boolean deny failure" do
       error = get_error {
         @m.deny { true }
       }
@@ -26,7 +26,7 @@ regarding "failures" do
       assert_match "true", error.message
     end
 
-    test "equality failure" do
+    it "equality failure" do
       assert_match "1 is not equal to 2", get_error {
         @m.assert { 1==2 }
       }.message
@@ -35,7 +35,7 @@ regarding "failures" do
       }.message
     end
 
-    test "failure of basic operations" do
+    it "failure of basic operations" do
       assert_match "1 is not greater than 2", get_error {
         @m.assert { 1>2 }
       }.message
@@ -63,13 +63,13 @@ regarding "failures" do
       }.message
     end
 
-    test "object failure" do
+    it "object failure" do
       assert_match "Color:red is not equal to 2", get_error {
         @m.assert { Color.new("red")==2 }
       }.message
     end
 
-    test %{multiline assert block shouldn't look any different
+    it %{multiline assert block shouldn't look any different
            than when there everything is on one line} do
       assert_match("1 is not equal to 2", get_error {
         @m.assert {
@@ -81,8 +81,8 @@ regarding "failures" do
 
   end
 
-  regarding "accessing and printing values set outside of the assert" do
-    test "use a value in the assert defined outside of it" do
+  describe "accessing and printing values set outside of the assert" do
+    it "use a value in the assert defined outside of it" do
       a = 1
       assert_match "1 is not equal to 2", get_error {
         @m.assert { a==2 }
@@ -93,8 +93,18 @@ regarding "failures" do
     end
   end
 
-  regarding "the assert block has many statements" do
-    test "only pay attention to the final statement" do
+  describe "conjunctions (and and or)" do
+    it "omit a primary failure message since 'This is not true etc.' is more obscuring than clarifying" do
+      m = get_error {
+        x = 5
+        @m.assert { x == 5 && x != 5}
+      }.message
+      assert m == "Expected ((x == 5) and (not (x == 5))), but \n    (x == 5) is true\n    x is 5\n    (not (x == 5)) is false\n"
+    end
+  end
+
+  describe "the assert block has many statements" do
+    it "only pay attention to the final statement" do
       assert_match("1 is not equal to 2", get_error {
         @m.assert {
           a = "aaa"
@@ -107,7 +117,7 @@ regarding "failures" do
       }.message)
     end
 
-    test "works even if the assertion is based on stuff set previously in the block" do
+    it "works even if the assertion is based on stuff set previously in the block" do
       assert_match("\"aaa\" is not equal to \"bbb\"", get_error {
         @m.assert {
           a = "aaa"
@@ -117,16 +127,16 @@ regarding "failures" do
     end
   end
 
-  regarding "array comparisons" do
-    test "basic" do
+  describe "array comparisons" do
+    it "basic" do
       assert_match %{[1, 2] is not equal to ["a", "b"]}, get_error {
         @m.assert { [1, 2]==%w{a b} }
       }.message
     end
   end
 
-  regarding "hash comparisons" do
-    test "basic" do
+  describe "hash comparisons" do
+    it "basic" do
       assert_match '{1=>2} is not equal to {"a"=>"b"}',
                    get_error {
                      @m.assert { {1=>2}=={"a"=>"b"} }
@@ -134,8 +144,8 @@ regarding "failures" do
     end
   end
 
-  regarding "methods that result in a boolean.  this might be hard." do
-    test "string include" do
+  describe "methods that result in a boolean.  this might be hard." do
+    it "string include" do
       assert_match "\"abc\" does not include \"cd\"", get_error {
         @m.assert { "abc".include?("cd") }
       }.message

data/test/message/array_diff_test.rb

@@ -3,7 +3,7 @@ require "wrong/assert"
 require "wrong/message/array_diff"
 require "wrong/adapters/minitest"
 
-regarding "when you're comparing strings and they don't match, show me the diff message" do
+describe "when you're comparing strings and they don't match, show me the diff message" do
 
   def assert_string_diff_message(first_array, second_array, expected_error_message)
     assert {
@@ -13,7 +13,7 @@ regarding "when you're comparing strings and they don't match, show me the diff
     }
   end
 
-  test "don't attempt to do this if the assertion is not of the form a_array==b_array" do
+  it "don't attempt to do this if the assertion is not of the form a_array==b_array" do
     deny {
       rescuing {
         assert { [1]==2 }
@@ -26,7 +26,7 @@ regarding "when you're comparing strings and they don't match, show me the diff
     }
   end
 
-  test "simple" do
+  it "simple" do
     assert {
       rescuing {
         assert { ["a"]==["b"] }
@@ -40,7 +40,7 @@ regarding "when you're comparing strings and they don't match, show me the diff
 })
   end
 
-  test "elements align properly" do
+  it "elements align properly" do
     assert_string_diff_message(["a", "b", "c"], ["a", "cccc", "c"], %{
 ["a", "b"   , "c"]
 ["a", "cccc", "c"]
@@ -54,7 +54,7 @@ regarding "when you're comparing strings and they don't match, show me the diff
 })
   end
 
-  test "different primitive types" do
+  it "different primitive types" do
     assert_string_diff_message([1, true], [2, true, nil], %{
 [1, true]
 [2, true, nil]
@@ -62,7 +62,7 @@ regarding "when you're comparing strings and they don't match, show me the diff
 })
   end
 
-  test "2d array - just inspects the inner array like it would any other element" do
+  it "2d array - just inspects the inner array like it would any other element" do
     assert { [1, [2, 3]] == [1, [2, 3]] }
     assert_string_diff_message([1, [2]], [1, [2, 3]], %{
 [1, [2]   ]

data/test/message/string_diff_test.rb

@@ -3,7 +3,7 @@ require "wrong/assert"
 require "wrong/message/string_diff"
 require "wrong/adapters/minitest"
 
-regarding "when you're comparing strings and they don't match, show me the diff message" do
+describe "when you're comparing strings and they don't match, show me the diff message" do
   
   def assert_string_diff_message(first_string, second_string, str)
     assert{
@@ -13,7 +13,7 @@ regarding "when you're comparing strings and they don't match, show me the diff
     }
   end
   
-  test "don't attempt to do this if the assertion is not of the form a_string==b_string" do
+  it "don't attempt to do this if the assertion is not of the form a_string==b_string" do
     deny{
       rescuing{
         assert{1==2}
@@ -36,7 +36,7 @@ regarding "when you're comparing strings and they don't match, show me the diff
     }
   end
 
-  test "simple" do
+  it "simple" do
     assert{
       rescuing{
         assert{"a"=="b"}
@@ -51,7 +51,7 @@ acc
 })
   end
 
-  test "whitespace" do
+  it "whitespace" do
     assert_string_diff_message("a\nb", "a\ncc",  %{
 a\\nb
   ^ 
@@ -74,7 +74,7 @@ a\\rcc
 
   end
 
-  xtest "elides really long matching sections" do
+  xit "elides really long matching sections" do
     left = "x"*100 + "ab" + "y"*100 + "AB" + "z"*100 
     right = "x"*100 + "acc" + "y"*100 + "ACC" + "z"*100 
     

data/test/message/test_context_text.rb

@@ -2,11 +2,11 @@ require "./test/test_helper"
 require "wrong/assert"
 require "wrong/message/test_context"
 
-regarding "showing the lines just above where the failure occurs, so you have some context" do
+describe "showing the lines just above where the failure occurs, so you have some context" do
 
   include Wrong::Assert
   
-  test "you can see test method all the way back to the start of the test, plus an indication of where the failure was" do
+  it "you can see test method all the way back to the start of the test, plus an indication of where the failure was" do
     a = 1
     b = 2
     c = 1
@@ -16,7 +16,7 @@ regarding "showing the lines just above where the failure occurs, so you have so
     rescue Wrong::Assert::AssertionFailedError => e
       assert do
         e.message.include?(
-%{  test "you can see test method all the way back to the start of the test, plus an indication of where the failure was" do
+%{  it "you can see test method all the way back to the start of the test, plus an indication of where the failure was" do
     a = 1
     b = 2
     c = 1
@@ -65,4 +65,4 @@ regarding "showing the lines just above where the failure occurs, so you have so
     end
   end
   
-end
+end

data/test/rescuing_test.rb

@@ -3,12 +3,12 @@ require "./test/test_helper"
 require "wrong/assert"
 require "wrong/adapters/minitest"
 
-regarding "a tool for rescuing errors" do
+describe "a tool for rescuing errors" do
   
   class RedError < StandardError; end
   class BlueError < StandardError; end
   
-  test "catch the error and assert on it" do
+  it "catch the error and assert on it" do
     assert{ rescuing{raise RedError.new}.is_a?(RedError) }
     assert{ rescuing{"x"}.nil? }
   end

data/test/sexp_ext_test.rb

@@ -1,9 +1,9 @@
 require "./test/test_helper"
 require "wrong/sexp_ext"
 
-regarding Sexp do
-  regarding "#doop" do
-    test "deeply duplicates the sexp" do
+describe Sexp do
+  describe "#doop" do
+    it "deeply duplicates the sexp" do
       original = RubyParser.new.parse("x == 5")
       duplicate = original.doop
       assert(original.object_id != duplicate.object_id)
@@ -17,60 +17,60 @@ regarding Sexp do
     RubyParser.new.parse(ruby)
   end
 
-  regarding "#to_ruby" do
-    test "converts the sexp to ruby code" do
+  describe "#to_ruby" do
+    it "converts the sexp to ruby code" do
       sexp = parse("x == 5")
       assert sexp.to_ruby == "(x == 5)"
     end
 
-    test "leaves the original sexp alone" do
+    it "leaves the original sexp alone" do
       sexp = parse("x == 5")
       assert sexp.to_ruby == "(x == 5)"
       assert sexp.to_ruby == "(x == 5)" # intended
     end
   end
 
-  regarding "#assertion? with a question mark" do
-    test "matches an sexp that looks like assert { }" do
+  describe "#assertion? with a question mark" do
+    it "matches an sexp that looks like assert { }" do
       sexp = parse("assert { true }")
       assert sexp.assertion?
     end
 
-    test "matches an sexp that looks like assert(message) { }" do
+    it "matches an sexp that looks like assert(message) { }" do
       sexp = parse("assert('hi') { true }")
       assert sexp.assertion?
     end
 
-    test "matches an sexp that looks like deny { }" do
+    it "matches an sexp that looks like deny { }" do
       sexp = parse("deny { false }")
       assert sexp.assertion?
     end
 
-    test "doesn't match an sexp that calls assert without a block" do
+    it "doesn't match an sexp that calls assert without a block" do
       sexp = parse("assert(true)")
       assert !sexp.assertion?
     end
 
-    test "doesn't match a normal sexp" do
+    it "doesn't match a normal sexp" do
       sexp = parse("x == 5")
       assert !sexp.assertion?
     end
   end
 
-  regarding "#assertion" do
-    test "matches a top-level sexp that looks like assert { }" do
+  describe "#assertion" do
+    it "matches a top-level sexp that looks like assert { }" do
       sexp = parse("assert { true }")
       code = sexp.assertion.to_ruby
       assert code == "assert { true }"
     end
 
-    test "matches a nested sexp that looks like assert { }" do
+    it "matches a nested sexp that looks like assert { }" do
       sexp = parse("nesting { assert { true } }")
       code = sexp.assertion.to_ruby
       assert code == "assert { true }"
     end
 
-    test "matches the first nested sexp that looks like assert { }" do
+    it "matches the first nested sexp that looks like assert { }" do
       sexp = parse("nesting { assert { true } or assert { false } }")
       code = sexp.assertion.to_ruby
       assert code == "assert { true }"

data/test/test_helper.rb

@@ -6,6 +6,7 @@ require "minitest/spec"
 require "minitest/unit"
 require "pp"
 
+# yes, this does look a lot like Wrong::Assert#rescuing :-)
 def get_error
   error = nil
   begin
@@ -13,10 +14,6 @@ def get_error
   rescue Exception, RuntimeError => e
     error = e
   end
-
-#  puts ""
-#  puts error
-#
   error
 end
 
@@ -24,10 +21,8 @@ class MiniTest::Unit::TestCase
 end
 
 module Kernel
-  alias_method :regarding, :describe
-  
-  def xregarding(str)
-    puts "x'd out 'regarding \"#{str}\"'"
+  def xdescribe(str)
+    puts "x'd out describe \"#{str}\""
   end
 end
 
@@ -35,15 +30,13 @@ class MiniTest::Spec
   include MiniTest::Assertions
   
   class << self
-    alias_method :test, :it
-    
-    def xtest(str)
-      puts "x'd out 'test \"#{str}\"'"
+    def xit(str)
+      puts "x'd out test \"#{str}\""
     end
-
   end
 end
 
+# dummy class for use by tests
 class Color
   attr_reader :name
   def initialize(name)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wrong
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Steve Conover
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-26 00:00:00 -07:00
+date: 2010-08-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency