riot 0.9.2 → 0.9.3

data/Rakefile

@@ -7,7 +7,6 @@ desc "Run tests"
 task :test do
   $:.concat ['./test', './lib']
   Dir.glob("./test/*_test.rb").each { |test| require test }
-  Riot.report
 end
 
 desc "Run Flog against library (except tests)"

data/lib/riot/macros.rb

@@ -14,6 +14,16 @@ module Riot
       actual.nil? || fail("expected nil, not #{actual.inspect}")
     end
 
+    # Asserts that the result of the test is a non-nil value. This is useful in the case where you don't want
+    # to translate the result of the test into a boolean value
+    #   asserts("test") { "foo" }.exists
+    #   should("test") { 123 }.exists
+    #   asserts("test") { "" }.exists
+    #   asserts("test") { nil }.exists # This would fail
+    def exists
+      !actual.nil? || fail("expected a non-nil value")
+    end
+
     # Asserts that the test raises the expected Exception
     #   asserts("test") { raise My::Exception }.raises(My::Exception)
     #   should("test") { raise My::Exception }.raises(My::Exception)

data/riot.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name     = "riot"
-  s.version  = "0.9.2"
-  s.date     = "2009-10-05"
+  s.version  = "0.9.3"
+  s.date     = "2009-10-06"
   s.summary  = "An extremely fast, expressive, and context-driven unit-testing framework"
   s.email    = %w[gus@gusg.us]
   s.homepage = "http://github.com/thumblemonks/protest"
-  s.description = "An extremely fast, expressive, and context-driven unit-testing framework. A replacement for all other testing frameworks"
+  s.description = "An extremely fast, expressive, and context-driven unit-testing framework. A replacement for all other testing frameworks. Protest the slow test."
   s.authors  = %w[Justin\ Knowlden]
 
   s.has_rdoc = false
@@ -26,6 +26,13 @@ Gem::Specification.new do |s|
   
   s.test_files = %w[
     Rakefile
+    test/assertion_macro_assigns_test.rb
+    test/assertion_macro_equals_test.rb
+    test/assertion_macro_exists_test.rb
+    test/assertion_macro_kind_of_test.rb
+    test/assertion_macro_matching_test.rb
+    test/assertion_macro_nil_test.rb
+    test/assertion_macro_raises_test.rb
     test/assertion_test.rb
     test/benchmark/simple_context_and_assertions.rb
     test/context_test.rb

data/test/assertion_macro_assigns_test.rb

@@ -0,0 +1,40 @@
+require 'teststrap'
+
+context "assigns assertion:" do
+  setup do
+    @fake_situation = Riot::Situation.new
+    object_with_instance_variables = Riot::Situation.new
+    object_with_instance_variables.instance_eval { @foo = "bar"; @bar = nil}
+    object_with_instance_variables
+  end
+
+  asserts("an instance variable was assigned") do
+    test_object = topic
+    Riot::Assertion.new("duh", @fake_situation) { test_object }.assigns(:foo)
+  end
+
+  asserts("an instance variable was never assigned") do
+    test_object = topic
+    Riot::Assertion.new("foo", @fake_situation) { test_object }.assigns(:baz)
+  end.kind_of(Riot::Failure)
+  
+  asserts "an instance variable was defined with nil value" do
+    test_object = topic
+    Riot::Assertion.new("foo", @fake_situation) { test_object }.assigns(:bar).message
+  end.equals("expected @bar to be assigned a value")
+
+  asserts("an instance variable was assigned a specific value") do
+    test_object = topic
+    Riot::Assertion.new("duh", @fake_situation) { test_object }.assigns(:foo, "bar")
+  end
+
+  asserts("failure when instance never assigned even when a value is expected") do
+    test_object = topic
+    Riot::Assertion.new("duh", @fake_situation) { test_object }.assigns(:bar, "bar").message
+  end.equals("expected @bar to be assigned a value")
+
+  asserts("failure when expected value is not assigned to variable with a value") do
+    test_object = topic
+    Riot::Assertion.new("duh", @fake_situation) { test_object }.assigns(:foo, "baz").message
+  end.equals("expected @foo to be equal to 'baz', not 'bar'")
+end # assigns assertion

data/test/assertion_macro_equals_test.rb

@@ -0,0 +1,13 @@
+require 'teststrap'
+
+context "equals assertion:" do
+  setup { Riot::Situation.new }
+
+  asserts "result equals expectation" do
+    Riot::Assertion.new("i will pass", topic) { "foo bar" }.equals("foo bar")
+  end
+
+  should "raise a Failure if results don't equal each other" do
+    Riot::Assertion.new("failure", topic) { "bar" }.equals("foo")
+  end.kind_of(Riot::Failure)
+end # equals assertion

data/test/assertion_macro_exists_test.rb

@@ -0,0 +1,17 @@
+require 'teststrap'
+
+context "nil assertion:" do
+  setup { Riot::Situation.new }
+
+  asserts("result has a value") do
+    Riot::Assertion.new("foo", topic) { "foo" }.exists
+  end
+
+  asserts("empty string is considered a value") do
+    Riot::Assertion.new("foo", topic) { "" }.exists
+  end
+
+  should "raise a Failure if value is nil" do
+    Riot::Assertion.new("foo", topic) { nil }.exists
+  end.kind_of(Riot::Failure)
+end # nil assertion

data/test/assertion_macro_kind_of_test.rb

@@ -0,0 +1,13 @@
+require 'teststrap'
+
+context "kind_of assertion:" do
+  setup { Riot::Situation.new }
+
+  asserts "specific result is a kind of String" do
+    Riot::Assertion.new("foo", topic) { "a" }.kind_of(String)
+  end
+
+  should "raise a Failure if not a kind of String" do
+    Riot::Assertion.new("foo", topic) { 0 }.kind_of(String)
+  end.kind_of(Riot::Failure)
+end # kind_of assertion

data/test/assertion_macro_matching_test.rb

@@ -0,0 +1,17 @@
+require 'teststrap'
+
+context "matching assertion:" do
+  setup { Riot::Situation.new }
+
+  asserts "result matches expression" do
+    Riot::Assertion.new("foo", topic) { "a" }.matches(%r[.])
+  end.equals(0)
+
+  should "raise a Failure if result does not match" do
+    Riot::Assertion.new("foo", topic) { "" }.matches(%r[.])
+  end.kind_of(Riot::Failure)
+
+  should "return the result of a matching operation" do
+    Riot::Assertion.new("foo", topic) { "a" }.matches("a")
+  end.equals(0)
+end # maching assertion

data/test/assertion_macro_nil_test.rb

@@ -0,0 +1,13 @@
+require 'teststrap'
+
+context "nil assertion:" do
+  setup { Riot::Situation.new }
+
+  asserts("result is nil") do
+    Riot::Assertion.new("foo", topic) { nil }.nil
+  end
+
+  should "raise a Failure if not nil" do
+    Riot::Assertion.new("foo", topic) { "a" }.nil
+  end.kind_of(Riot::Failure)
+end # nil assertion

data/test/assertion_macro_raises_test.rb

@@ -0,0 +1,23 @@
+require 'teststrap'
+
+context "raises assertion:" do
+  setup { Riot::Situation.new }
+
+  should("raise an Exception") { raise Exception }.raises(Exception)
+
+  should "pass if provided message equals expectation" do
+    Riot::Assertion.new("foo", topic) { raise Exception, "I'm a nerd" }.raises(Exception, "I'm a nerd")
+  end.equals(true)
+
+  should "fail if provided message does not equal expectation" do
+    Riot::Assertion.new("foo", topic) { raise(Exception, "I'm a nerd") }.raises(Exception, "But I'm not")
+  end.kind_of(Riot::Failure)
+
+  should "pass if provided message matches expectation" do
+    Riot::Assertion.new("foo", topic) { raise(Exception, "I'm a nerd") }.raises(Exception, %r[nerd])
+  end.equals(true)
+
+  should "fail if provided message does not match expectation" do
+    Riot::Assertion.new("foo", topic) { raise(Exception, "I'm a nerd") }.raises(Exception, %r[foo])
+  end.kind_of(Riot::Failure)
+end # raises assertion

data/test/assertion_test.rb

@@ -1,26 +1,27 @@
 require 'teststrap'
 
-fake_situation = Riot::Situation.new
-
 context "basic assertion:" do
+  setup { Riot::Situation.new }
+
   should "have a description" do
-    Riot::Assertion.new("i will pass", fake_situation).to_s
+    Riot::Assertion.new("i will pass", topic).to_s
   end.equals("i will pass")
 
   asserts "pass? is true when assertion passed" do
-    Riot::Assertion.new("i will pass", fake_situation) { true }.passed?
+    Riot::Assertion.new("i will pass", topic) { true }.passed?
   end
 
   asserts "failure? is true when assertion does not pass" do
-    Riot::Assertion.new("i will pass", fake_situation) { false }.failed?
+    Riot::Assertion.new("i will pass", topic) { false }.failed?
   end
 
   asserts "error? is true when an unexpected Exception is raised" do
-    Riot::Assertion.new("error", fake_situation) { raise Exception, "blah" }.errored?
+    Riot::Assertion.new("error", topic) { raise Exception, "blah" }.errored?
   end
 
   context "that fails while executing test" do
     setup do
+      fake_situation = Riot::Situation.new
       Riot::Assertion.new("error", fake_situation) { fail("I'm a bum") }
     end
 
@@ -29,110 +30,3 @@ context "basic assertion:" do
     should("assign assertion to failure") { topic.result }.assigns(:assertion)
   end # that fails while executing test
 end # basic assertion
-
-context "equals assertion:" do
-  asserts "result equals expectation" do
-    Riot::Assertion.new("i will pass", fake_situation) { "foo bar" }.equals("foo bar")
-  end
-
-  should "raise a Failure if results don't equal each other" do
-    Riot::Assertion.new("failure", fake_situation) { "bar" }.equals("foo")
-  end.kind_of(Riot::Failure)
-end # equals assertion
-
-context "nil assertion:" do
-  asserts("result is nil") { Riot::Assertion.new("foo", fake_situation) { nil }.nil }
-  should "raise a Failure if not nil" do
-    Riot::Assertion.new("foo", fake_situation) { "a" }.nil
-  end.kind_of(Riot::Failure)
-end # nil assertion
-
-context "raises assertion:" do
-  should("raise an Exception") { raise Exception }.raises(Exception)
-
-  should "pass if provided message equals expectation" do
-    Riot::Assertion.new("foo", fake_situation) do
-      raise Exception, "I'm a nerd"
-    end.raises(Exception, "I'm a nerd")
-  end.equals(true)
-
-  should "fail if provided message does not equal expectation" do
-    Riot::Assertion.new("foo", fake_situation) do
-      raise(Exception, "I'm a nerd")
-    end.raises(Exception, "But I'm not")
-  end.kind_of(Riot::Failure)
-
-  should "pass if provided message matches expectation" do
-    Riot::Assertion.new("foo", fake_situation) do
-      raise(Exception, "I'm a nerd")
-    end.raises(Exception, %r[nerd])
-  end.equals(true)
-
-  should "fail if provided message does not match expectation" do
-    Riot::Assertion.new("foo", fake_situation) do
-      raise(Exception, "I'm a nerd")
-    end.raises(Exception, %r[foo])
-  end.kind_of(Riot::Failure)
-end # raises assertion
-
-context "matching assertion:" do
-  asserts "result matches expression" do
-    Riot::Assertion.new("foo", fake_situation) { "a" }.matches(%r[.])
-  end.equals(0)
-
-  should "raise a Failure if result does not match" do
-    Riot::Assertion.new("foo", fake_situation) { "" }.matches(%r[.])
-  end.kind_of(Riot::Failure)
-
-  should "return the result of a matching operation" do
-    Riot::Assertion.new("foo", fake_situation) { "a" }.matches("a")
-  end.equals(0)
-end # maching assertion
-
-context "kind_of assertion:" do
-  asserts "specific result is a kind of String" do
-    Riot::Assertion.new("foo", fake_situation) { "a" }.kind_of(String)
-  end
-
-  should "raise a Failure if not a kind of String" do
-    Riot::Assertion.new("foo", fake_situation) { 0 }.kind_of(String)
-  end.kind_of(Riot::Failure)
-end # kind_of assertion
-
-context "assigns assertion:" do
-  setup do
-    situation = Riot::Situation.new
-    situation.instance_eval { @foo = "bar"; @bar = nil}
-    situation
-  end
-
-  asserts("an instance variable was assigned") do
-    test_object = topic
-    Riot::Assertion.new("duh", fake_situation) { test_object }.assigns(:foo)
-  end
-
-  asserts("an instance variable was never assigned") do
-    test_object = topic
-    Riot::Assertion.new("foo", fake_situation) { test_object }.assigns(:baz)
-  end.kind_of(Riot::Failure)
-  
-  asserts "an instance variable was defined with nil value" do
-    test_object = topic
-    Riot::Assertion.new("foo", fake_situation) { test_object }.assigns(:bar).message
-  end.equals("expected @bar to be assigned a value")
-
-  asserts("an instance variable was assigned a specific value") do
-    test_object = topic
-    Riot::Assertion.new("duh", fake_situation) { test_object }.assigns(:foo, "bar")
-  end
-
-  asserts("failure when instance never assigned even when a value is expected") do
-    test_object = topic
-    Riot::Assertion.new("duh", fake_situation) { test_object }.assigns(:bar, "bar").message
-  end.equals("expected @bar to be assigned a value")
-
-  asserts("failure when expected value is not assigned to variable with a value") do
-    test_object = topic
-    Riot::Assertion.new("duh", fake_situation) { test_object }.assigns(:foo, "baz").message
-  end.equals("expected @foo to be equal to 'baz', not 'bar'")
-end # assigns assertion

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riot
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Justin Knowlden
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 -05:00
+date: 2009-10-06 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: An extremely fast, expressive, and context-driven unit-testing framework. A replacement for all other testing frameworks
+description: An extremely fast, expressive, and context-driven unit-testing framework. A replacement for all other testing frameworks. Protest the slow test.
 email: 
 - gus@gusg.us
 executables: []
@@ -62,6 +62,13 @@ specification_version: 3
 summary: An extremely fast, expressive, and context-driven unit-testing framework
 test_files: 
 - Rakefile
+- test/assertion_macro_assigns_test.rb
+- test/assertion_macro_equals_test.rb
+- test/assertion_macro_exists_test.rb
+- test/assertion_macro_kind_of_test.rb
+- test/assertion_macro_matching_test.rb
+- test/assertion_macro_nil_test.rb
+- test/assertion_macro_raises_test.rb
 - test/assertion_test.rb
 - test/benchmark/simple_context_and_assertions.rb
 - test/context_test.rb