nutrasuite 0.3.0 → 0.3.1

data/Changelog

@@ -0,0 +1,9 @@
+0.3.1 [03/18/2012]
+  Root contexts were kind of a dumb idea it turns out. Found an alternate way to
+    implement similar functionality.
+0.3.0 [03/07/2012]
+  Change log started. Better late than never.
+  Removed deprecated "setup" and "teardown" methods.
+  Introduced the concept of a root context so "before" and "after" methods can
+    exist outside of a declared context.
+  Replaced the ill-conceived "and" method with "and_also" courtesy @gma.

data/README.markdown

@@ -75,7 +75,8 @@ Gem requirements/etc. should be handled by Bundler.
 
 ### Contributors
 
-Alan Johnson (commondream)
+- Alan Johnson (commondream)
+- Graham Ashton (gma)
 
 ## License
 Copyright (C) 2012 by Tommy Morgan

data/lib/nutrasuite/contexts.rb

@@ -3,7 +3,6 @@ module Nutrasuite
   # Public: ContextHelpers contains all of the Nutrasuite Context methods. This
   # will be included in Test::Unit::TestCase by default.
   module ContextHelpers
-
     # Public: These methods will each define a context and push it onto the
     # context stack for the duration of the passed in block.
     #
@@ -32,7 +31,12 @@ module Nutrasuite
     # Public: use before to declare steps that need to be run before every test
     # in a context.
     def before(&block)
-      Context.current_context.setups << block
+      if Context.current_context
+        Context.current_context.setups << block
+      else
+        puts self.name + " is adding a hook"
+        self.add_setup_hook(nil, &block)
+      end
     end
 
     # Public: use after to declare steps that need to be run after every test in
@@ -89,6 +93,11 @@ module Nutrasuite
       test_name = Context.build_test_name(name)
 
       setups = []
+      # Be sure to include setup hooks from minitest.
+      unless @setup_hooks.nil?
+        setups = setups + @setup_hooks
+      end
+
       teardowns = []
       Context.context_stack.each do |context|
         setups.concat(context.setups)
@@ -188,7 +197,7 @@ module Nutrasuite
     #
     # Returns: an Array representing the context stack.
     def self.context_stack
-      @context_stack ||= [Context.new(nil)]
+      @context_stack ||= []
     end
 
     # Internal: get the current context.

data/lib/nutrasuite/version.rb

@@ -1,3 +1,3 @@
 module Nutrasuite
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/unit/contexts_test.rb

@@ -98,3 +98,11 @@ class ContextsTest < Test::Unit::TestCase
     end
   end
 end
+
+class SecondTest < Test::Unit::TestCase
+  a "Second test class" do
+    it "isn't affected by befores from the first class" do
+      assert_equal nil, @root
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nutrasuite
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70199395886180 !ruby/object:Gem::Requirement
+  requirement: &70261346101020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70199395886180
+  version_requirements: *70261346101020
 description: Nutrasuite is a low-calorie syntax sweetener for minitest
 email:
 - tommy.morgan@gmail.com
@@ -32,6 +32,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Changelog
 - Gemfile
 - README.markdown
 - Rakefile