scope 0.2.1 → 0.2.2

data/lib/scope.rb

@@ -32,19 +32,26 @@ module Scope
     end
 
     def self.context(name, &block)
+      context_focused = false
+      if @focus_enabled && @focus_next_test_or_context
+        @focus_next_test_or_context = false
+        @inside_focused_context = true
+        context_focused = true
+      end
       parent = @contexts.last
       new_context = Context.new(name, parent)
       parent.tests_and_subcontexts << new_context
       @contexts << new_context
       block.call
       @contexts.pop
+      @inside_focused_context = false if context_focused
     end
 
     def self.should(name, &block)
       # When focus_enabled is true, we'll only be running the next should() block that gets defined.
       if @focus_enabled
-        return unless @focus_next_test
-        @focus_next_test = false
+        return unless @focus_next_test_or_context || @inside_focused_context
+        @focus_next_test_or_context &&= false
       end
 
       context_name = @contexts[1..-1].map { |context| context.name }.join(" ")
@@ -63,14 +70,16 @@ module Scope
     def self.setup_once(&block) @contexts.last.setup_once = block end
     def self.teardown_once(&block) @contexts.last.teardown_once = block end
 
-    # "Focuses" the next test that's defined after this method is called, ensuring that only that test is run.
+    # "Focuses" the next test or context that's defined after this method is called, ensuring that only that
+    # test/context is run.
     def self.focus
-      # Since we're focusing only the next test, remove any tests which were already defined.
+      # Since we're focusing only the next test/context, remove any tests which were already defined.
       context_for_test.values.uniq.each do |context|
         context.tests_and_subcontexts.reject! { |test| test.is_a?(String) }
       end
       @focus_enabled = true
-      @focus_next_test = true
+      @focus_next_test_or_context = true
+      @inside_focused_context = false
     end
 
     # run() is called by the MiniTest framework. This TestCase class is instantiated once per test method
@@ -81,7 +90,7 @@ module Scope
       result = nil
       begin
         # Unit::TestCase's implementation of run() invokes the test method with exception handling.
-        context.run_setup_and_teardown(self, test_name) { result = super }
+        context.run_setup_and_teardown(self, test_name) { result = super(test_runner) }
       rescue *MiniTest::Unit::TestCase::PASSTHROUGH_EXCEPTIONS
         raise
       rescue Exception => error
@@ -107,27 +116,42 @@ module Scope
 
     # Runs the setup work for this context and any parent contexts, yields to the block (which should invoke
     # the actual test method), and then completes the teardown work.
-    def run_setup_and_teardown(test_case_instance, test_name)
+    def run_setup_and_teardown(test_case_instance, test_name, &runner_proc)
       contexts = ([self] + ancestor_contexts).reverse
+      recursively_run_setup_and_teardown(test_case_instance, test_name, contexts, runner_proc)
+    end
+
+    def teardown_once=(block) @teardown_once = run_only_once(block) end
+    def setup_once=(block) @setup_once = run_only_once(block) end
+
+    private
+    def recursively_run_setup_and_teardown(test_case_instance, test_name, contexts, runner_proc)
+      outer_context = contexts.slice! 0
       # We're using instance_eval so that instance vars set by the block are created on the test_case_instance
-      contexts.each { |context| test_case_instance.instance_eval(&context.setup_once) if context.setup_once }
-      contexts.each { |context| test_case_instance.instance_eval(&context.setup) if context.setup }
-      yield
-      contexts.reverse!
-      contexts.each { |context| test_case_instance.instance_eval(&context.teardown) if context.teardown }
-
-      # If this is the last context being run in any parent contexts, run their teardown_once blocks.
-      if tests_and_subcontexts.last == test_name
-        test_case_instance.instance_eval(&teardown_once) if teardown_once
-        descendant_context = self
-        ancestor_contexts.each do |ancestor|
-          break unless ancestor.tests_and_subcontexts.last == descendant_context
-          test_case_instance.instance_eval(&ancestor.teardown_once) if ancestor.teardown_once
-          descendant_context = ancestor
+      test_case_instance.instance_eval(&outer_context.setup_once) if outer_context.setup_once
+      test_case_instance.instance_eval(&outer_context.setup) if outer_context.setup
+      begin
+        if contexts.empty?
+          runner_proc.call
+        else
+          recursively_run_setup_and_teardown(test_case_instance, test_name, contexts, runner_proc)
+        end
+      ensure
+        # The ensure block guarantees that this context's teardown blocks will be run, even in an exception
+        # is thrown in a descendant context or in the test itself.
+        test_case_instance.instance_eval(&outer_context.teardown) if outer_context.teardown
+        if outer_context.name_of_last_test == test_name
+          test_case_instance.instance_eval(&outer_context.teardown_once) if outer_context.teardown_once
         end
       end
     end
 
+    def run_only_once(block)
+      has_run = false
+      Proc.new { instance_eval(&block) unless has_run; has_run = true }
+    end
+
+    protected
     def ancestor_contexts
       ancestors = []
       parent = self
@@ -135,13 +159,23 @@ module Scope
       ancestors
     end
 
-    def teardown_once=(block) @teardown_once = run_only_once(block) end
-    def setup_once=(block) @setup_once = run_only_once(block) end
-
-    private
-    def run_only_once(block)
-      has_run = false
-      Proc.new { instance_eval(&block) unless has_run; has_run = true }
+    # Returns the name of the last actual test within this context (including within its descendant contexts),
+    # or nil if none exists.
+    def name_of_last_test
+      unless defined? @name_of_last_test
+        @name_of_last_test = nil
+        tests_and_subcontexts.reverse.each do |test_or_context|
+          if test_or_context.is_a? String
+            @name_of_last_test = test_or_context
+            break
+          end
+          unless test_or_context.name_of_last_test.nil?
+            @name_of_last_test = test_or_context.name_of_last_test
+            break
+          end
+        end
+      end
+      @name_of_last_test
     end
   end
-end
+end

data/scope.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "scope"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">=0") if s.respond_to? :required_rubygems_version=
   s.specification_version = 2 if s.respond_to? :specification_version=

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scope
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Phil Crosby
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -07:00
+date: 2011-06-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency