spicycode-micronaut 0.2.5 → 0.2.7

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 7
 :major: 0
 :minor: 2
-:patch: 5

data/examples/example_helper.rb

@@ -35,6 +35,14 @@ def isolate_behaviour
   end
 end
 
+def use_formatter(new_formatter)
+  original_formatter = Micronaut.configuration.formatter
+  Micronaut.configuration.instance_variable_set(:@formatter, new_formatter)
+  yield
+ensure
+  Micronaut.configuration.instance_variable_set(:@formatter, original_formatter)
+end
+
 def not_in_editor?
   !(ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM'))
 end
@@ -44,5 +52,4 @@ Micronaut.configure do |c|
   c.color_enabled = not_in_editor?
   c.filter_run :focused => true
   c.profile_examples = true
-  #c.formatter = :documentation
 end

data/examples/lib/micronaut/behaviour_example.rb

@@ -236,36 +236,46 @@ describe Micronaut::Behaviour do
 
   end
 
-  pending "#run_examples" do
+  describe "#run_examples" do
+    
+    before do
+      @fake_formatter = Micronaut::Formatters::BaseFormatter.new
+    end
 
     def stub_behaviour
       stub_everything('behaviour', :metadata => { :behaviour => { :name => 'behaviour_name' }})
     end
 
     it "should return true if all examples pass" do
-      passing_example1 = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
-      passing_example2 = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
-      Micronaut::Behaviour.stubs(:examples_to_run).returns([passing_example1, passing_example2])
+      use_formatter(@fake_formatter) do
+        passing_example1 = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
+        passing_example2 = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
+        Micronaut::Behaviour.stubs(:examples_to_run).returns([passing_example1, passing_example2])
 
-      Micronaut::Behaviour.run_examples(stub_behaviour, stub_everything('reporter')).should == true
+        Micronaut::Behaviour.run_examples(stub_behaviour, stub_everything('reporter')).should be_true
+      end
     end
 
     it "should return false if any of the examples return false" do
-      failing_example = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 2 }))
-      passing_example = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
-      Micronaut::Behaviour.stubs(:examples_to_run).returns([failing_example, passing_example])
+      use_formatter(@fake_formatter) do
+        failing_example = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 2 }))
+        passing_example = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
+        Micronaut::Behaviour.stubs(:examples_to_run).returns([failing_example, passing_example])
 
-      Micronaut::Behaviour.run_examples(stub_behaviour, stub_everything('reporter')).should == false
+        Micronaut::Behaviour.run_examples(stub_behaviour, stub_everything('reporter')).should be_false
+      end
     end
 
     it "should run all examples, regardless of any of them failing" do
-      failing_example = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 2 }))
-      passing_example = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
-      Micronaut::Behaviour.stubs(:examples_to_run).returns([failing_example, passing_example])
+      use_formatter(@fake_formatter) do
+        failing_example = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 2 }))
+        passing_example = Micronaut::Example.new(stub_behaviour, 'description', {}, (lambda { 1.should == 1 }))
+        Micronaut::Behaviour.stubs(:examples_to_run).returns([failing_example, passing_example])
 
-      passing_example.expects(:run)
+        passing_example.expects(:run)
 
-      Micronaut::Behaviour.run_examples(stub_behaviour, stub_everything('reporter'))
+        Micronaut::Behaviour.run_examples(stub_behaviour, stub_everything('reporter'))
+      end
     end
 
   end

data/examples/lib/micronaut/example_example.rb

@@ -6,7 +6,7 @@ describe Micronaut::Example, :parent_metadata => 'sample' do
     behaviour = stub('behaviour', :metadata => { :behaviour => { :name => 'behaviour_name' }})
     @example = Micronaut::Example.new(behaviour, 'description', {}, (lambda {}))
   end
-  
+    
   describe "attr readers" do
   
     it "should have one for the parent behaviour" do
@@ -24,7 +24,7 @@ describe Micronaut::Example, :parent_metadata => 'sample' do
     it "should have one for it's block" do
       @example.should respond_to(:example_block)
     end
-
+  
   end
   
   describe '#inspect' do
@@ -44,11 +44,11 @@ describe Micronaut::Example, :parent_metadata => 'sample' do
   end
   
   describe "accessing metadata within a running example" do
-
+  
     it "should have a reference to itself when running" do
       running_example.description.should == "should have a reference to itself when running"
     end
-
+  
     it "should be able to access the behaviours top level metadata as if it were its own" do
       running_example.behaviour.metadata.should include(:parent_metadata => 'sample')
       running_example.metadata.should include(:parent_metadata => 'sample')
@@ -59,10 +59,9 @@ describe Micronaut::Example, :parent_metadata => 'sample' do
   describe "#run" do
     
     pending "should run after(:each) when the example fails"
-
+  
     pending "should run after(:each) when the example raises an Exception" 
     
   end
   
-  
-end
+end

data/examples/lib/micronaut/formatters/base_formatter_example.rb

@@ -72,10 +72,6 @@ describe Micronaut::Formatters::BaseFormatter do
     @formatter.should have_interface_for(:add_behaviour).with(1).argument
   end
 
-  it "should have example_started as an interface with one argument" do
-    @formatter.should have_interface_for(:example_started).with(1).argument
-  end
-
   it "should have example_finished as an interface with one argument" do
     @formatter.should have_interface_for(:example_finished).with(1).arguments
   end

data/examples/lib/micronaut/mocha_example.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../example_helper")
+
+describe "Mocha Regression involving double reporting of errors" do
+  
+  it "should not double report mocha errors" do
+    # The below example should have one error, not two
+    # I'm also not sure how to test this regression without having the failure counting by 
+    # the running Micronaut instance
+    formatter = Micronaut::Formatters::BaseFormatter.new
+
+    use_formatter(formatter) do
+
+      isolate_behaviour do
+        desc = Micronaut::Behaviour.describe("my favorite pony") do
+          example("showing a double fail") do
+            foo = "string"
+            foo.expects(:something)
+          end
+        end      
+        desc.examples_to_run.replace(desc.examples)
+        desc.run(formatter)
+      end
+
+    end
+
+    formatter.examples.size.should == 1  
+  end
+
+end

data/lib/micronaut/configuration.rb

@@ -100,7 +100,7 @@ module Micronaut
     def formatter
       @formatter ||= @formatter_to_use.new
     end
-    
+        
     # Where does output go? For now $stdout
     def output
       $stdout

data/lib/micronaut/example.rb

@@ -22,7 +22,6 @@ module Micronaut
     
     def run_started
       record_results :started_at => Time.now
-      Micronaut.configuration.formatter.example_started(self)
     end
 
     def run_passed
@@ -56,15 +55,6 @@ module Micronaut
       @behaviour_instance._teardown_mocks if @behaviour_instance.respond_to?(:_teardown_mocks)
     end
 
-    def run_example
-      if example_block
-        @behaviour_instance.instance_eval(&example_block)
-        run_passed
-      else
-        run_pending
-      end
-    end
-
     def run(behaviour_instance)
       @behaviour_instance = behaviour_instance
       @behaviour_instance.running_example = self
@@ -76,7 +66,7 @@ module Micronaut
       
       begin
         run_before_each
-        run_example
+        @behaviour_instance.instance_eval(&example_block) if example_block
       rescue Exception => e
         exception_encountered = e
         all_systems_nominal = false
@@ -90,8 +80,12 @@ module Micronaut
       ensure
         @behaviour_instance.running_example = nil
       end
-
-      run_failed(exception_encountered) if exception_encountered
+      
+      if exception_encountered
+        run_failed(exception_encountered) 
+      else
+        example_block ? run_passed : run_pending
+      end
 
       all_systems_nominal
     end

data/lib/micronaut/formatters/base_formatter.rb

@@ -54,9 +54,6 @@ module Micronaut
         @example_count = example_count
       end
 
-      def example_started(example)
-      end
-
       def example_finished(example)
         examples << example
       end
@@ -111,7 +108,7 @@ module Micronaut
       end
       
       def read_failed_line(exception, example)
-        original_file = example.behaviour.file_path.downcase
+        original_file = example.behaviour.file_path.to_s.downcase
         matching_line = exception.backtrace.detect { |line| line.split(':').first.downcase == original_file.downcase }
 
         return "Unable to find matching line from backtrace" if matching_line.nil?

data/lib/micronaut/mocking/with_mocha.rb

@@ -5,9 +5,11 @@ module Micronaut
   module Mocking
     module WithMocha
       include Mocha::Standalone
+
       alias :_setup_mocks :mocha_setup
       alias :_verify_mocks :mocha_verify
-      alias :_teardown_mocks :mocha_teardown      
+      alias :_teardown_mocks :mocha_teardown
+        
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.7
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-10 00:00:00 -07:00
+date: 2009-03-27 00:00:00 -07:00
 default_executable: micronaut
 dependencies: []
 
@@ -108,6 +108,7 @@ files:
 - examples/lib/micronaut/matchers/satisfy_example.rb
 - examples/lib/micronaut/matchers/simple_matcher_example.rb
 - examples/lib/micronaut/matchers/throw_symbol_example.rb
+- examples/lib/micronaut/mocha_example.rb
 - examples/lib/micronaut/runner_example.rb
 - examples/lib/micronaut/world_example.rb
 - examples/lib/micronaut_example.rb