zendesk2 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6ea470972636be5e8e0d86bc3e98456a0a101ff
-  data.tar.gz: 8520078c62556e06b0fbd8f71e573816eb97cb45
+  metadata.gz: fbedbdbd2cc1fb5d7181d274138df03c74caf78a
+  data.tar.gz: d1b795649c0ecc16cf9142bc7c527b9f9048c81c
 SHA512:
-  metadata.gz: a3542c32f34512ec1725eac770b7f68b1db059d39e3fa538cce82aef6065e6c9bdaba7400a0aad4f191accd0291718e8944197b401f3140d78a83cf4d7a1a9d5
-  data.tar.gz: 05b3f36b1f86358e09a4a4fa80124e749707bd55a359c1cabf222ad08bb0fae28b09182e6e3d290ee6e37bb7741995a803efab547e43947c3e925726da9e8f94
+  metadata.gz: 93400647817f08b86d3322a4dc24282bd5b0ce04218cb8d3e782da177d84312f552ca85eeccb020ea5b71fa419dbc96bfb8ed4ed6ed32bef42d41f52ed912e20
+  data.tar.gz: 7864462a046770514e143cf51d0ba2af739c21c968e327523087445ab3af25a70e5d198fbb7bbf5ea7372bb35bcf21745887d812610be29ba61b00b83e0fbc79

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

@@ -10,7 +10,8 @@ class Zendesk2::Client
   end # Real
 
   class Mock
-    def create_organization(params={})
+    def create_organization(_params={})
+      params = Cistern::Hash.stringify_keys(_params)
       identity = self.class.new_id
 
       record = {
@@ -20,15 +21,20 @@ class Zendesk2::Client
         "updated_at" => Time.now.iso8601,
       }.merge(params)
 
+
       unless record["name"]
         error!(:invalid, details: { "name" => [ { "description" => "Name cannot be blank" } ]})
       end
 
-      if self.data[:organizations].values.find{|o| o["name"] == record["name"]}
+      if self.data[:organizations].values.find { |o| o["name"] == record["name"]}
         error!(:invalid, details: {"name" => [ { "description" => "Name: has already been taken" } ]})
       end
 
-      self.data[:organizations][identity]= record
+      if record["external_id"] && self.data[:organizations].values.find { |o| o["external_id"] == record["external_id"] }
+        error!(:invalid, details: {"name" => [ { "description" => "External has already been taken" } ]})
+      end
+
+      self.data[:organizations][identity] = record
 
       response(
         :method => :post,

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

@@ -10,7 +10,8 @@ class Zendesk2::Client
   end # Real
 
   class Mock
-    def create_user(params={})
+    def create_user(_params={})
+      params  = Cistern::Hash.stringify_keys(_params)
       user_id = self.class.new_id
       path    = "/users.json"
 
@@ -22,6 +23,10 @@ class Zendesk2::Client
         "active"     => true,
       }.merge(params)
 
+      if record["external_id"] && self.data[:users].values.find { |o| o["external_id"] == record["external_id"] }
+        error!(:invalid, details: {"name" => [ { "description" => "External has already been taken" } ]})
+      end
+
       if (email = record["email"]) && self.data[:identities].find{|k,i| i["type"] == "email" && i["value"] == email}
         error!(:invalid, :details => {
               "email" => [ {

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

@@ -13,15 +13,23 @@ class Zendesk2::Client
     end
   end
   class Mock
-    def update_organization(params={})
-      id = params.delete("id")
+    def update_organization(_params={})
+      params = Cistern::Hash.stringify_keys(_params)
+      id     = params.delete("id")
 
       organization = self.find!(:organizations, id)
 
-      if self.data[:organizations].values.find { |o| o["name"] == params["name"] && o["id"] != id }
+      other_organizations = self.data[:organizations].dup
+      other_organizations.delete(id)
+
+      if other_organizations.values.find { |o| o["name"] == params["name"] }
         error!(:invalid, details: {"name" => [ { "description" => "Name: has already been taken" } ]})
       end
 
+      if params["external_id"] && other_organizations.values.find { |o| o["external_id"] == params["external_id"] }
+        error!(:invalid, details: {"name" => [ { "description" => "External has already been taken" } ]})
+      end
+
       body = organization.merge!(params)
 
       response(

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

@@ -13,15 +13,25 @@ class Zendesk2::Client
     end
   end
   class Mock
-    def update_user(params={})
+    def update_user(_params={})
+      params  = Cistern::Hash.stringify_keys(_params)
       user_id = params.delete("id")
       path    = "/users/#{user_id}.json"
 
       email = params["email"]
 
+      other_users = self.data[:users].dup
+      other_users.delete(user_id)
+
+      if params["external_id"] && other_users.values.find { |o| o["external_id"] == params["external_id"] }
+        error!(:invalid, details: {"name" => [ { "description" => "External has already been taken" } ]})
+      end
+
       existing_identity = self.data[:identities].values.find { |i| i["type"] == "email" && i["value"] == email }
 
-      if existing_identity && existing_identity["user_id"] != user_id
+      if !email
+        # nvm
+      elsif existing_identity && existing_identity["user_id"] != user_id
         # email not allowed to conflict across users
         error!(:invalid, details: { "email" => [ {
           "description" => "Email #{params["email"]} is already being used by another user",
@@ -30,7 +40,7 @@ class Zendesk2::Client
         # no-op email already used
       else
         # add a new identity
-        user_identity_id = self.class.new_id # ugh
+        user_identity_id = self.class.new_id
 
         user_identity = {
           "id"         => user_identity_id,
@@ -48,6 +58,7 @@ class Zendesk2::Client
       end
 
       body = self.data[:users][user_id].merge!(params)
+
       response(
         :method => :put,
         :path   => path,

data/lib/zendesk2/version.rb

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

data/lib/zendesk2.rb

@@ -34,10 +34,6 @@ module Zendesk2
     Cistern::Hash.slice(params, "page", "per_page")
   end
 
-  def self.uuid
-    SecureRandom.uuid
-  end
-
   def self.stringify_keys(hash)
     hash.inject({}) { |r,(k,v)| r.merge(k.to_s => v) }
   end

data/spec/categories_spec.rb

@@ -5,7 +5,7 @@ describe "categories" do
 
   include_examples "zendesk resource", {
     :collection    => lambda { client.categories },
-    :create_params => lambda { { name: Zendesk2.uuid } },
-    :update_params => lambda { { name: Zendesk2.uuid } },
+    :create_params => lambda { { name: mock_uuid } },
+    :update_params => lambda { { name: mock_uuid } },
   }
 end

data/spec/forums_spec.rb

@@ -5,8 +5,8 @@ describe "forums" do
 
   include_examples "zendesk resource", {
     :collection      => lambda { client.forums },
-    :create_params   => lambda { { name: Zendesk2.uuid } },
-    :update_params   => lambda { { name: Zendesk2.uuid } },
+    :create_params   => lambda { { name: mock_uuid } },
+    :update_params   => lambda { { name: mock_uuid } },
     :delayed_destroy => true,
   }
 end

data/spec/groups_spec.rb

@@ -5,12 +5,12 @@ describe "groups" do
 
   include_examples "zendesk resource", {
     :collection    => lambda { client.groups },
-    :create_params => lambda { { name: Zendesk2.uuid } },
-    :update_params => lambda { { name: Zendesk2.uuid } },
+    :create_params => lambda { { name: mock_uuid } },
+    :update_params => lambda { { name: mock_uuid } },
   }
 
   it "should list assignable groups" do
-    client.groups.create(name: Zendesk2.uuid) # assignable by default
+    client.groups.create(name: mock_uuid) # assignable by default
 
     expect(client.groups.assignable).to be_all{|g| !g.deleted}
   end

data/spec/help_center/articles_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe "help_center/articles" do
   let(:client)   { create_client }
   let!(:section) do
-    category = client.help_center_categories.create!(name: Zendesk2.uuid,
+    category = client.help_center_categories.create!(name: mock_uuid,
                                                      locale: "en-us",
                                                     )
-    client.help_center_sections.create!(:name     => Zendesk2.uuid,
+    client.help_center_sections.create!(:name     => mock_uuid,
                                         :locale   => "en-us",
                                         :category => category,
                                        )
@@ -14,8 +14,8 @@ describe "help_center/articles" do
 
   include_examples "zendesk resource", {
     :collection    => lambda { client.help_center_articles },
-    :create_params => lambda { { title: Zendesk2.uuid, locale: "en-us", section: section } },
-    :update_params => lambda { { title: Zendesk2.uuid } },
+    :create_params => lambda { { title: mock_uuid, locale: "en-us", section: section } },
+    :update_params => lambda { { title: mock_uuid } },
     :search_params => lambda { Cistern::Hash.slice(create_params, :title) },
     :search        => true,
   }

data/spec/help_center/categories_spec.rb

@@ -5,8 +5,8 @@ describe "help_center/categories" do
 
   include_examples "zendesk resource", {
     :collection    => lambda { client.help_center_categories },
-    :create_params => lambda { { name: Zendesk2.uuid, locale: "en-us" } },
-    :update_params => lambda { { name: Zendesk2.uuid } },
+    :create_params => lambda { { name: mock_uuid, locale: "en-us" } },
+    :update_params => lambda { { name: mock_uuid } },
     :search        => false,
   }
 end

data/spec/help_center/sections_spec.rb

@@ -3,15 +3,15 @@ require 'spec_helper'
 describe "help_center/sections" do
   let(:client)   { create_client }
   let!(:category) do
-    client.help_center_categories.create!(name: Zendesk2.uuid,
+    client.help_center_categories.create!(name: mock_uuid,
                                           locale: "en-us",
                                          )
   end
 
   include_examples "zendesk resource", {
     :collection    => lambda { client.help_center_sections },
-    :create_params => lambda { { name: Zendesk2.uuid, locale: "en-us", category: category } },
-    :update_params => lambda { { name: Zendesk2.uuid } },
+    :create_params => lambda { { name: mock_uuid, locale: "en-us", category: category } },
+    :update_params => lambda { { name: mock_uuid } },
     :search        => false,
   }
 end

data/spec/memberships_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "memberships" do
   let(:client) { create_client }
-  let(:user)   { client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true) }
-  let(:organization)   { client.organizations.create!(name: Zendesk2.uuid) }
+  let(:user)   { client.users.create!(email: mock_email, name: mock_uuid, verified: true) }
+  let(:organization)   { client.organizations.create!(name: mock_uuid) }
 
   include_examples "zendesk resource", {
     :create_params => lambda { {organization_id: organization.id, user_id: user.id} },
@@ -15,7 +15,7 @@ describe "memberships" do
 
   it "should be marked as default" do
     membership           = client.memberships.create!(organization: organization, user: user)
-    another_organization = client.organizations.create!(name: Zendesk2.uuid)
+    another_organization = client.organizations.create!(name: mock_uuid)
 
     another_membership = client.memberships.create!(organization: another_organization, user: user)
 
@@ -28,8 +28,8 @@ describe "memberships" do
   end
 
   it "should get an organization's memberships" do
-    another_user = client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true)
-    another_organization = client.organizations.create!(name: Zendesk2.uuid)
+    another_user = client.users.create!(email: mock_email, name: mock_uuid, verified: true)
+    another_organization = client.organizations.create!(name: mock_uuid)
 
     another_organization.memberships.create!(user: another_user)
     another_organization.memberships.create!(user: user)
@@ -40,8 +40,8 @@ describe "memberships" do
   end
 
   it "should get an user's memberships" do
-    another_user = client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true)
-    another_organization = client.organizations.create!(name: Zendesk2.uuid)
+    another_user = client.users.create!(email: mock_email, name: mock_uuid, verified: true)
+    another_organization = client.organizations.create!(name: mock_uuid)
 
     another_organization.memberships.create!(user: another_user)
     user_membership = another_organization.memberships.create!(user: user)

data/spec/organizations_spec.rb

@@ -5,21 +5,21 @@ describe "organizations" do
 
   include_examples "zendesk resource", {
     :collection    => lambda { client.organizations },
-    :create_params => lambda { { name: Zendesk2.uuid } },
-    :update_params => lambda { { name: Zendesk2.uuid } },
+    :create_params => lambda { { name: mock_uuid } },
+    :update_params => lambda { { name: mock_uuid } },
   }
 
   describe "with an organization" do
-    let(:organization) { client.organizations.create!(name: Zendesk2.uuid) }
+    let(:organization) { client.organizations.create!(name: mock_uuid) }
 
     it "should get #users" do
-      user = client.users.create(email: "#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization: organization)
+      user = client.users.create(email: "#{mock_uuid}@example.org", name: mock_uuid, organization: organization)
       expect(organization.users).to include user
     end
 
     it "should get #tickets" do
-      user = client.users.create(email: "#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization: organization)
-      ticket = client.tickets.create(subject: "#{Zendesk2.uuid}@example.org", description: Zendesk2.uuid, requester: user)
+      user = client.users.create(email: "#{mock_uuid}@example.org", name: mock_uuid, organization: organization)
+      ticket = client.tickets.create(subject: "#{mock_uuid}@example.org", description: mock_uuid, requester: user)
       expect(organization.tickets).to include ticket
     end
 
@@ -27,18 +27,43 @@ describe "organizations" do
       expect { client.organizations.create!(name: organization.name) }.to raise_exception(Zendesk2::Error)
       model = client.organizations.create(name: organization.name)
       expect(model.errors).to eq({"name" => ["Name: has already been taken"]})
-      model = client.organizations.create(name: Zendesk2.uuid)
+      model = client.organizations.create(name: mock_uuid)
       model.name = organization.name
       model.save
       expect(model.errors).to eq({"name" => ["Name: has already been taken"]})
     end
 
     it "should be able to find organizations by external id" do
-      external_id = organization.external_id = Zendesk2.uuid
+      external_id = organization.external_id = mock_uuid
       organization.save!
 
       expect(client.organizations.find_by_external_id(external_id).first).to eq(organization)
     end
+  end
+
+  describe "#create_organization" do
+    it "should prevent duplicate external_ids" do
+      client.create_organization("name" => "a", external_id: nil) # fine
+      client.create_organization("name" => "b", external_id: nil) # also fine
+      client.create_organization("name" => "c", external_id: "1") # it's cool
+
+      expect {
+        client.create_organization("name" => "d", external_id: "1")
+      }.to raise_exception(Zendesk2::Error, /External has already been taken/)
+    end
+  end
+
+  describe "#update_organization" do
+    it "should prevent duplicate external_ids" do
+      organization         = client.organizations.create(name: "a")
+      another_organization = client.organizations.create(name: "b")
 
+      client.update_organization("id" => organization.id, external_id: nil) # fine
+      client.update_organization("id" => another_organization.id, external_id: "1") # also fine
+
+      expect {
+        client.update_organization("id" => organization.id, external_id: "1")
+      }.to raise_exception(Zendesk2::Error, /External has already been taken/)
+    end
   end
 end

data/spec/support/data_helper.rb

@@ -0,0 +1,13 @@
+module DataHelper
+  def mock_email
+    "zendesk2+#{mock_uuid}@example.org"
+  end
+
+  def mock_uuid
+    SecureRandom.uuid
+  end
+end
+
+RSpec.configure do |config|
+  config.include(DataHelper)
+end

data/spec/ticket_fields_spec.rb

@@ -5,8 +5,8 @@ describe "ticket_fields" do
 
   include_examples "zendesk resource", {
     :collection    => lambda { client.ticket_fields },
-    :create_params => lambda { { title: Zendesk2.uuid, type: "text" } },
-    :update_params => lambda { { title: Zendesk2.uuid } },
+    :create_params => lambda { { title: mock_uuid, type: "text" } },
+    :update_params => lambda { { title: mock_uuid } },
     :paged         => false,
   }
 end

data/spec/tickets_spec.rb

@@ -6,24 +6,24 @@ describe "Zendesk2::Client" do
   describe "tickets" do
     include_examples "zendesk resource", {
       :collection    => lambda { client.tickets },
-      :create_params => lambda { {subject: Zendesk2.uuid, description: Zendesk2.uuid} },
-      :update_params => lambda { {subject: Zendesk2.uuid} },
+      :create_params => lambda { {subject: mock_uuid, description: mock_uuid} },
+      :update_params => lambda { {subject: mock_uuid} },
     }
   end
 
   describe "#create_ticket" do
     it "should require a description" do
       expect {
-        client.create_ticket("subject" => Zendesk2.uuid)
+        client.create_ticket("subject" => mock_uuid)
       }.to raise_exception(Zendesk2::Error, /Description: cannot be blank/)
     end
   end
 
   describe "when creating a ticket" do
-    let!(:requester_email) { "#{Zendesk2.uuid}@example.org" }
+    let!(:requester_email) { "#{mock_uuid}@example.org" }
 
     it "should create requester" do
-      ticket = client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid, requester: {name: "Josh Lane", email: requester_email})
+      ticket = client.tickets.create!(subject: mock_uuid, description: mock_uuid, requester: {name: "Josh Lane", email: requester_email})
       if Zendesk2::Client.mocking? # this takes some time for realsies
         requester = client.users.search(email: requester_email).first
         expect(requester).not_to be_nil
@@ -36,24 +36,24 @@ describe "Zendesk2::Client" do
 
     it "should require requester name" do
       expect {
-        client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid, requester: {email: requester_email})
+        client.tickets.create!(subject: mock_uuid, description: mock_uuid, requester: {email: requester_email})
       }.to raise_exception(Zendesk2::Error, /Requester Name: .* too short/)
     end
 
     it "should require a description" do
       expect {
-        client.tickets.create!(subject: Zendesk2.uuid)
+        client.tickets.create!(subject: mock_uuid)
       }.to raise_exception(ArgumentError, /description is required/)
 
       expect {
-        client.tickets.create!(subject: Zendesk2.uuid, description: "")
+        client.tickets.create!(subject: mock_uuid, description: "")
       }.to raise_exception(ArgumentError, /description is required/)
     end
 
     it "should set priority" do
       priority = "urgent"
 
-      ticket = client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid, priority: priority)
+      ticket = client.tickets.create!(subject: mock_uuid, description: mock_uuid, priority: priority)
 
       expect(ticket.priority).to eq("urgent")
       expect(client.tickets.get!(ticket.id).priority).to eq(priority)
@@ -61,7 +61,7 @@ describe "Zendesk2::Client" do
   end
 
   describe "with a created ticket" do
-    let(:ticket) { client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid) }
+    let(:ticket) { client.tickets.create!(subject: mock_uuid, description: mock_uuid) }
 
     it "should get requester" do
       expect(ticket.requester).to eq(client.users.current)
@@ -77,10 +77,10 @@ describe "Zendesk2::Client" do
   end
 
   describe "ticket comments" do
-    let(:ticket) { client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid) }
+    let(:ticket) { client.tickets.create!(subject: mock_uuid, description: mock_uuid) }
 
     it "lists audits" do
-      body = Zendesk2.uuid
+      body = mock_uuid
       ticket.comment(body)
 
       audit = ticket.audits.last
@@ -99,7 +99,7 @@ describe "Zendesk2::Client" do
     end
 
     it "lists comments" do
-      body = Zendesk2.uuid
+      body = mock_uuid
       ticket.comment(body)
 
       expect(ticket.comments.find{|c| c.body == body}).not_to be_nil
@@ -110,19 +110,19 @@ describe "Zendesk2::Client" do
     let!(:ticket_field) { client.ticket_fields.create!(title: SecureRandom.hex(3), type: "text") }
 
     it "should be based on ticket_fields" do
-      ticket = client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid)
+      ticket = client.tickets.create!(subject: mock_uuid, description: mock_uuid)
       custom_field = ticket.custom_fields.find { |cf| cf["id"] == ticket_field.identity }
 
       expect(custom_field).not_to be_nil
       expect(custom_field["value"]).to be_nil
 
-      ticket = client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid, custom_fields: [{"id" => ticket_field.identity, "value" => "jessicaspacekat"}])
+      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 }
 
       expect(custom_field).not_to be_nil
       expect(custom_field["value"]).to eq("jessicaspacekat")
 
-      ticket = client.tickets.create!(subject: Zendesk2.uuid, description: Zendesk2.uuid, custom_fields: [{"id" => "-1", "value" => "fantasy"}])
+      ticket = client.tickets.create!(subject: mock_uuid, description: mock_uuid, custom_fields: [{"id" => "-1", "value" => "fantasy"}])
       expect(ticket.custom_fields).not_to include({"id" => -1, "value" => "fantasy"})
     end
   end

data/spec/topic_comments_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe "topic_comments" do
   let!(:client) { create_client }
-  let!(:user)   { client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true) }
-  let!(:forum)  { client.forums.create!(name: Zendesk2.uuid) }
-  let!(:topic)  { client.topics.create!(title: Zendesk2.uuid, body: Zendesk2.uuid, forum: forum) }
+  let!(:user)   { client.users.create!(email: mock_email, name: mock_uuid, verified: true) }
+  let!(:forum)  { client.forums.create!(name: mock_uuid) }
+  let!(:topic)  { client.topics.create!(title: mock_uuid, body: mock_uuid, forum: forum) }
 
   include_examples "zendesk resource",
     {
-      :create_params => lambda { {body: Zendesk2.uuid, topic_id: topic.identity, user_id: user.identity} },
-      :update_params => lambda { {body: Zendesk2.uuid} },
+      :create_params => lambda { {body: mock_uuid, topic_id: topic.identity, user_id: user.identity} },
+      :update_params => lambda { {body: mock_uuid} },
       :fetch_params  => lambda { |tc| {"topic_id" => tc.topic_id, "id" => tc.identity} },
       :collection    => lambda { client.topic_comments(topic_id: topic.identity) },
     }

data/spec/topics_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe "topics" do
   let(:client) { create_client }
-  let(:forum)  { client.forums.create(name: Zendesk2.uuid) }
+  let(:forum)  { client.forums.create(name: mock_uuid) }
 
   include_examples "zendesk resource", {
     :collection    => lambda { client.topics },
-    :create_params => lambda { { title: Zendesk2.uuid, body: Zendesk2.uuid, forum_id: forum.id } },
-    :update_params => lambda { { title: Zendesk2.uuid, body: Zendesk2.uuid } },
+    :create_params => lambda { { title: mock_uuid, body: mock_uuid, forum_id: forum.id } },
+    :update_params => lambda { { title: mock_uuid, body: mock_uuid } },
   }
 end

data/spec/user_fields_spec.rb

@@ -5,8 +5,8 @@ describe "user_fields" do
 
   include_examples "zendesk resource", {
     :collection    => lambda { client.user_fields },
-    :create_params => lambda { { title: Zendesk2.uuid, type: "text", key: "custom_#{SecureRandom.hex(3)}"} },
-    :update_params => lambda { { title: Zendesk2.uuid } },
+    :create_params => lambda { { title: mock_uuid, type: "text", key: "custom_#{SecureRandom.hex(3)}"} },
+    :update_params => lambda { { title: mock_uuid } },
     :paged         => false,
   }
 end

data/spec/user_identities_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 describe "user_identities" do
   let(:client) { create_client }
-  let(:user)   { client.users.create(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true) }
+  let(:user)   { client.users.create(email: mock_email, name: mock_uuid, verified: true) }
 
   include_examples "zendesk resource", {
-    :create_params => lambda { { value: "ey+#{Zendesk2.uuid}@example.org", type: "email", user_id: user.id } },
+    :create_params => lambda { { value: "ey+#{mock_uuid}@example.org", type: "email", user_id: user.id } },
     :update_params => lambda { { verified: true } },
     :fetch_params  => lambda { |uc| { "user_id" => uc.user_id, "id" => uc.id } },
     :collection    => lambda { client.user_identities(user_id: user.id) },
@@ -14,7 +14,7 @@ describe "user_identities" do
   }
 
   describe "#create_user_identity" do
-    let(:another_user) { client.users.create(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true) }
+    let(:another_user) { client.users.create(email: mock_email, name: mock_uuid, verified: true) }
 
     it "should prevent duplicate identities across users" do
       expect {

data/spec/users_spec.rb

@@ -5,8 +5,8 @@ describe "users" do
 
   include_examples "zendesk resource", {
     :collection    => lambda { client.users },
-    :create_params => lambda { { email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, verified: true } },
-    :update_params => lambda { { name: Zendesk2.uuid } },
+    :create_params => lambda { { email: mock_email, name: mock_uuid, verified: true } },
+    :update_params => lambda { { name: mock_uuid } },
   }
 
   it "should get current user" do
@@ -14,17 +14,43 @@ describe "users" do
     expect(current_user.email).to eq(client.username)
   end
 
+  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
+
+      expect {
+        client.create_user(email:  mock_email, name: "d", external_id: "1")
+      }.to raise_exception(Zendesk2::Error, /External has already been taken/)
+    end
+  end
+
+  describe "#update_user" do
+    it "should prevent duplicate external_ids" 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
+
+      expect {
+        client.update_user("id" => user.id, external_id: "1")
+      }.to raise_exception(Zendesk2::Error, /External has already been taken/)
+    end
+  end
+
   describe "#search" do
     it "should find a user based on details criteria with wildcards and by organization name", mock_only: true do
       # detached user
-      client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid)
+      client.users.create!(email: mock_email, name: mock_uuid)
 
       # possible match
-      bad_org = client.organizations.create!(name: Zendesk2.uuid)
-      client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization: bad_org)
+      bad_org = client.organizations.create!(name: mock_uuid)
+      client.users.create!(email: mock_email, name: mock_uuid, organization: bad_org)
 
-      org = client.organizations.create!(name: Zendesk2.uuid)
-      user = client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid, organization: org, details: "anything_hello-something-michelle")
+      org = client.organizations.create!(name: mock_uuid)
+      user = client.users.create!(email: mock_email, name: mock_uuid, organization: org, details: "anything_hello-something-michelle")
 
       expect(client.users.search(details: "*michelle*", organization: org.name)).to contain_exactly(user)
       expect(client.users.search(details: "*michelle*", organization: org.name[0..6])).to include(user)
@@ -32,10 +58,10 @@ describe "users" do
   end
 
   describe "#save" do
-    let!(:user) { client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid) }
+    let!(:user) { client.users.create!(email: mock_email, name: mock_uuid) }
 
     it "should update organization" do
-      user.organization = organization = client.organizations.create!(name: Zendesk2.uuid)
+      user.organization = organization = client.organizations.create!(name: mock_uuid)
 
       user.save!
 
@@ -43,19 +69,19 @@ describe "users" do
     end
 
     it "should get requested tickets" do
-      ticket = client.tickets.create!(requester: user, subject: Zendesk2.uuid, description: Zendesk2.uuid)
+      ticket = client.tickets.create!(requester: user, subject: mock_uuid, description: mock_uuid)
 
       expect(user.requested_tickets).to include ticket
     end
 
     it "should get ccd tickets", mock_only: true do
-      ticket = client.tickets.create!(collaborators: [user], subject: Zendesk2.uuid, description: Zendesk2.uuid)
+      ticket = client.tickets.create!(collaborators: [user], subject: mock_uuid, description: mock_uuid)
 
       expect(user.ccd_tickets).to include ticket
     end
 
     it "cannot destroy a user with a ticket" do
-      client.tickets.create!(requester: user, subject: Zendesk2.uuid, description: Zendesk2.uuid)
+      client.tickets.create!(requester: user, subject: mock_uuid, description: mock_uuid)
 
       expect(user.destroy).to be_falsey
 
@@ -74,7 +100,7 @@ describe "users" do
     end
 
     it "should create a new identity" do
-      email = "ey+#{Zendesk2.uuid}@example.org"
+      email = "ey+#{mock_uuid}@example.org"
 
       new_identity = user.identities.create!(type: "email", value: email)
       expect(new_identity.primary).to be_falsey
@@ -84,7 +110,7 @@ describe "users" do
     end
 
     it "should mark remaining identity as primary" do
-      email = "ey+#{Zendesk2.uuid}@example.org"
+      email = "ey+#{mock_uuid}@example.org"
 
       initial_identity = user.identities.all.first
       new_identity     = user.identities.create!(type: "email", value: email)
@@ -98,7 +124,7 @@ describe "users" do
     end
 
     it "should not allow multiple primary identities" do
-      email = "ey+#{Zendesk2.uuid}@example.org"
+      email = "ey+#{mock_uuid}@example.org"
 
       initial_identity = user.identities.all.first
       new_identity     = user.identities.create!(type: "email", value: email)
@@ -110,11 +136,11 @@ describe "users" do
     end
 
     it "should hate non-unique emails" do
-      email = "zendesk2+#{Zendesk2.uuid}@example.org"
-      client.users.create!(email: email, name: Zendesk2.uuid)
-      expect { client.users.create!(email: email, name: Zendesk2.uuid) }.to raise_exception(Zendesk2::Error)
+      email = mock_email
+      client.users.create!(email: email, name: mock_uuid)
+      expect { client.users.create!(email: email, name: mock_uuid) }.to raise_exception(Zendesk2::Error)
 
-      user = client.users.create(email: email, name: Zendesk2.uuid)
+      user = client.users.create(email: email, name: mock_uuid)
 
       expect(user.identity).to eq(nil)
       expect(user.errors).to eq({"email" => ["Email: #{email} is already being used by another user"]})
@@ -124,7 +150,7 @@ describe "users" do
       expect(user.identities.size).to eq(1)
 
       original_email = user.email
-      user.email = (new_email = "zendesk2+#{Zendesk2.uuid}@example.org")
+      user.email = (new_email = mock_email)
 
       expect {
         user.save!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -255,6 +255,7 @@ files:
 - spec/shared/zendesk_resource.rb
 - spec/spec_helper.rb
 - spec/support/client_helper.rb
+- spec/support/data_helper.rb
 - spec/ticket_fields_spec.rb
 - spec/tickets_spec.rb
 - spec/topic_comments_spec.rb
@@ -299,6 +300,7 @@ test_files:
 - spec/shared/zendesk_resource.rb
 - spec/spec_helper.rb
 - spec/support/client_helper.rb
+- spec/support/data_helper.rb
 - spec/ticket_fields_spec.rb
 - spec/tickets_spec.rb
 - spec/topic_comments_spec.rb