Merge remote-tracking branch 'origin' into fix/add_create_or_update_method_to_collection

Author: ecoologic

spec/live/target_spec.rb

@@ -12,6 +12,6 @@ def valid_attributes
 
  it_should_be_readable :targets, :create => :true
  it_should_be_creatable
- it_should_be_updatable :email, "bye@example.com"
+ it_should_be_updatable :active, false
  it_should_be_deletable
 end

spec/live/user_spec.rb

@@ -2,7 +2,7 @@
 
 describe ZendeskAPI::User, :delete_after do
  def valid_attributes
- { :name => "Test U.", :email => "test@example.org" }
+ { name: "Test U.", email: "test+#{Time.now.to_i}@example.org" }
  end
 
  it_should_be_creatable

spec/macros/resource_macros.rb

@@ -37,6 +37,8 @@ def it_should_be_creatable(options = {})
  end
 
  after(:all) do
+ return unless @object.id
+
  VCR.use_cassette("#{described_class.to_s}_create_delete") do
  @object.destroy
  end
@@ -78,6 +80,8 @@ def it_should_be_updatable(attribute, value = "TESTDATA", extra = {})
  end
 
  after(:all) do
+ return unless @object.id
+
  VCR.use_cassette("#{described_class.to_s}_update_delete") do
  @object.destroy
  end