zendesk2 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81bba9f58f738ec52054105fc508707dd9a7223b
-  data.tar.gz: 017e53e26dd7ba508aacd23094f96f966da76136
+  metadata.gz: 2a5501867637d62174442f46e0f9119117c5b36b
+  data.tar.gz: a9242b5fe3c07db88175db6254be1fa1a2b4766f
 SHA512:
-  metadata.gz: ab3815ee90b96f12fce67acf78a7aeed1fb90a98e52bf88d9dc246ecc085228b4dd587d2216b844107fb67ecdbe18979eae2e8658aabd46364ebd39d2bd459f5
-  data.tar.gz: dc2b8a2b14a1fac2179beb6b941aedae05b05289dd9cfa4ac984889f0ec68a7ece263e5130805ef53083e6d0295474efd0d3b460de9628ab3ed853006eea4bf4
+  metadata.gz: f3d724891660d349ec816798a226deddfe4a9cfbf4eed4f572b25678f981427f720e6ab0973213b1e89ffeefe9834f58b0495755055744606793e2889df4bf19
+  data.tar.gz: 04bbf03267e9ad8a67502d9da874be66735b6069ad2faf67059d7b8f1c7df63b211a33d1272f047110ecc0ca053d1f34aa87d95e46a5d52503de0bdb11112ee6

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

@@ -17,45 +17,33 @@ class Zendesk2::Client
       user_id = params.delete("id")
       path    = "/users/#{user_id}.json"
 
-      if (email = params["email"]) && self.data[:identities].find{|k,i| i["type"] == "email" && i["value"] == email}
-        response(
-          :method => :put,
-          :path   => path,
-          :status => 422,
-          :body   => {
-            "error"       => "RecordInvalid",
-            "description" => "Record validation errors", "details" => {
-            "email"       => [ {
-                "description" => "Email #{params["email"]} is already being used by another user"
-              } ]
-            }
-          }
-        )
-      else
-        user_identity_id = self.class.new_id # ugh
+      if (email = params["email"]) && self.data[:identities].find { |k,i| i["type"] == "email" && i["value"] == email && i["user_id"] != user_id }
+        error!(:invalid, details: {"email" => [ { "description" => "Email #{params["email"]} is already being used by another user" } ] })
+      end
 
-        user_identity = {
-          "id"         => user_identity_id,
-          "url"        => url_for("/users/#{user_id}/identities/#{user_identity_id}.json"),
-          "created_at" => Time.now.iso8601,
-          "updated_at" => Time.now.iso8601,
-          "type"       => "email",
-          "value"      => params["email"],
-          "verified"   => false,
-          "primary"    => false,
-          "user_id"    => user_id,
-        }
+      user_identity_id = self.class.new_id # ugh
 
-        self.data[:identities][user_identity_id] = user_identity
-        body = self.data[:users][user_id].merge!(params)
-        response(
-          :method => :put,
-          :path   => path,
-          :body   => {
-            "user" => body
-          },
-        )
-      end
+      user_identity = {
+        "id"         => user_identity_id,
+        "url"        => url_for("/users/#{user_id}/identities/#{user_identity_id}.json"),
+        "created_at" => Time.now.iso8601,
+        "updated_at" => Time.now.iso8601,
+        "type"       => "email",
+        "value"      => params["email"],
+        "verified"   => false,
+        "primary"    => false,
+        "user_id"    => user_id,
+      }
+
+      self.data[:identities][user_identity_id] = user_identity
+      body = self.data[:users][user_id].merge!(params)
+      response(
+        :method => :put,
+        :path   => path,
+        :body   => {
+          "user" => body
+        },
+      )
     end
   end
 end

data/lib/zendesk2/version.rb

@@ -1,3 +1,3 @@
 module Zendesk2
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/spec/users_spec.rb

@@ -31,7 +31,7 @@ describe "users" do
     end
   end
 
-  describe do
+  describe "#save" do
     before(:each) do
       @user = client.users.create!(email: "zendesk2+#{Zendesk2.uuid}@example.org", name: Zendesk2.uuid)
     end
@@ -39,26 +39,27 @@ describe "users" do
     let(:user) { @user }
 
     it "should update organization" do
-      organization = client.organizations.create(name: Zendesk2.uuid)
-      user.organization= organization
-      expect(user.save).to be_truthy
+      user.organization = organization = client.organizations.create!(name: Zendesk2.uuid)
+
+      user.save!
+
       expect(user.organization).to eq(organization)
     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: Zendesk2.uuid, description: Zendesk2.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: Zendesk2.uuid, description: Zendesk2.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: Zendesk2.uuid, description: Zendesk2.uuid)
 
       expect(user.destroy).to be_falsey
 
@@ -114,10 +115,12 @@ describe "users" do
 
     it "should hate non-unique emails" do
       email = "zendesk2+#{Zendesk2.uuid}@example.org"
-      client.users.create(email: email, name: Zendesk2.uuid)
+      client.users.create!(email: email, name: Zendesk2.uuid)
       expect { client.users.create!(email: email, name: Zendesk2.uuid) }.to raise_exception(Zendesk2::Error)
+
       user = client.users.create(email: email, name: Zendesk2.uuid)
-      expect(user.identity).to be_falsey
+
+      expect(user.identity).to eq(nil)
       expect(user.errors).to eq({"email" => ["Email: #{email} is already being used by another user"]})
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zendesk2
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Josh Lane