jeremymcanally-context 0.5.2 → 0.5.5

data/Manifest.txt

@@ -15,6 +15,7 @@ lib/context/test.rb
 lib/context/version.rb
 lib/context/shared_behavior.rb
 lib/context/core_ext/string.rb
+lib/context/core_ext/rails_hacks.rb
 setup.rb
 tasks/deployment.rake
 tasks/environment.rake

data/context.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "context"
-  s.version  = "0.5.2"
+  s.version  = "0.5.5"
   s.date     = "2008-10-03"
   s.summary  = "Contexts and DSL sugar for your tests"
   s.email    = "jeremy@entp.com"
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "lib/context/test.rb",
     "lib/context/version.rb",
     "lib/context/core_ext/string.rb",
+    "lib/context/core_ext/rails_hacks.rb",
     "setup.rb"
   ]
   

data/lib/context.rb

@@ -5,9 +5,15 @@ require 'rubygems'
 require 'test/unit'
 
 require 'context/core_ext/string'
+require 'context/core_ext/rails_hacks'
+
 require 'context/version'
 require 'context/suite'
 require 'context/test'
 require 'context/lifecycle'
 require 'context/context'
-require 'context/shared_behavior'
+require 'context/shared_behavior'
+
+class Test::Unit::TestCase
+  extend Context::Context
+end

data/lib/context/context.rb

@@ -1,5 +1,5 @@
-class Test::Unit::TestCase
-  class << self
+module Context
+  module Context
     # Test::Unit uses ObjectSpace to figure out what Test::Unit:TestCase instances are running
     # Contexts are not named and therefore sometimes get garbage collected.
     # Think of #context_list as the shelter for nameless contexts

data/lib/context/core_ext/rails_hacks.rb

@@ -0,0 +1,10 @@
+class Test::Unit::TestCase
+  class << self
+    def setup_for_shoulda
+      self.instance_eval do
+        alias :setup :before
+        alias :teardown :after
+      end
+    end
+  end
+end

data/lib/context/lifecycle.rb

@@ -1,6 +1,6 @@
 class Test::Unit::TestCase
   class << self
-    attr_accessor :before_each_callbacks, :before_all_callbacks, :after_each_callbacks, :after_all_callbacks
+    attr_accessor :before_each_callbacks, :before_all_callbacks, :after_each_callbacks, :after_all_callbacks, :before_should_callbacks
 
     # Add logic to run before the tests (i.e., a +setup+ method)
     #
@@ -9,6 +9,11 @@ class Test::Unit::TestCase
     #     end
     # 
     def before(period = :each, &block)
+      unless block_given?
+        block  = period
+        period = :each
+      end
+
       send("before_#{period}_callbacks") << block
     end
     
@@ -21,6 +26,11 @@ class Test::Unit::TestCase
     #     end
     #
     def after(period = :each, &block)
+      unless block_given?
+        block  = period
+        period = :each
+      end
+
       send("after_#{period}_callbacks") << block
     end
     
@@ -32,22 +42,28 @@ class Test::Unit::TestCase
     end
   end
 
-  self.before_all_callbacks  = []
-  self.before_each_callbacks = []
-  self.after_each_callbacks  = []
-  self.after_all_callbacks   = []
+  self.before_all_callbacks    = []
+  self.before_each_callbacks   = []
+  self.after_each_callbacks    = []
+  self.after_all_callbacks     = []
+  self.before_should_callbacks = {}
 
   def self.inherited(child) # :nodoc:
     super
-    child.before_all_callbacks  = []
-    child.before_each_callbacks = []
-    child.after_each_callbacks  = []
-    child.after_all_callbacks   = []
+    child.before_all_callbacks    = []
+    child.before_each_callbacks   = []
+    child.after_each_callbacks    = []
+    child.after_all_callbacks     = []
+    child.before_should_callbacks = {}
 
     child.class_eval do
       def setup(&block)
         super
         
+        unless self.class.before_should_callbacks[method_name].nil?
+          instance_eval(&self.class.before_should_callbacks[method_name])
+        end
+
         run_each_callbacks :before
       end
 
@@ -56,11 +72,13 @@ class Test::Unit::TestCase
 
         run_each_callbacks :after
       end
-    end
+    end if self == Test::Unit::TestCase
   end
 
   def run_each_callbacks(callback_type) # :nodoc:
-    self.class.gather_callbacks(callback_type, :each).each { |c| instance_eval(&c) if c }
+    self.class.gather_callbacks(callback_type, :each).each do |c| 
+      c.is_a?(Proc) ? instance_eval(&c) : send(c)
+    end
   end
 
   def run_all_callbacks(callback_type) # :nodoc:
@@ -69,6 +87,12 @@ class Test::Unit::TestCase
     (instance_variables - previous_ivars).inject({}) do |hash, ivar|
       hash.update ivar => instance_variable_get(ivar)
     end
+  rescue Object => exception
+    raise <<-BANG
+  Error running the #{callback_type}(:all) callback for #{name}
+  #{exception.class.name}: #{exception.message}
+  #{exception.backtrace.join("\n")}
+    BANG
   end
 
   def set_values_from_callbacks(values) # :nodoc:
@@ -76,4 +100,4 @@ class Test::Unit::TestCase
       instance_variable_set name, value
     end
   end
-end
+end

data/lib/context/test.rb

@@ -7,11 +7,15 @@ class Test::Unit::TestCase
     #       assert_false @user.can?(:delete, @other_user)
     #     end
     #
-    def test(name, &block)
-      test_name = "test_#{((context_name == "" ? context_name : context_name + " ") + name).to_method_name}".to_sym
+    def test(name, opts={}, &block)
+      test_name = ["test:", context_name, name].reject { |n| n == "" }.join(' ')
       # puts "running test #{test_name}"
       defined = instance_method(test_name) rescue false
       raise "#{test_name} is already defined in #{self}" if defined
+
+      unless opts[:before].nil?
+        before_should_callbacks[test_name] = opts[:before]
+      end
       
       if block_given?
         define_method(test_name, &block)
@@ -23,5 +27,11 @@ class Test::Unit::TestCase
     end
     
     %w(it should tests).each {|m| alias_method m, :test} 
+
+    def before_test(name, &block)
+      test(name, :before => block) {}
+    end
+
+    %w(before_it before_should before_tests).each {|m| alias_method m, :before_test}
   end
-end
+end

data/lib/context/version.rb

@@ -2,7 +2,7 @@ module Context
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 5
-    TINY  = 2
+    TINY  = 5
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/test_lifecycle.rb

@@ -2,71 +2,87 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestLifecycle < Test::Unit::TestCase
   before do
-    @inherited_before_each_var = 1
+    @inherited_before_each_var ||= 0
+    @inherited_before_each_var  += 1
   end
 
   before do
-    @inherited_before_each_var = 2
-    @inherited_before_each_var_2 = 1
+    @inherited_before_each_var   ||= 0
+    @inherited_before_each_var_2 ||= 0
+    @inherited_before_each_var    += 2
+    @inherited_before_each_var_2  += 1
   end
 
   after do
-    @inherited_after_each_var = 1
+    @inherited_after_each_var ||= 0
+    @inherited_after_each_var  += 1
   end
 
   before :all do
-    @inherited_before_all_var = 1
+    @inherited_before_all_var ||= 0
+    @inherited_before_all_var  += 1
   end
 
   after :all do
-    @inherited_after_all_var = 1
+    @inherited_after_all_var ||= 0
+    @inherited_after_all_var  += 1
   end
 
   sample_test = context "lifecycle" do
     attr_reader :inherited_before_each_var, :inherited_before_each_var_2, :inherited_after_each_var, 
-      :after_each_var, :inherited_before_all_var, :inherited_after_all_var, :before_all_var, :after_all_var, 
+      :after_each_var, :inherited_before_all_var, :inherited_after_all_var, :before_all_var, :after_all_var, :ivar,
       :superclass_before_each_var, :superclass_after_each_var, :superclass_before_all_var, :superclass_after_all_var, :one, :two
 
     before do
-      @inherited_before_each_var = 3
+      @inherited_before_each_var ||= 0
+      @inherited_before_each_var  += 4
     end
 
     after do
-      @after_each_var = 1
+      @after_each_var ||= 0
+      @after_each_var  += 1
     end
 
     before :all do
-      @before_all_var = 1
+      @before_all_var ||= 0
+      @before_all_var  += 1
     end
 
     after :all do
-      @after_all_var = 1
+      @after_all_var ||= 0
+      @after_all_var  += 1
     end
 
+    after :a_method
+
     test "foo" do
     end
   end
 
   before do
-    @superclass_before_each_var = 1
+    @superclass_before_each_var ||= 0
+    @superclass_before_each_var  += 1
   end
 
   after do
-    @superclass_after_each_var = 1
+    @superclass_after_each_var ||= 0
+    @superclass_after_each_var  += 1
   end
 
   before :all do
-    @superclass_before_all_var = 1
+    @superclass_before_all_var ||= 0
+    @superclass_before_all_var  += 1
   end
 
   after :all do
-    @superclass_after_all_var = 1
+    @superclass_after_all_var ||= 0
+    @superclass_after_all_var  += 1
   end
 
   context "With before/after :each blocks" do
     before do
       @result = Test::Unit::TestResult.new
-      @test = sample_test.new("test_lifecycle_foo")
+      @test = sample_test.new("test: lifecycle foo")
       @test.run(@result) { |inherited_after_each_var, v| }
     end
 
@@ -75,7 +91,7 @@ class TestLifecycle < Test::Unit::TestCase
     end
 
     it "it runs inherited before callbacks in order" do
-      assert_equal 3, @test.inherited_before_each_var
+      assert_equal 7, @test.inherited_before_each_var
     end
 
     it "it runs before callbacks in order" do
@@ -93,6 +109,10 @@ class TestLifecycle < Test::Unit::TestCase
     it "it runs after callbacks" do
       assert_equal 1, @test.after_each_var
     end
+
+    it "it runs after callbacks specified with method names, instead of blocks" do
+      assert_equal "a method ran", @test.ivar
+    end
   end
 
   context "With before/after :all blocks" do
@@ -132,7 +152,7 @@ class TestLifecycle < Test::Unit::TestCase
   context "With setup/teardown methods" do
     before do
       @result = Test::Unit::TestResult.new
-      @test = sample_test.new("test_lifecycle_foo")
+      @test = sample_test.new("test: lifecycle foo")
       
       @test.class.setup do
         @one = 1
@@ -150,7 +170,7 @@ class TestLifecycle < Test::Unit::TestCase
     end
     
     it "runs setup method block and regular callbacks" do
-      assert_equal 3, @test.inherited_before_each_var
+      assert_equal 7, @test.inherited_before_each_var
     end
     
     it "runs teardown method block a la Shoulda" do
@@ -161,4 +181,44 @@ class TestLifecycle < Test::Unit::TestCase
       assert_equal 1, @test.after_each_var
     end
   end
+
+  context "With the before option" do
+    setup do
+      @jvar = "override success!"
+    end
+
+    l = lambda { @ivar = "awesome" }
+    should "run the lambda", :before => l do
+      assert_equal "awesome", @ivar
+    end
+
+    l = lambda { @jvar = "should be overridden" }
+    should "run the lambda before the setup", :before => l do
+      assert_equal "override success!", @jvar
+    end
+  end
+
+  context "Before tests" do
+    # omg this is odd
+    setup do
+      assert_equal "yup, it's set", @ivar
+    end
+
+    before_test "run before the setup block" do
+      @ivar = "yup, it's set"
+    end
+  end
+
+  context "To be compatible with rails' expectations" do
+    setup :a_method
+
+    it "should accept a symbol for an argument to setup and run that method at setup time" do
+      assert_equal "a method ran", @ivar
+    end
+  end
+
+  protected
+    def a_method
+      @ivar = "a method ran"
+    end
 end

data/test/test_test.rb

@@ -6,12 +6,18 @@ class TestTest < Test::Unit::TestCase
       assert self.class.respond_to?(method_alias)
     end
   end
+
+  def test_before_test_aliases
+    [:before_test, :before_it, :before_should, :before_tests].each do |method_alias|
+      assert self.class.respond_to?(method_alias), method_alias.inspect
+    end
+  end
   
   context "A test block" do
     it "should create a test_xxx method" do
       self.class.test("should create a test method") { true }
       
-      assert self.respond_to?(:test_a_test_block_should_create_a_test_method)
+      assert self.respond_to?("test: A test block should create a test method")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeremymcanally-context
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.5
 platform: ruby
 authors: 
 - Jeremy McAnally
@@ -41,6 +41,7 @@ files:
 - lib/context/shared_behavior.rb
 - lib/context/test.rb
 - lib/context/core_ext/string.rb
+- lib/context/core_ext/rails_hacks.rb
 - setup.rb
 has_rdoc: true
 homepage: http://github.com/jeremymcanally/context