riot 0.10.13.pre → 0.10.13

data/CHANGELOG

@@ -1,4 +1,25 @@
-*0.10.13.pre*
+*0.10.13*
+
+* Helpers are now run with other setups, not separately. Which means you could use a helper in a setup. [jaknowlden]
+
+    context "Foo" do
+      helper(:user) { User.new }
+      setup do
+        Baz.new(:user => user) # :)
+      end
+    end # Foo
+
+* Correctly report non-RR assertion failures and errors when RR is used [vandrijevik]
+
+    context "Foo.bar" do
+      asserts("baz is called") do
+        mock(Foo).baz
+        raise RuntimeError.new("oh noes")
+      end
+    end
+
+  would previously return [:fail, "baz() Called 0 times. Expected 1 times."], and will now
+  correctly return [:error, #<RuntimeError: oh noes>]
 
 * Recording description as is. Providing #detailed_description for proper behavior [jaknowlden]
 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 
-task :default => ["test:core"]
+task :default => ["test:all"]
 task "test:all" => ["test:core", "test:extensions"]
 
 require 'rake/testtask'

data/VERSION

@@ -1 +1 @@
-0.10.13.pre
+0.10.13

data/lib/riot/context.rb

@@ -23,7 +23,7 @@ module Riot
     def initialize(description, parent=nil, &definition)
       @parent = parent || RootContext.new([],[], "")
       @description = description
-      @contexts, @helpers, @setups, @assertions, @teardowns = [], [], [], [], []
+      @contexts, @setups, @assertions, @teardowns = [], [], [], []
       self.instance_eval(&definition)
     end
 
@@ -62,7 +62,18 @@ module Riot
       (@setups << Setup.new(&definition)).last
     end
 
-    def helper(name, &block); (@helpers << Helper.new(name, &block)).last; end
+    # Helpers are essentially methods accessible within a situation.
+    #
+    # They're not setup methods, but can be called from setups or from assetions. Each time called, the
+    # helper will be evaluated. It's not currently memoized.
+    #
+    #   context "A string" do
+    #     helper(:foo) { "bar" }
+    #     asserts("a foo") { foo }.equals("bar")
+    #   end
+    def helper(name, &block)
+      (@setups << Helper.new(name, &block)).last
+    end
 
     # A setup shortcut that returns the original topic so you don't have to. Good for nested setups. Instead
     # of doing this in your context:
@@ -136,13 +147,12 @@ module Riot
   private
 
     def runnables
-      setups + @helpers + @assertions + teardowns
+      setups + @assertions + teardowns
     end
 
     def run_sub_contexts(reporter) @contexts.each { |ctx| ctx.run(reporter) }; end
 
     def new_context(description, klass, &definition)
-      # (@contexts << klass.new("#{@description} #{description}", self, &definition)).last
       (@contexts << klass.new(description, self, &definition)).last
     end
 

data/lib/riot/rr.rb

@@ -13,7 +13,7 @@ module Riot
         situation.verify
         result
       rescue ::RR::Errors::RRError => e
-        [:fail, e.message.gsub(/\n/, " ")]
+        result.first == :pass ? [:fail, e.message.gsub(/\n/, " ")] : result
       ensure
         situation.reset
       end

data/riot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot}
-  s.version = "0.10.13.pre"
+  s.version = "0.10.13"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2010-02-20}
+  s.date = %q{2010-03-01}
   s.description = %q{An extremely fast, expressive, and context-driven unit-testing framework. A replacement for all other testing frameworks. Protest the slow test.}
   s.email = %q{gus@gusg.us}
   s.extra_rdoc_files = [

data/test/extensions/rrriot_test.rb

@@ -11,11 +11,20 @@ context "Riot with RR support" do
     Riot::RR::Assertion.new("Satisfied") { true }.run(situation)
   end.equals([:pass, ""])
 
-  asserts("assertion fails when RR is displeased") do
+  asserts("assertion that would otherwise pass fails with RR message when RR is displeased") do
     situation = Riot::RR::Situation.new
     Riot::RR::Assertion.new("Displeased") { mock!.hello }.run(situation)
   end.equals([:fail, "hello() Called 0 times. Expected 1 times."])
 
+  fake_exception = RuntimeError.new("ooga booga")
+  asserts("assertion that would otherwise fail or error does so intact even when RR is displeased") do
+    situation = Riot::RR::Situation.new
+    Riot::RR::Assertion.new("Displeased") do
+      mock!.hello
+      raise fake_exception
+    end.run(situation)
+  end.equals { [:error, fake_exception] }
+
   asserts("RR verification is reset between assertion runs") do
     situation = Riot::RR::Situation.new
     Riot::RR::Assertion.new("Displeased") { mock!.hello; mock!.what }.run(situation)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riot
 version: !ruby/object:Gem::Version 
-  version: 0.10.13.pre
+  version: 0.10.13
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 -06:00
+date: 2010-03-01 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -120,9 +120,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
   version: 
 requirements: []