zendesk2 1.2.7 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbedbdbd2cc1fb5d7181d274138df03c74caf78a
-  data.tar.gz: d1b795649c0ecc16cf9142bc7c527b9f9048c81c
+  metadata.gz: be50d350e9c25fc106b0bc4155ee76d24ebce43a
+  data.tar.gz: dda78a4ca0bae941f2c1357a0d443ff50ecc06e1
 SHA512:
-  metadata.gz: 93400647817f08b86d3322a4dc24282bd5b0ce04218cb8d3e782da177d84312f552ca85eeccb020ea5b71fa419dbc96bfb8ed4ed6ed32bef42d41f52ed912e20
-  data.tar.gz: 7864462a046770514e143cf51d0ba2af739c21c968e327523087445ab3af25a70e5d198fbb7bbf5ea7372bb35bcf21745887d812610be29ba61b00b83e0fbc79
+  metadata.gz: c8e5ebae513b256ed1fc3f55851f8ad572753dce377b68fca8009376f1ab65cc73ba1aae3e4684d0523bf1e1bc900eadd741117de802931643a967357d0100ba
+  data.tar.gz: 39641e3dc44246592f5e980da926c5a69b754f0d51fb5d6c8497878d6b1475e93bd5a91fd10856660538e33c29df4e098dac6e65a93e44cca1824e3bc3d9b8fa

data/lib/zendesk2/client/mock.rb

@@ -30,6 +30,7 @@ class Zendesk2::Client < Cistern::Service
     def self.new_id
       @current_id ||= 0
       @current_id += 1
+      @current_id.to_s
     end
 
     def data
@@ -136,13 +137,18 @@ class Zendesk2::Client < Cistern::Service
     end
 
     def find!(collection, identity, options={})
-      if resource = self.data[collection][identity]
+      if resource = self.data[collection][identity.to_s]
         resource
       else
         error!(options[:error] || :not_found)
       end
     end
 
+    def delete!(collection, identity, options={})
+      self.data[collection].delete(identity.to_s) ||
+        error!(options[:error] || :not_found)
+    end
+
     def error!(type, options={})
       status, body = self.class.error_map[type]
       body.merge!("details" => options[:details]) if options[:details]

data/lib/zendesk2/client/models/ticket.rb

@@ -67,7 +67,7 @@ class Zendesk2::Client::Ticket < Zendesk2::Model
     data = if new_record?
              requires :subject, :description
 
-             with_requester = @requester && Zendesk2.stringify_keys(@requester)
+             with_requester = (@requester || nil) && Zendesk2.stringify_keys(@requester)
 
              connection.create_ticket(params.merge("requester" => with_requester)).body["ticket"]
            else

data/lib/zendesk2/client/requests/create_category.rb

@@ -20,7 +20,7 @@ class Zendesk2::Client
         "updated_at" => Time.now.iso8601,
       }.merge(params)
 
-      self.data[:categories][identity]= record
+      self.data[:categories][identity] = record
 
       response(
         :method => :post,

data/lib/zendesk2/client/requests/create_ticket.rb

@@ -19,6 +19,8 @@ class Zendesk2::Client
         error!(:invalid, :details => {"base" => [{"description" => "Description: cannot be blank"}]})
       end
 
+      requester_id = params.delete('requester_id')
+
       if requester = params.delete('requester')
         if !requester['name'] || requester['name'].size < 1
           response(
@@ -41,7 +43,7 @@ class Zendesk2::Client
                   else
                     # name is not required in this case
                     create_user(requester).body["user"]["id"]
-                  end
+                  end.to_s
 
         params['requester_id'] = user_id
       end
@@ -49,15 +51,15 @@ class Zendesk2::Client
       requested_custom_fields = (params.delete("custom_fields") || [])
 
       custom_fields = requested_custom_fields.map do |cf|
-        field_id = cf["id"].to_i
+        field_id = cf["id"].to_s
         if self.data[:ticket_fields][field_id]
           {"id" => field_id, "value" => cf["value"] }
         end
       end.compact
 
       self.data[:ticket_fields].each do |field_id, field|
-        requested_custom_fields.find { |cf| cf["id"] == field_id } ||
-          custom_fields << {"id" => field_id, "value" => nil }
+        requested_custom_fields.find { |cf| cf["id"] == field_id.to_s } ||
+          custom_fields << {"id" => field_id.to_s, "value" => nil }
       end
 
       record = {
@@ -70,11 +72,11 @@ class Zendesk2::Client
         "custom_fields"    => custom_fields,
       }.merge(params)
 
-      record["requester_id"] ||= current_user["id"]
-      record["submitter_id"] = current_user["id"]
+      record["requester_id"] ||= (requester_id && requester_id.to_s) || current_user["id"].to_s
+      record["submitter_id"] = current_user["id"].to_s
 
       # FIXME: throw error if user doesn't exist?
-      requester = self.data[:users][record["requester_id"]]
+      requester = self.find!(:users, record["requester_id"])
       record["organization_id"] = requester["organization_id"]
 
       self.data[:tickets][identity] = record

data/lib/zendesk2/client/requests/create_user.rb

@@ -33,7 +33,7 @@ class Zendesk2::Client
                 "description" => "Email: #{email} is already being used by another user"
               }]})
       else
-        user_identity_id = self.class.new_id # ugh
+        user_identity_id = self.class.new_id
 
         user_identity = {
           "id"         => user_identity_id,

data/lib/zendesk2/client/requests/create_user_identity.rb

@@ -16,7 +16,7 @@ class Zendesk2::Client
       params = Cistern::Hash.stringify_keys(params)
 
       identity = self.class.new_id
-      user_id  = params["user_id"]
+      user_id  = params.delete("user_id").to_s
 
       record = {
         "id"         => identity,
@@ -25,6 +25,7 @@ class Zendesk2::Client
         "updated_at" => Time.now.iso8601,
         "verified"   => false,
         "primary"    => false,
+        "user_id"    => user_id,
       }.merge(params)
 
       record.merge("primary" => true) if self.data[:identities].values.find { |ui| ui["user_id"] == user_id }.nil?

data/lib/zendesk2/client/requests/destroy_category.rb

@@ -13,7 +13,7 @@ class Zendesk2::Client
   class Mock
     def destroy_category(params={})
       id   = params["id"]
-      body = self.data[:categories].delete(id)
+      body = self.delete!(:categories, id)
 
       response(
         :method => :delete,

data/lib/zendesk2/client/requests/destroy_forum.rb

@@ -15,7 +15,8 @@ class Zendesk2::Client
       id   = params["id"]
       path = "/forums/#{id}.json"
 
-      body = self.data[:forums].delete(id)
+      body = self.delete!(:forums, id)
+
       response(
         :method => :delete,
         :path   => path,

data/lib/zendesk2/client/requests/destroy_group.rb

@@ -13,8 +13,7 @@ class Zendesk2::Client
   class Mock
     def destroy_group(params={})
       id   = params["id"]
-      body = self.data[:groups][id]
-      body["deleted"] = true
+      body = self.find!(:groups, id).merge!("deleted" => true)
 
       response(
         :method => :delete,

data/lib/zendesk2/client/requests/destroy_membership.rb

@@ -14,7 +14,8 @@ class Zendesk2::Client
     def destroy_membership(params={})
       id   = params["id"]
 
-      body = self.data[:memberships].delete(id)
+      body = self.delete!(:memberships, id)
+
       response(
         :method => :delete,
         :path   => "/organization_memberships/#{id}.json",

data/lib/zendesk2/client/requests/destroy_organization.rb

@@ -12,8 +12,8 @@ class Zendesk2::Client
 
   class Mock
     def destroy_organization(params={})
-      id   = params["id"]
-      body = self.data[:organizations].delete(id)
+      id = require_parameters(params, "id")
+      body = self.delete!(:organizations, id)
 
       response(
         :method => :delete,

data/lib/zendesk2/client/requests/destroy_ticket.rb

@@ -13,7 +13,7 @@ class Zendesk2::Client
   class Mock
     def destroy_ticket(params={})
       id   = params["id"]
-      body = self.data[:tickets].delete(id)
+      body = self.delete!(:tickets, id)
 
       response(
         :method => :delete,

data/lib/zendesk2/client/requests/destroy_ticket_field.rb

@@ -13,7 +13,7 @@ class Zendesk2::Client
   class Mock
     def destroy_ticket_field(params={})
       id   = params["id"]
-      body = self.data[:ticket_fields].delete(id)
+      body = self.delete!(:ticket_fields, id)
 
       response(
         :method => :delete,

data/lib/zendesk2/client/requests/destroy_topic.rb

@@ -15,7 +15,8 @@ class Zendesk2::Client
       id   = params["id"]
       path = "/topics/#{id}.json"
 
-      body = self.data[:topics].delete(id)
+      body = self.delete!(:topics, id)
+
       response(
         :method => :delete,
         :path   => path,

data/lib/zendesk2/client/requests/destroy_topic_comment.rb

@@ -17,7 +17,8 @@ class Zendesk2::Client
       topic_id = params["topic_id"]
       path     = "/topics/#{topic_id}/comments/#{id}.json"
 
-      body = self.data[:topic_comments].delete(id)
+      body = self.delete!(:topic_comments, id)
+
       response(
         :method => :delete,
         :path   => path,

data/lib/zendesk2/client/requests/destroy_user.rb

@@ -12,17 +12,15 @@ class Zendesk2::Client
 
   class Mock
     def destroy_user(params={})
-      id   = params["id"]
+      id   = params["id"].to_s
       path = "/users/#{id}.json"
 
-      tickets = self.data[:tickets].values.select{|t| t["requester_id"] == id}.size
-
-      find!(:users, id)
+      tickets = self.data[:tickets].values.select { |t| t["requester_id"] == id }.size
 
       if tickets < 1
         self.data[:identities].each { |k,v| self.data[:identities].delete(k) if v["user_id"] == id }
 
-        body = self.data[:users].delete(id)
+        body = self.delete!(:users, id)
 
         response(
           :method => :delete,

data/lib/zendesk2/client/requests/destroy_user_field.rb

@@ -13,7 +13,7 @@ class Zendesk2::Client
   class Mock
     def destroy_user_field(params={})
       id   = params["id"]
-      body = self.data[:user_fields].delete(id)
+      body = self.delete!(:user_fields, id)
 
       response(
         :method => :delete,

data/lib/zendesk2/client/requests/destroy_user_identity.rb

@@ -13,12 +13,12 @@ class Zendesk2::Client
 
   class Mock
     def destroy_user_identity(params={})
-      id      = params["id"]
-      user_id = params["user_id"]
+      id      = params["id"].to_s
+      user_id = params["user_id"].to_s
       path    = "/users/#{user_id}/identities/#{id}.json"
 
-      user_identity = self.data[:identities][id]
-      body = self.data[:identities].delete(id)
+      body = self.delete!(:identities, id)
+
       response(
         :method => :delete,
         :path   => path,

data/lib/zendesk2/client/requests/get_forum.rb

@@ -13,7 +13,7 @@ class Zendesk2::Client
   class Mock
     def get_forum(params={})
       id   = params["id"]
-      body = self.data[:forums][id]
+      body = self.find!(:forums, id)
 
       response(
         :path  => "/forums/#{id}.json",

data/lib/zendesk2/client/requests/get_help_center_article.rb

@@ -33,7 +33,7 @@ class Zendesk2::Client
       response(
         :path => path,
         :body => {
-          "article" => self.find!(:help_center_articles, id.to_i)
+          "article" => self.find!(:help_center_articles, id)
         },
       )
     end

data/lib/zendesk2/client/requests/get_help_center_category.rb

@@ -33,7 +33,7 @@ class Zendesk2::Client
       response(
         :path => path,
         :body => {
-          "category" => self.find!(:help_center_categories, id.to_i)
+          "category" => self.find!(:help_center_categories, id)
         },
       )
     end

data/lib/zendesk2/client/requests/get_help_center_section.rb

@@ -33,7 +33,7 @@ class Zendesk2::Client
       response(
         :path => path,
         :body => {
-          "section" => self.find!(:help_center_sections, id.to_i)
+          "section" => self.find!(:help_center_sections, id)
         },
       )
     end

data/lib/zendesk2/client/requests/get_organization_by_external_id.rb

@@ -3,7 +3,7 @@ class Zendesk2::Client
     def get_organization_by_external_id(external_id)
       request(
         :method => :get,
-        :params => {external_id: external_id},
+        :params => { external_id: external_id },
         :path   => "/organizations/search.json",
       )
     end
@@ -13,7 +13,7 @@ class Zendesk2::Client
     def get_organization_by_external_id(external_id)
       collection = self.data[:organizations]
 
-      results = collection.select{|k,v| v["external_id"] == external_id}.values
+      results = collection.select { |k,v| v["external_id"].to_s == external_id.to_s }.values
 
       response(
         :path => "/organizations/search.json",

data/lib/zendesk2/client/requests/get_requested_tickets.rb

@@ -14,9 +14,9 @@ class Zendesk2::Client
 
   class Mock
     def get_requested_tickets(params={})
-      id = params["id"]
+      id = params["id"].to_s
 
-      page(params, :tickets, "/requesteds/#{id}/tickets.json", "tickets", filter: lambda{|c| c.select{|u| u["requester_id"] == id}})
+      page(params, :tickets, "/requesteds/#{id}/tickets.json", "tickets", filter: lambda { |c| c.select { |u| u["requester_id"] == id } })
     end
   end # Mock
 end

data/lib/zendesk2/client/requests/get_topic.rb

@@ -13,7 +13,7 @@ class Zendesk2::Client
   class Mock
     def get_topic(params={})
       id   = params["id"]
-      body = self.data[:topics][id]
+      body = self.find!(:topics, id)
 
       response(
         :path  => "/topics/#{id}.json",

data/lib/zendesk2/client/requests/get_user.rb

@@ -12,17 +12,21 @@ class Zendesk2::Client
 
   class Mock
     def get_user(params={})
-      id = require_parameters(params, "id").to_i
+      id = require_parameters(params, "id")
 
-      identities = self.data[:identities].values.select { |i| i["user_id"] == id }
-      identity = identities.find { |i| i["type"] == "email" && i["primary"] } || identities.find { |i| i["type"] == "email" }
+      identities = self.data[:identities].values.select { |i| i["user_id"] == id.to_s }
+      body = find!(:users, id).dup
+
+      if identity = identities.find { |i| i["type"] == "email" && i["primary"] } || identities.find { |i| i["type"] == "email" }
+        body.merge!("email" => identity["value"])
+      end
 
       # @todo what happens if no identity?
 
       response(
         :path  => "/users/#{id}.json",
         :body  => {
-          "user" => find!(:users, id).merge("email" => identity["value"]),
+          "user" => body,
         },
       )
     end

data/lib/zendesk2/client/requests/get_user_identities.rb

@@ -16,7 +16,7 @@ class Zendesk2::Client
     def get_user_identities(params={})
       user_id = require_parameters(params, "user_id")
 
-      page(params, :identities, "/users/#{user_id}/identities.json", "identities", filter: lambda { |c| c.select { |a| a["user_id"] == user_id } })
+      page(params, :identities, "/users/#{user_id}/identities.json", "identities", filter: lambda { |c| c.select { |a| a["user_id"].to_s == user_id.to_s } })
     end
   end # Mock
 end

data/lib/zendesk2/client/requests/mark_user_identity_primary.rb

@@ -13,8 +13,8 @@ class Zendesk2::Client
   end
   class Mock
     def mark_user_identity_primary(params={})
-      id      = params.delete("id")
-      user_id = params.delete("user_id")
+      id      = params.delete("id").to_s
+      user_id = params.delete("user_id").to_s
       path    = "/users/#{user_id}/identities/#{id}/make_primary.json"
 
       user_identity = self.find!(:identities, id)

data/lib/zendesk2/client/requests/search_user.rb

@@ -19,7 +19,7 @@ class Zendesk2::Client
 
       # allow searching by organization name
       collection = collection.map do |user|
-        if organization = self.data[:organizations][user["organization_id"]]
+        if organization = self.data[:organizations][user["organization_id"].to_s]
           user.merge("organization" => organization["name"])
         else
           user

data/lib/zendesk2/client/requests/update_category.rb

@@ -15,7 +15,7 @@ class Zendesk2::Client
   class Mock
     def update_category(params={})
       id   = params.delete("id")
-      body = self.data[:categories][id].merge!(params)
+      body = self.find!(:categories, id).merge!(params)
 
       response(
         :method => :put,

data/lib/zendesk2/client/requests/update_forum.rb

@@ -17,7 +17,8 @@ class Zendesk2::Client
       id   = params.delete("id")
       path = "/forums/#{id}.json"
 
-      body = self.data[:forums][id].merge!(params)
+      body = self.find!(:forums, id).merge!(params)
+
       response(
         :method => :put,
         :path   => path,

data/lib/zendesk2/client/requests/update_help_center_article.rb

@@ -34,7 +34,7 @@ class Zendesk2::Client
                "/help_center/articles/#{id}.json"
              end
 
-      body = self.data[:help_center_articles][id.to_i].merge!(params)
+      body = self.find!(:help_center_articles, id).merge!(params)
 
       response(
         :method => :put,

data/lib/zendesk2/client/requests/update_help_center_category.rb

@@ -25,7 +25,7 @@ class Zendesk2::Client
 
       require_parameters(params, "id")
 
-      id     = params.delete("id")
+      id     = params.delete("id").to_s
       locale = params["locale"]
 
       path = if locale
@@ -34,7 +34,7 @@ class Zendesk2::Client
                "/help_center/categories/#{id}.json"
              end
 
-      body = self.data[:help_center_categories][id.to_i].merge!(params)
+      body = self.find!(:help_center_categories, id).merge!(params)
 
       response(
         :method => :put,

data/lib/zendesk2/client/requests/update_help_center_section.rb

@@ -25,7 +25,7 @@ class Zendesk2::Client
 
       require_parameters(params, "id")
 
-      id     = params.delete("id")
+      id     = params.delete("id").to_s
       locale = params["locale"]
 
       path = if locale
@@ -34,7 +34,7 @@ class Zendesk2::Client
                "/help_center/sections/#{id}.json"
              end
 
-      body = self.data[:help_center_sections][id.to_i].merge!(params)
+      body = self.find!(:help_center_sections, id).merge!(params)
 
       response(
         :method => :put,

data/lib/zendesk2/client/requests/update_organization.rb

@@ -20,7 +20,7 @@ class Zendesk2::Client
       organization = self.find!(:organizations, id)
 
       other_organizations = self.data[:organizations].dup
-      other_organizations.delete(id)
+      other_organizations.delete(id.to_s)
 
       if other_organizations.values.find { |o| o["name"] == params["name"] }
         error!(:invalid, details: {"name" => [ { "description" => "Name: has already been taken" } ]})

data/lib/zendesk2/client/requests/update_ticket.rb

@@ -15,7 +15,7 @@ class Zendesk2::Client
   class Mock
     def update_ticket(params={})
       ticket_id = params.delete("id")
-      body      = self.data[:tickets][ticket_id].merge!(params)
+      body      = self.find!(:tickets, ticket_id).merge!(params)
 
       if comment = params["comment"]
         comment_id = self.class.new_id

data/lib/zendesk2/client/requests/update_ticket_field.rb

@@ -14,12 +14,12 @@ class Zendesk2::Client
   end
   class Mock
     def update_ticket_field(params={})
-      ticket_field_id = params.delete("id")
-      body            = self.data[:ticket_fields][ticket_field_id].merge!(params)
+      id   = params.delete("id")
+      body = self.find!(:ticket_fields, id).merge!(params)
 
       response(
         :method => :put,
-        :path   => "/ticket_fields/#{ticket_field_id}.json",
+        :path   => "/ticket_fields/#{id}.json",
         :body   => {
           "ticket_field" => body
         },

data/lib/zendesk2/client/requests/update_topic.rb

@@ -17,7 +17,8 @@ class Zendesk2::Client
       id   = params.delete("id")
       path = "/topics/#{id}.json"
 
-      body = self.data[:topics][id].merge!(params)
+      body = self.find!(:topics, id).merge!(params)
+
       response(
         :method => :put,
         :path   => path,

data/lib/zendesk2/client/requests/update_user.rb

@@ -1,7 +1,8 @@
 class Zendesk2::Client
   class Real
-    def update_user(params={})
-      id = params.delete("id")
+    def update_user(_params={})
+      params = Cistern::Hash.stringify_keys(_params)
+      id     = params.delete("id")
 
       request(
         :method => :put,
@@ -15,7 +16,7 @@ class Zendesk2::Client
   class Mock
     def update_user(_params={})
       params  = Cistern::Hash.stringify_keys(_params)
-      user_id = params.delete("id")
+      user_id = params.delete("id").to_s
       path    = "/users/#{user_id}.json"
 
       email = params["email"]
@@ -57,7 +58,7 @@ class Zendesk2::Client
         self.data[:identities][user_identity_id] = user_identity
       end
 
-      body = self.data[:users][user_id].merge!(params)
+      body = self.find!(:users, user_id).merge!(params)
 
       response(
         :method => :put,

data/lib/zendesk2/client/requests/update_user_identity.rb

@@ -16,11 +16,11 @@ class Zendesk2::Client
   end
   class Mock
     def update_user_identity(params={})
-      id      = params.delete("id")
-      user_id = params.delete("user_id")
+      id      = params.delete("id").to_s
+      user_id = params.delete("user_id").to_s
       path    = "/users/#{user_id}/identities/#{id}.json"
 
-      body = self.data[:identities][id].merge!(Cistern::Hash.slice(params, "verified"))
+      body = self.find!(:identities, id).merge!(Cistern::Hash.slice(params, "verified"))
       response(
         :method => :put,
         :path   => path,

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.2.7"
+  VERSION = "1.2.9"
 end

data/spec/tickets_spec.rb

@@ -111,13 +111,13 @@ describe "Zendesk2::Client" do
 
     it "should be based on ticket_fields" do
       ticket = client.tickets.create!(subject: mock_uuid, description: mock_uuid)
-      custom_field = ticket.custom_fields.find { |cf| cf["id"] == ticket_field.identity }
+      custom_field = ticket.custom_fields.find { |cf| cf["id"].to_s == ticket_field.identity.to_s }
 
       expect(custom_field).not_to be_nil
       expect(custom_field["value"]).to be_nil
 
       ticket = client.tickets.create!(subject: mock_uuid, description: mock_uuid, custom_fields: [{"id" => ticket_field.identity, "value" => "jessicaspacekat"}])
-      custom_field = ticket.custom_fields.find { |cf| cf["id"] == ticket_field.identity }
+      custom_field = ticket.custom_fields.find { |cf| cf["id"].to_s == ticket_field.identity.to_s }
 
       expect(custom_field).not_to be_nil
       expect(custom_field["value"]).to eq("jessicaspacekat")

data/spec/users_spec.rb

@@ -16,12 +16,14 @@ describe "users" do
 
   describe "#create_user" do
     it "should prevent duplicate external_ids" do
-      client.create_user(email: mock_email, name: "a", external_id: nil) # fine
-      client.create_user(email: mock_email, name: "b", external_id: nil) # also fine
-      client.create_user(email: mock_email, name: "c", external_id: "1") # it's cool
+      external_id = mock_uuid
+
+      client.create_user(email: mock_email, name: "a", external_id: nil)         # fine
+      client.create_user(email: mock_email, name: "b", external_id: nil)         # also fine
+      client.create_user(email: mock_email, name: "c", external_id: external_id) # it's cool
 
       expect {
-        client.create_user(email:  mock_email, name: "d", external_id: "1")
+        client.create_user(email:  mock_email, name: "d", external_id: external_id)
       }.to raise_exception(Zendesk2::Error, /External has already been taken/)
     end
   end
@@ -31,11 +33,13 @@ describe "users" do
       user         = client.users.create(email: mock_email, name: "a")
       another_user = client.users.create(email: mock_email, name: "b")
 
-      client.update_user(id: user.id, external_id: nil)         # fine
-      client.update_user(id: another_user.id, external_id: "1") # also fine
+      external_id = mock_uuid
+
+      client.update_user(id: user.id, external_id: nil)                 # fine
+      client.update_user(id: another_user.id, external_id: external_id) # also fine
 
       expect {
-        client.update_user("id" => user.id, external_id: "1")
+        client.update_user("id" => user.id, external_id: external_id)
       }.to raise_exception(Zendesk2::Error, /External has already been taken/)
     end
   end
@@ -103,6 +107,7 @@ describe "users" do
       email = "ey+#{mock_uuid}@example.org"
 
       new_identity = user.identities.create!(type: "email", value: email)
+
       expect(new_identity.primary).to be_falsey
       expect(new_identity.verified).to be_falsey
       expect(new_identity.type).to eq("email")
@@ -115,11 +120,16 @@ describe "users" do
       initial_identity = user.identities.all.first
       new_identity     = user.identities.create!(type: "email", value: email)
 
-      initial_identity.destroy
+      expect {
+        initial_identity.destroy
+      }.to change { user.identities.all }.
+        from(a_collection_containing_exactly(initial_identity, new_identity)).
+        to(a_collection_containing_exactly(new_identity))
 
       expect(new_identity.reload.primary).to be_falsey
 
       new_identity.primary!
+
       expect(new_identity.reload.primary).to be_truthy
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.9
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -308,4 +308,3 @@ test_files:
 - spec/user_fields_spec.rb
 - spec/user_identities_spec.rb
 - spec/users_spec.rb
-has_rdoc: