cater for Organization field being marked for deletion

Author: fbvilela

spec/live/organization_field_spec.rb

@@ -8,5 +8,5 @@ def valid_attributes
   it_should_be_creatable
   it_should_be_updatable :title, "key"
   it_should_be_readable :organization_fields, :create => true
-  it_should_be_deletable
+  it_should_be_deletable :marked_for_deletion => true
 end

spec/macros/resource_macros.rb

@@ -110,7 +110,7 @@ def it_should_be_deletable(options = {})
           if options[:find]
             expect(obj.send(options[:find].first)).to eq(options[:find].last)
           else
-            expect(obj.nil? || !obj.active?).to eq(true)
+            options[:marked_for_deletion] ? (expect(obj.active?).to be_falsey) : (expect(obj).to be_nil)
           end
         end
       end