MacSpec 0.3.3 → 0.4.0

data/MacSpec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{MacSpec}
-  s.version = "0.3.3"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthias Hennemeyer"]
-  s.date = %q{2010-03-03}
+  s.date = %q{2010-03-07}
   s.description = %q{MacSpec is a feature minimal RSpec clone that is specifically built to work with MacRuby.}
   s.email = %q{mhennemeyer@me.com}
   s.extra_rdoc_files = [

data/README.rdoc

@@ -19,7 +19,8 @@ $sudo macgem install MacSpec
 == Use
 
 
-For Starters: 
+For Starters:
+
 Create a brandnew  MacRuby Application with the Xcode template that ships with MacRuby.
 (Btw Have you installed MacRuby-0.5 already? http://www.macruby.org/downloads.html )
 
@@ -55,7 +56,8 @@ replace the content with:
       end
     end
   end
-
+  
+Now set the active target to 'Unit Tests' and hit Cmd-B.
 
 
 == Philosophy

data/lib/mac_spec/mocking_framework/extensions/object_extension.rb

@@ -12,8 +12,6 @@ module MacSpec
         message_expectation = MacSpec::MockingFramework::MessageExpectation.new(options)
         @__macspec__message_expectations << message_expectation
         return message_expectation
-        # @__macspec__mock ||= MacSpec::MockingFramework::Mock.new(self.to_s, :belongs_to => self)
-        # __macspec__proxy_service(@__macspec__mock.__add_positive_message_expectation(msg))
       end
 
       def should_not_receive(msg)

data/lib/mac_spec/mocking_framework/message_expectation.rb

@@ -31,7 +31,7 @@ module MacSpec
           # 
         end
         MessageExpectation.register_for_verification(@receiver)
-        @return_value = {}
+        @return_value = {:__macspec_anyargs => true}
         @received = {}
         @args_expectation = :__macspec_anyargs
       end
@@ -59,6 +59,7 @@ module MacSpec
           @return_value.each do |args,value|
             args_string = (args == :__macspec_anyargs) ? "Any Args" : args.inspect
             if (@received[args] && @positive) || (!@received[args] && !@positive)
+              
               MacSpec.assert(true)
             elsif (!@received[args] && @positive)
               received_with_args_string = if !@received.keys.include?(:__macspec_anyargs) 

data/lib/mac_spec/testing_framework/core/kernel_extension.rb

@@ -16,6 +16,7 @@ module Kernel
     end
     cls.teardown_chained = lambda {MacSpec::MockingFramework::MessageExpectation.verify}
     cls.macspec_superclass = super_class
+    MacSpec.add_test_case(cls)
     cls.class_eval(&block)
     cls.testcases.each do |testcase|
       for test in cls.all_tests.reject {|t| testcase.own_tests.include?(t)}

data/lib/mac_spec/testing_framework/core/test_case_class_methods.rb

@@ -56,19 +56,16 @@ module MacSpec
 
       # == Define a TestCase.
       def describe desc, &block
-        cls = Class.new(macspec_superclass)
-        mods = self.ancestors.reject {|m| Module === m }
+        cls = Class.new(self.macspec_superclass)
         Object.const_set(self.name + desc.to_s.split(/\W+/).map { |s| s.capitalize }.join, cls)
         cls.setup_chained = self.setup_chained
         cls.teardown_chained = self.teardown_chained
         cls.macspec_superclass = self.macspec_superclass
         cls.desc = self.desc + " " + desc
-        cls.tests($1.constantize) if defined?(Rails) && 
-          self.name =~ /^(.*(Controller|Helper|Mailer))Test/ && 
-            self < ActiveSupport::TestCase
         mods = self.ancestors.select {|m| m.class.to_s == "Module" }
         orig_block = block
-        block = lambda {include *mods; instance_eval(&orig_block)} 
+        block = lambda {include *mods; instance_eval(&orig_block)}
+        MacSpec.add_test_case(cls) 
         cls.class_eval(&block)
         self.testcases << cls
       end
@@ -79,12 +76,23 @@ module MacSpec
         desc = MacSpec::TestingFramework::Functions.make_constantizeable(desc)
         if block_given?
           test = "test_#{desc.gsub(/\W+/, '_').downcase}"
-          define_method(test, &lambda {$current_spec = self; instance_eval(&block)})
+          define_method(test, &lambda {instance_eval(&block)})
           (@@_tests ||= []) << test.to_sym
           (@own_tests ||= []) << test.to_sym
         end
         self.teardown {}
+        test.to_sym
       end
+      
+      # == prepend 'f' to focus on a test
+      def fit desc, &block
+        MacSpec.add_focused_test(self, self.it(desc, &block).to_sym)
+      end
+      
+      # == prepend 'x' to ignore a test
+      def xit *whatever
+      end
+      
     end # TestCaseClassMethods
   end
 end # MacSpec

data/lib/mac_spec/version.rb

@@ -1,3 +1,3 @@
 module MacSpec
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/lib/macspec.rb

@@ -22,6 +22,23 @@ module MacSpec
       @current_test_case = tc
     end
     
+    def add_test_case(tc)
+      (@test_cases ||= []) << tc
+    end
+    
+    def test_cases
+      @test_cases
+    end
+    
+    def add_focused_test(tc,fit)
+      @focused_tests ||= {}
+      (@focused_tests[tc] ||= []) << fit
+    end
+    
+    def focused_tests
+      @focused_tests
+    end
+    
     def assertions_module
       MiniTest::Assertions
     end
@@ -35,11 +52,55 @@ module MacSpec
     end
   end
 end
+
+# This MonkeyPatch is here, because MacRuby fails to really ignore methods that have
+# been removed or undefined. The following code snippet will put out *true* with MacRuby 
+# and *false* with other Ruby versions:
+#
+#      class A
+#        def meth  
+#        end
+#      end
+#      
+#      A.send(:remove_method, :meth)
+#      puts A.new.methods.include?(:meth)
+#
+# 
+MiniTest::Unit::TestCase.class_eval do
+  def self.test_methods
+    methods = public_instance_methods(true).select{|m|method_defined?(m)}.grep(/^test/).map { |m|
+      m.to_s
+    }.sort
+
+    if self.test_order == :random then
+      max = methods.size
+      methods = methods.sort_by { rand(max) }
+    end
+
+    methods
+  end
+end
+
 MiniTest::Unit.autorun unless defined?(MacSpecNoAutoRun)
 require 'mac_spec/version'
 require 'mac_spec/matcher_system'
 require 'mac_spec/testing_framework'
 require 'mac_spec/mocking_framework'
+
+at_exit do
+  if MacSpec.focused_tests
+    MacSpec.test_cases.each do |testcase|
+      for test in testcase.own_tests
+        unless MacSpec.focused_tests[testcase] && MacSpec.focused_tests[testcase].include?(test)
+          while(testcase.send(:method_defined?, test))
+            testcase.send(:undef_method, test) if testcase.send(:method_defined?, test)
+          end
+        end
+      end
+    end
+  end
+end
+
 unless defined?(LOADED)
   # Track the current testcase and 
   # provide it to the operator matchers and mocking framework.
@@ -47,9 +108,9 @@ unless defined?(LOADED)
   # todo no global
   MacSpec.test_case_class.class_eval do
     alias_method :old_run_method_aliased_by_macspec, :run
-    def run(whatever, *args, &block)
+    def run(runner, *args, &block)
       MacSpec.current_test_case = self
-      old_run_method_aliased_by_macspec(whatever, *args, &block)
+      old_run_method_aliased_by_macspec(runner, *args, &block)
     end
   end
   LOADED = true

data/test/mac_spec/testing_framework/regression/inherit_not_double_test.rb

@@ -7,7 +7,7 @@ describe "Prevent tests from beeing handed down" do
   
   $testcase = self
   it "does not inherit tests" do
-    $testcase.instance_methods.should_not include(:test_test_it)
+    $testcase.method_defined?(:test_test_it).should be(false)
   end
   
   it "doesn't make testname unusable" do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 3
-  version: 0.3.3
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Matthias Hennemeyer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 +01:00
+date: 2010-03-07 00:00:00 +01:00
 default_executable: 
 dependencies: []