riot 0.9.10 → 0.9.11

data/VERSION

@@ -1 +1 @@
-0.9.10
+0.9.11

data/lib/riot/assertion_macros.rb

@@ -71,12 +71,12 @@ module Riot
     # Asserts that an instance variable is defined for the result of the assertion. Value of instance
     # variable is expected to not be nil
     #   setup { User.new(:email => "foo@bar.baz") }
-    #   asserts("foo") { topic }.assigns(:email)
+    #   topic.assigns(:email)
     #
     # If a value is provided in addition to the variable name, the actual value of the instance variable
     # must equal the expected value
-    #   setup { User.new(:emmail => "foo@bar.baz") }
-    #   asserts("foo") { topic }.assigns(:email, "foo@bar.baz")
+    #   setup { User.new(:email => "foo@bar.baz") }
+    #   topic.assigns(:email, "foo@bar.baz")
     def assigns(variable, expected_value=nil)
       actual_value = actual.instance_variable_get("@#{variable}")
       return fail("expected @#{variable} to be assigned a value") if actual_value.nil?

data/lib/riot/context.rb

@@ -4,7 +4,7 @@ module Riot
     attr_reader :description, :assertions, :situation
     def initialize(description, reporter, parent=nil, &context_block)
       @description, @reporter, @parent = description, reporter, parent
-      @assertions = []
+      @setups, @assertions = [], []
       @situation = Situation.new
       bootstrap(@situation)
       instance_eval(&context_block) if block_given? # running the context
@@ -13,8 +13,10 @@ module Riot
 
     # Walk it out. Call setup from parent first
     def bootstrap(a_situation)
-      run_setup(a_situation, &@parent.bootstrap(a_situation)) if @parent
-      @setup
+      @parent.bootstrap(a_situation).each do |setup_block|
+        run_setup(a_situation, &setup_block)
+      end if @parent
+      @setups
     end
 
     def report
@@ -26,7 +28,8 @@ module Riot
     # DSLee stuff
 
     def setup(&block)
-      run_setup(situation, &(@setup = block))
+      @setups << block
+      run_setup(situation, &block)
     end
 
     def context(description, &block) Context.new(description, @reporter, self, &block); end

data/riot.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{riot}
-  s.version = "0.9.10"
+  s.version = "0.9.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin 'Gus' Knowlden"]
-  s.date = %q{2009-10-15}
+  s.date = %q{2009-10-19}
   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 = [
@@ -74,3 +74,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/test/context_test.rb

@@ -54,15 +54,15 @@ end # basic context
 
 context "nested context" do
   setup do
-    @parent_context = Riot::Context.new("foo", Riot::NilReport.new)
-    @parent_context.setup { @test_counter = 0; @foo = "bar" }
-    @parent_context.asserts("truthiness") { @test_counter += 1; true }
-    @parent_context
+    test_context = Riot::Context.new("foo", Riot::NilReport.new)
+    test_context.setup { @test_counter = 0; @foo = "bar" }
+    test_context.asserts("truthiness") { @test_counter += 1; true }
+    test_context
   end
   
   context "inner context with own setup" do
     setup do
-      test_context = @parent_context.context("baz")
+      test_context = topic.context("baz")
       test_context.setup { @test_counter += 10 }
       test_context
     end
@@ -72,7 +72,34 @@ context "nested context" do
   end
 
   context "inner context without its own setup" do
-    setup { @parent_context.context("bum") }
+    setup { topic.context("bum") }
     asserts("parent setup is called") { topic.situation }.assigns(:foo, "bar")
   end
 end
+
+# 
+# Multiple setups in a context
+
+context "multiple setups" do
+  setup do
+    test_context = Riot::Context.new("foo", Riot::NilReport.new)
+    test_context.setup { @foo = "bar" }
+    test_context.setup { @baz = "boo" }
+    test_context
+  end
+
+  asserts("foo") { topic.situation }.assigns(:foo, "bar")
+  asserts("bar") { topic.situation }.assigns(:baz, "boo")
+
+  context "in the parent of a nested context" do
+    setup do
+      test_context = topic.context("goo")
+      test_context.setup { @goo = "car" }
+      test_context
+    end
+
+    asserts("foo") { topic.situation }.assigns(:foo, "bar")
+    asserts("bar") { topic.situation }.assigns(:baz, "boo")
+    asserts("goo") { topic.situation }.assigns(:goo, "car")
+  end # in the parent of a nested context
+end # multiple setups

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riot
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Justin 'Gus' Knowlden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 -05:00
+date: 2009-10-19 00:00:00 -05:00
 default_executable: 
 dependencies: []