@@ -47,17 +47,37 @@ def build_provider(resource)
     # Determine the appropriate provider for the given resource, then
     # execute it.
     def run_action(resource, action, delayed_actions)
+      # Check if this resource has an only_if block -- if it does,
+      # evaluate the only_if block and skip the resource if
+      # appropriate.
+      if resource.only_if
+        unless Chef::Mixin::Command.only_if(resource.only_if, resource.only_if_args)
+          Chef::Log.debug("Skipping #{resource} due to only_if")
+          return
+        end
+      end
+
+      # Check if this resource has a not_if block -- if it does,
+      # evaluate the not_if block and skip the resource if
+      # appropriate.
+      if resource.not_if
+        unless Chef::Mixin::Command.not_if(resource.not_if, resource.not_if_args)
+          Chef::Log.debug("Skipping #{resource} due to not_if")
+          return
+        end
+      end
+
       provider = build_provider(resource)
       provider.send("action_#{action}")
-      
+
       # Execute any immediate and queue up any delayed notifications
       # associated with the resource.
       if resource.updated
         resource.notifies_immediate.each do |notify|
           Chef::Log.info("#{resource} sending #{notify.action} action to #{notify.resource} (immediate)")
           run_action(notify.resource, notify.action, delayed_actions)
         end
-        
+
         resource.notifies_delayed.each do |notify|
           unless delayed_actions.include?(notify)
             delayed_actions << notify
@@ -83,26 +103,6 @@ def converge
         begin
           Chef::Log.debug("Processing #{resource} on #{run_context.node.name}")
 
-          # Check if this resource has an only_if block -- if it does,
-          # evaluate the only_if block and skip the resource if
-          # appropriate.
-          if resource.only_if
-            unless Chef::Mixin::Command.only_if(resource.only_if, resource.only_if_args)
-              Chef::Log.debug("Skipping #{resource} due to only_if")
-              next
-            end
-          end
-          
-          # Check if this resource has a not_if block -- if it does,
-          # evaluate the not_if block and skip the resource if
-          # appropriate.
-          if resource.not_if
-            unless Chef::Mixin::Command.not_if(resource.not_if, resource.not_if_args)
-              Chef::Log.debug("Skipping #{resource} due to not_if")
-              next
-            end
-          end
-          
           # Execute each of this resource's actions.
           action_list = resource.action.kind_of?(Array) ? resource.action : [ resource.action ]
           action_list.each do |action|
 
@@ -179,6 +179,17 @@ def new_runner
     provider.should_receive(:action_pur).once.ordered
     @runner.converge
   end
-  
+
+  it "should check a resource's only_if and not_if if notified by another resource" do
+    provider = Chef::Provider::SnakeOil.new(@run_context.resource_collection[0], @run_context)
+    @run_context.resource_collection[0].action = :nothing
+    @run_context.resource_collection << Chef::Resource::Cat.new("carmel", @run_context)
+    @run_context.resource_collection[1].notifies :buy, @run_context.resource_collection[0], :delayed
+    @run_context.resource_collection[1].updated = true
+    # hits only_if first time when the resource is run in order, second on notify
+    @run_context.resource_collection[0].should_receive(:only_if).exactly(2).times.and_return(nil)
+    @run_context.resource_collection[0].should_receive(:not_if).exactly(2).times.and_return(nil)
+    @runner.converge
+  end
 
 end