wrong 0.3.3 → 0.4.0

data/lib/wrong/version.rb

@@ -1,3 +1,3 @@
 module Wrong
-  VERSION = "0.3.3" unless defined?(Wrong::VERSION)
+  VERSION = "0.4.0" unless defined?(Wrong::VERSION)
 end

data/test/adapters/rspec1/failing_spec.rb

@@ -0,0 +1,23 @@
+# This is a failing spec for testing RSpec 1.3 integration
+
+require "rubygems"
+require "bundler"
+Bundler.setup
+
+require "spec"
+
+here = File.expand_path(File.dirname(__FILE__))
+$:.unshift "#{here}/../../../lib"
+require "wrong/adapters/rspec"
+
+# since we're not running 'spec' we have to do some stuff ourselves
+include Spec::DSL::Main
+
+describe "arithmetic" do
+  it "should not work like this" do
+    assert { 2 + 2 == 5 }
+  end
+end
+
+Spec::Runner.options.parse_format("nested")
+Spec::Runner.options.run_examples

data/test/adapters/rspec2/failing_spec.rb

@@ -0,0 +1,26 @@
+# This is a failing spec for testing RSpec 2 integration
+
+require "rubygems"
+require "bundler"
+Bundler.setup
+
+require "rspec"
+
+here = File.expand_path(File.dirname(__FILE__))
+$:.unshift "#{here}/../../../lib"
+
+# since we're not running 'rspec' we have to do some stuff ourselves
+require 'rspec'
+require 'rspec/core'
+puts RSpec::Core::Version::STRING
+
+require 'rspec/autorun'
+require "wrong/adapters/rspec"
+
+describe "arithmetic" do
+  it "should not work like this" do
+    assert { 2 + 2 == 5 }
+  end
+end
+
+# now, thanks to the require 'rspec/autorun', this spec will run and fail

data/test/adapters/rspec_test.rb

@@ -1,10 +1,70 @@
+here = File.expand_path(File.dirname(__FILE__))
+
+require "open3"
+require "fileutils"
+
 require "./test/test_helper"
+require "wrong/adapters/minitest"
+
+include Wrong
 
+# Okay, this looks like RSpec but it's actually minitest
 describe "testing rspec" do
-  it "works" do
 
-    require "wrong/adapters/rspec" # if we don't require this in here, then it interferes with minitest
-    
+  def sys(cmd, expected_status = 0)
+    start_time = Time.now
+    $stderr.print cmd
+    Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thread|
+      # in Ruby 1.8, wait_thread is nil :-( so just pretend the process was successful (status 0)
+      exit_status = (wait_thread.value.exitstatus if wait_thread) || 0
+      output = stdout.read + stderr.read
+      unless expected_status.nil?
+        assert { output and exit_status == expected_status }
+      end
+      yield output if block_given?
+      output
+    end
+  ensure
+    $stderr.puts " (#{"%.2f" % (Time.now - start_time)} sec)"
+  end
+
+  def clear_bundler_env
+    # Bundler inherits its environment by default, so clear it here
+    %w{BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE}.each { |var| ENV.delete(var) }
+  end
+
+  [1, 2].each do |rspec_version|
+    it "version #{rspec_version}" do
+      dir = "#{here}/rspec#{rspec_version}"
+      spec_output = nil
+      Dir.chdir(dir) do
+        clear_bundler_env
+        FileUtils.rm "#{dir}/Gemfile.lock", :force => true
+
+        sys "bundle check" do |output|
+          unless output == "The Gemfile's dependencies are satisfied\n"
+            sys "bundle install --gemfile=#{dir}/Gemfile --local"
+          end
+        end
+
+        sys "bundle list" do |output|
+          lines = output.split("\n")
+          lines.grep(/rspec/) do |line|
+            assert { line =~ /rspec[-\w]* \(#{rspec_version}\.[\w.]*\)/ }
+          end
+        end
+
+        spec_output = sys "ruby #{dir}/failing_spec.rb",
+                          (rspec_version == 1 || RUBY_VERSION =~ /^1\.8\./ || RUBY_VERSION == '1.9.1' ? nil : 1) # RSpec v1 exits with 0 on failure :-(
+      end
+
+      assert { spec_output.include? "1 example, 1 failure" }
+      assert { spec_output.include? "Expected ((2 + 2) == 5), but" }
+    end
+  end
+end
+
+=begin
     # I would use
     #    out, err = capturing(:stdout, :stderr) do
     # but minitest does its own arcane stream munging and it's not working
@@ -38,6 +98,7 @@ inside rspec land
     assert !failures.empty?
     exception = failures.first.exception
     assert(exception.is_a?(Spec::Expectations::ExpectationNotMetError))
-    assert(exception.message == "Expected (sky == \"green\"), but \"blue\" is not equal to \"green\"\n    sky is \"blue\"\n")
+    assert(exception.message =~ /^Expected \(sky == \"green\"\), but/, "message is #{exception.message.inspect}")
   end
 end
+=end

data/test/adapters/test_unit_test.rb

@@ -2,9 +2,14 @@ require "./test/test_helper"
 
 require "test/unit"
 
-require "wrong/assert"
+#require "wrong/assert"
 require "wrong/adapters/test_unit"
 
+# get rid of atrocious Test::Unit color scheme (gray on green = puke)
+Test::Unit::AutoRunner.setup_option do |auto_runner, opts|
+  auto_runner.runner_options[:use_color] = false
+end
+
 class MyFailingAssertTest <  Test::Unit::TestCase
 
   def test_wrong_assert_and_deny_are_available_to_test_unit_tests

data/test/assert_advanced_test.rb

@@ -0,0 +1,51 @@
+require "./test/test_helper"
+require "wrong/assert"
+require "wrong/adapters/minitest"
+
+describe "advanced assert features" do
+
+  def assert_later(&p)
+    assert(&p)
+  end
+
+  # dunno why, but this fails under JRuby (both 1.8 and 1.9)
+  unless Object.const_defined? :JRuby
+    it "is possible (but hardly advisable) to define procs in different places from the assert call" do
+      x = 10
+      e = get_error do
+        assert_later { x > 10 }
+      end
+
+      assert(e.message =~ /Expected \(x > 10\), but.*x is 10/m, e.message)
+    end
+  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
+
+  it "finds the file to parse even when inside a chdir to a child directory" do
+    e = get_error do
+      Dir.chdir("test") do
+        assert { (1 + 2) == 5 }
+      end
+    end
+    assert { e.message.include? "Expected ((1 + 2) == 5), but" }
+  end
+
+  # todo: test for finding it if you'd changed dirs into a parent or sibling or cousin dir
+
+end

data/test/assert_test.rb

@@ -47,14 +47,14 @@ describe "basic assert features" do
           sky = "green"
           @m.assert("the sky should be blue") { sky == "blue" }
         }
-        assert e.message =~ /^the sky should be blue: /
+        assert e.message =~ /^the sky should be blue: /, e.message
       end
 
       it "gives a meaningful error when passed no block" do
         e = get_error {
           @m.assert(2+2 == 5)
         }
-        assert e.message =~ /a block/
+        assert e.message =~ /a block/, e.message
       end
     end
 
@@ -68,53 +68,9 @@ describe "basic assert features" do
           sky = "blue"
           @m.deny("the sky should not be blue") { sky == "blue" }
         }
-        assert e.message =~ /^the sky should not be blue: /
+        assert e.message =~ /^the sky should not be blue: /,
+               e.message + "\n\t" + e.backtrace.join("\n\t")
       end
     end
   end
 end
-
-describe "advanced assert features" do
-  include Wrong::Assert
-
-  def assert_many(*procs)
-    failures = []
-    procs.each do |proc|
-      begin
-        assert(nil, 3, &proc)
-      rescue => e
-        failures << e
-      end
-    end
-    assert { failures.empty? }
-  end
-
-  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 })
-      assert_many(lambda { x > 10 })
-    end
-
-    assert { e.message =~ /^Expected failures.empty\?/ }
-    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

@@ -1,10 +1,13 @@
 require "./test/test_helper"
 
 require "wrong/assert"
-require "wrong/adapters/minitest"
+require "wrong/helpers"
 
 describe "a tool for capturing output" do
 
+  include Wrong::Assert
+  include Wrong::Helpers
+
   it "captures stdout" do
     assert {
       capturing { puts "hi" } == "hi\n"
@@ -29,7 +32,6 @@ describe "a tool for capturing output" do
   end
 
   it "supports nesting" do
-    outside = nil
     inside = nil
     outside = capturing do
       puts "bread"

data/test/chunk_test.rb

@@ -27,12 +27,12 @@ describe Chunk do
     end
   end
 
-  describe "#parse" do
+  describe "parsing" do
     it "reads a statement on a line by itself" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         "hi"
       CODE
-      code = chunk.parse.to_ruby
+      code = chunk.sexp.to_ruby
       assert(code == '"hi"')
     end
 
@@ -42,7 +42,7 @@ describe Chunk do
           "hi"
         end
       CODE
-      code = chunk.parse.to_ruby
+      code = chunk.sexp.to_ruby
       assert(code == "proc { \"hi\" }")
     end
 
@@ -50,29 +50,38 @@ describe Chunk do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         "hi" )
       CODE
-      assert(chunk.parse.nil?)
+      assert(chunk.sexp.nil?)
     end
 
     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?)
+      assert(chunk.sexp.nil?)
     end
 
     it "fails if it can't parse the code" do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         }
       CODE
-      assert(chunk.parse.nil?)
+      assert(chunk.sexp.nil?)
     end
 
     it "fails if it can't find the file" do
       chunk = Chunk.new("nonexistent_file.rb", 0)
-      error = get_error { chunk.parse }
+      error = get_error { chunk.sexp }
       assert error.is_a? Errno::ENOENT
     end
 
+    it "finds the file to parse even when inside a chdir to a child directory" do
+      Dir.chdir("test") do
+        chunk = Chunk.new __FILE__, __LINE__ + 1; <<-CODE
+        "hi"
+        CODE
+        code = chunk.sexp.to_ruby
+        assert(code == '"hi"')
+      end
+    end
   end
 
   describe "#claim" do
@@ -80,7 +89,7 @@ describe Chunk do
       chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
         assert { x == 5 }
       CODE
-      full_code = chunk.parse.to_ruby
+      full_code = chunk.sexp.to_ruby
       assert(full_code == "assert { (x == 5) }")
       claim_code = chunk.claim.to_ruby
       assert claim_code == "(x == 5)"
@@ -158,6 +167,14 @@ z
 10
       PARTS
     end
+
+    it "omits the method-call-sans-block part of a method call with a block" do
+      chunk = Chunk.new(__FILE__, __LINE__ + 1); <<-CODE
+        assert { rescuing { 1 + 2 } }
+      CODE
+      code_parts = chunk.parts
+      assert !code_parts.include?("rescuing")
+    end
   end
 
   describe "#details" do
@@ -209,15 +226,21 @@ z
     end
 
     it "shows exceptions" do
-      d = details { assert { (raise "hi") == 1} }
+      d = details { assert { (raise "hi") == 1 } }
       assert d == "\n    raise(\"hi\") raises RuntimeError: hi\n"
     end
 
     it "indents newlines inside the exception message" do
-      d = details { assert { (raise "hello\nsailor") == 1} }
+      d = details { assert { (raise "hello\nsailor") == 1 } }
       assert d == "\n    raise(\"hello\\nsailor\") raises RuntimeError: hello\n      sailor\n"
     end
 
+    it "abridges exceptions with no message" do
+      d = details { assert { (raise Exception.new) == 1 } }
+      assert d == "\n    raise(Exception.new) raises Exception\n" +
+              "    Exception.new is #<Exception: Exception>\n"
+    end
+
     it "inspects values" do
       x = "flavor:\tvanilla"
       d = details { assert { x == "flavor:\tchocolate" } }
@@ -227,11 +250,13 @@ z
 
     it "indents unescaped newlines inside the inspected value" do
       weirdo = Object.new
+
       def weirdo.inspect
         "first\nsecond\nthird"
       end
+
       x = weirdo
-      d = details { assert { x == "foo" }}
+      d = details { assert { x == "foo" } }
       assert d == "\n    x is first\n      second\n      third\n"
     end
 

data/test/close_to_test.rb

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

data/test/config_test.rb

@@ -1,13 +1,13 @@
 require "./test/test_helper"
-require "wrong/config"
-require "wrong/assert"
-require "wrong/message/string_diff"
 
+require "wrong"
+require "wrong/config"
+require "wrong/message/string_comparison"
 
 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
+  include Wrong
 
   before do
     Wrong.config.clear
@@ -20,7 +20,7 @@ describe Wrong::Config do
     assert { c.object_id == c2.object_id }
   end
 
-#  it "reading from a .wrong file"
+#  it "reads from a .wrong file"
 
   it "getting an undeclared setting" do
     assert { Wrong.config[:foo].nil? }