nutrasuite 0.2.2 → 0.3.0

data/README.markdown

@@ -32,7 +32,7 @@ Nutrasuite is all about contexts. Write your tests like so:
     require 'nutrasuite'
     class SomeTest < MiniTest::Unit::TestCase
       a "newly instantiated test object" do
-        setup do
+        before do
           some_setup_stuff
         end
 
@@ -40,19 +40,19 @@ Nutrasuite is all about contexts. Write your tests like so:
           assert true
         end
 
-        teardown do
+        after do
           some_teardown_stuff
         end
       end
     end
 
 All of your other minitest stuff should work normally. Context
-setup/teardown is executed once for each test, so the randomization built into
+before/after blocks are executed once for each test, so the randomization built into
 minitest will still work as you'd expect.
 
-`a`, `an`, `and`, `the`, and `that` all define contexts, so you can build
-readable sentences like "_a_ user _that_ has an expired password _and_ a bad email
-address" or "_the_ singleton."
+`a`, `an`, `and_also`, `the`, and `that` all define contexts, so you can build
+readable sentences like "_a_ user _that_ has an expired password _and_also_ a bad
+email address" or "_the_ singleton."
 
 `it` defines tests; `it_eventually` defines tests that are to be skipped.
 

data/lib/nutrasuite/contexts.rb

@@ -20,10 +20,10 @@ module Nutrasuite
     #     ...tests...
     #   end
     #
-    ["a", "an", "and", "that", "the"].each do |article|
+    ["a", "an", "and_also", "that", "the"].each do |article|
       eval <<-HERE
         def #{article}(name, &block)
-          name = "#{article} " << name
+          name = "#{article.gsub("_"," ")} " << name
           Context.push(name, &block)
         end
       HERE
@@ -32,47 +32,13 @@ module Nutrasuite
     # Public: use before to declare steps that need to be run before every test
     # in a context.
     def before(&block)
-      if Context.current_context?
-        Context.current_context.setups << block
-      else
-        warn "Not in a context"
-      end
-    end
-
-    # Deprecated: As much as I'd like to use setup and teardown, they screw up
-    # at times with ActiveSupport test cases. Better to use before and after.
-    #
-    # This method will be removed by 0.3.0. Please adjust your tests
-    # accordingly.
-    def setup(&block)
-      if Context.current_context?
-        Context.current_context.setups << block
-      else
-        warn "Not in a context"
-      end
+      Context.current_context.setups << block
     end
 
     # Public: use after to declare steps that need to be run after every test in
     # a context.
     def after(&block)
-      if Context.current_context?
-        Context.current_context.teardowns << block
-      else
-        warn "Not in a context"
-      end
-    end
-
-    # Deprecated: As mich as I'd like to use setup and teardown, they screw up
-    # at times with ActiveSupport test cases. Better to use before and after.
-    #
-    # This method will be removed by 0.3.0. Please adjust your tests
-    # accordingly.
-    def teardown(&block)
-      if Context.current_context?
-        Context.current_context.teardowns << block
-      else
-        warn "Not in a context"
-      end
+      Context.current_context.teardowns << block
     end
 
     # Public: defines a test to be executed. Will run any setup blocks on the
@@ -142,14 +108,6 @@ module Nutrasuite
         end
       end
     end
-
-    # Internal: warn simply outputs a warning message for the user if they
-    # appear to be using Nutrasuite incorrectly.
-    # 
-    def warn(message)
-      puts " * Warning: #{message}"
-    end
-
   end
 
   # Internal: The Context class represents each context that can go on the
@@ -202,7 +160,9 @@ module Nutrasuite
     def self.build_test_name(name="")
       full_name = "test "
       context_stack.each do |context|
-        full_name << context.name << " "
+        unless context.name.nil?
+          full_name << context.name << " "
+        end
       end
       full_name << name
     end
@@ -228,7 +188,7 @@ module Nutrasuite
     #
     # Returns: an Array representing the context stack.
     def self.context_stack
-      @context_stack ||= []
+      @context_stack ||= [Context.new(nil)]
     end
 
     # Internal: get the current context.
@@ -238,14 +198,6 @@ module Nutrasuite
     def self.current_context
       context_stack.last
     end
-
-    # Internal: determine whether there is currently a context active.
-    #
-    # Returns: true if there is at least one context on the stack, false
-    # otherwise.
-    def self.current_context?
-      !context_stack.empty?
-    end
   end
 end
 

data/lib/nutrasuite/version.rb

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

data/nutrasuite.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   # specify any dependencies here; for example:
+  s.add_development_dependency "activesupport"
   # s.add_development_dependency "rspec"
   # s.add_runtime_dependency "rest-client"
 end

data/test/test_helper.rb

@@ -1 +1,2 @@
 require 'nutrasuite'
+require 'active_support'

data/test/unit/activesupport_test.rb

@@ -0,0 +1,114 @@
+require 'test_helper'
+
+# ActiveSupport does funny stuff with its test cases, so we have to be
+# especially sure that nutrasuite plays nicely with it (and vice versa).
+class ActivesupportTest < ActiveSupport::TestCase
+  
+  before do
+    @root = "test"
+  end
+
+  it "allows tests outside of any context" do
+    assert true
+  end
+
+  it "runs the before blocks at the root level" do
+    assert_equal "test", @root
+  end
+
+  it_eventually "allows tests to be skipped outside of any context" do
+    raise "This exception should never be thrown."
+  end
+
+  it "names tests correctly" do
+    assert_equal "test some name", Nutrasuite::Context.build_test_name("some name")
+  end
+
+  a "Context" do
+    before do
+      @a = 5
+    end
+
+    it "runs befores before tests" do
+      assert_equal @a, 5
+      assert_equal @root, "test"
+    end
+
+    it_eventually "passes its name onto its test" do
+      # TODO: figure out how to test this
+    end
+
+    it "doesn't run befores from nested contexts" do
+      assert_equal nil, @b
+    end
+
+    that "has a nested Context" do
+      before do
+        @b = 10
+      end
+
+      it "runs both befores" do
+        assert_equal @a, 5
+        assert_equal @b, 10
+      end
+    end
+
+    that "has a nested Context with multiple befores" do
+      before do
+        @b = 6
+      end
+
+      before do
+        @c = 7
+        @b = @b + 1
+      end
+
+      it "runs all befores in order" do
+        assert_equal @b, 7
+        assert_equal @b, @c
+      end
+    end
+  end
+
+  a "Second context" do
+    before do
+      @b = true
+    end
+
+    it "isn't affected by befores from other contexts" do
+      assert_equal true, @b
+      assert @a.nil?
+    end
+  end
+
+  the "'the' context" do
+    it "works" do
+      assert true
+    end
+  end
+
+  an "'an' context" do
+    it "works" do
+      assert true
+    end
+  end
+
+  and_also "the 'and_also' context" do
+    it "works" do
+      assert true
+    end
+  end
+
+  a "'a' context" do
+    it "works" do
+      assert true
+    end
+  end
+
+  that "'that' context" do
+    it "works" do
+      assert true
+    end
+  end
+end
+

data/test/unit/contexts_test.rb

@@ -1,11 +1,18 @@
 require 'test_helper'
 
 class ContextsTest < Test::Unit::TestCase
+  before do
+    @root = "test"
+  end
 
   it "allows tests outside of any context" do
     assert true
   end
 
+  it "runs the before blocks at the root level" do
+    assert_equal "test", @root
+  end
+
   it_eventually "allows tests to be skipped outside of any context" do
     raise "This exception should never be thrown."
   end
@@ -21,6 +28,7 @@ class ContextsTest < Test::Unit::TestCase
 
     it "runs befores before tests" do
       assert_equal @a, 5
+      assert_equal @root, "test"
     end
 
     it_eventually "passes its name onto its tests" do
@@ -72,19 +80,19 @@ class ContextsTest < Test::Unit::TestCase
     end
   end
 
-  the "'and' context" do
+  and_also "'and_also' context" do
     it "works" do
       assert true
     end
   end
 
-  the "'an' context" do
+  an "'an' context" do
     it "works" do
       assert true
     end
   end
 
-  the "'that' context" do
+  that "'that' context" do
     it "works" do
       assert true
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nutrasuite
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,19 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-04 00:00:00.000000000 Z
-dependencies: []
+date: 2012-03-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70199395886180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70199395886180
 description: Nutrasuite is a low-calorie syntax sweetener for minitest
 email:
 - tommy.morgan@gmail.com
@@ -29,6 +40,7 @@ files:
 - lib/nutrasuite/version.rb
 - nutrasuite.gemspec
 - test/test_helper.rb
+- test/unit/activesupport_test.rb
 - test/unit/contexts_test.rb
 homepage: http://github.com/duwanis/nutrasuite
 licenses: []
@@ -56,5 +68,6 @@ specification_version: 3
 summary: Nutrasuite is a low-calorie syntax sweetener for minitest
 test_files:
 - test/test_helper.rb
+- test/unit/activesupport_test.rb
 - test/unit/contexts_test.rb
 has_rdoc: