gds_zendesk 2.4.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e604a12794e1b420cba49b66ebefceeb111fca94
-  data.tar.gz: 423b173ea68fcc9f79be97f86dd848b911f9cd8e
+  metadata.gz: a447e6d572e8bf6c8dfdbd79c40906c05f896cc1
+  data.tar.gz: 86e0ee3c122ad0104ec7d578f6b07b2c67742c81
 SHA512:
-  metadata.gz: 6fb9c8e18d8ec384bc430d95d39ba44e6ea5b394da06f7116c294d6b6126cc17523e6784537c4a715e3f25f24d87a373572b6997d8ba1ba079124521f526e748
-  data.tar.gz: 179e746b61ffc4a3e5eba171bc5af976d93ace32a315f07bd8a18e9371f4f806a33ed90027b620047b0f5029b76728c77cb2710ae7953d215f5f9a5e048a075f
+  metadata.gz: bc2777822bf5fefa9ce46d98c95f8bad9bdc441fa72976c5418acc59768757286e29b1bbbeac88061d4b51e8dc4c5d0c3018247a440feeec137a4f1559a8575c
+  data.tar.gz: 9d1140b369c2147d9ee51d06506a8818c8ff6d2b7727acb0c248ba8f36002278c14c9753edf76d4edf06bdf90a42e0e419ebd47e57c60ae53ffe4420f34d2124

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.4.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.0.0
+
+* Update the `webmock` library to version v2.3.2 to be compatible with Ruby
+2.4.2
+* Update the `test_helpers` to be compatible with `webmock` v2.3.2
+
 # 2.4.0
 
 * Update the `zendesk_api` library to v1.14.4 to silence warnings from

data/gds_zendesk.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake', '10.0.3'
   gem.add_development_dependency 'rspec', '3.1.0'
-  gem.add_development_dependency "webmock", '1.18.0'
+  gem.add_development_dependency "webmock", '~> 2.3.0'
 end

data/lib/gds_zendesk/test_helpers.rb

@@ -4,44 +4,54 @@ module GDSZendesk
   module TestHelpers
     def zendesk_has_no_user_with_email(email)
       stub_request(:get, "#{zendesk_endpoint}/users/search?query=#{email}").
+        with(basic_auth: basic_auth_credentials).
         to_return(body: {users: [], previous_page: nil, next_page: nil, count: 0}.to_json,
                   headers: {'Content-Type' => 'application/json'})
     end
 
     def zendesk_has_user(user_details)
       stub_request(:get, "#{zendesk_endpoint}/users/search?query=#{user_details[:email]}").
+        with(basic_auth: basic_auth_credentials).
         to_return(body: {users: [user_details], previous_page: nil, next_page: nil, count: 1}.to_json,
                   headers: {'Content-Type' => 'application/json'})
     end
 
     def stub_zendesk_user_creation(user_properties = nil)
-      stub = stub_http_request(:post, "#{zendesk_endpoint}/users")
+      stub = stub_request(:post, "#{zendesk_endpoint}/users")
       stub.with(body: {user: user_properties}) unless user_properties.nil?
+      stub.with(basic_auth: basic_auth_credentials)
       stub.to_return(status: 201, body: { user: { id: 12345, name: "abc" }}.to_json,
                      headers: {'Content-Type' => 'application/json'})
     end
 
     def stub_zendesk_ticket_creation(ticket_properties = nil)
-      stub = stub_http_request(:post, "#{zendesk_endpoint}/tickets")
+      stub = stub_request(:post, "#{zendesk_endpoint}/tickets")
       stub.with(body: {ticket: ticket_properties}) unless ticket_properties.nil?
+      stub.with(basic_auth: basic_auth_credentials)
       stub.to_return(status: 201, body: { ticket: { id: 12345 }}.to_json,
                      headers: {'Content-Type' => 'application/json'})
     end
 
     def stub_zendesk_ticket_creation_with_body(body)
-      stub_http_request(:post, "#{zendesk_endpoint}/tickets").
+      stub_request(:post, "#{zendesk_endpoint}/tickets").
         with(body: body).
+        with(basic_auth: basic_auth_credentials).
         to_return(status: 201, body: { ticket: { id: 12345 }}.to_json,
                   headers: {'Content-Type' => 'application/json'})
     end
 
     def stub_zendesk_user_update(user_id, user_properties)
-      stub_http_request(:put, "#{zendesk_endpoint}/users/#{user_id}").
+      stub_request(:put, "#{zendesk_endpoint}/users/#{user_id}").
         with(body: {user: user_properties}).
+        with(basic_auth: basic_auth_credentials).
         to_return(status: 201, body: { user: { id: 12345, name: "abc" }}.to_json,
                   headers: {'Content-Type' => 'application/json'})
     end
 
+    def basic_auth_credentials
+      [valid_zendesk_credentials['username'], valid_zendesk_credentials['password']]
+    end
+
     def zendesk_is_unavailable
       stub_request(:any, /#{zendesk_endpoint}\/.*/).to_return(status: 503)
     end
@@ -55,7 +65,7 @@ module GDSZendesk
     end
 
     def zendesk_endpoint
-      "https://#{valid_zendesk_credentials["username"]}:#{valid_zendesk_credentials["password"]}@govuk.zendesk.com/api/v2"
+      "https://govuk.zendesk.com/api/v2"
     end
 
     def valid_zendesk_credentials=(credentials)

data/lib/gds_zendesk/version.rb

@@ -1,3 +1,3 @@
 module GDSZendesk
-  VERSION = "2.4.0"
+  VERSION = "3.0.0"
 end

data/spec/gds_zendesk/client_spec.rb

@@ -54,7 +54,7 @@ module GDSZendesk
 
     it "raises an exception if the ticket creation wasn't successful" do
       self.valid_zendesk_credentials = valid_credentials
-      post_stub = stub_http_request(:post, "#{zendesk_endpoint}/tickets").to_return(status: 302)
+      post_stub = stub_request(:post, "#{zendesk_endpoint}/tickets").to_return(status: 302)
 
       expect { client.ticket.create!(some: "data") }.to raise_error
       expect(post_stub).to have_been_requested

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds_zendesk
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jake Benilov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: null_logger
@@ -70,16 +70,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 2.3.0
 description: Client and models for communicating with Zendesk
 email:
 - benilov@gmail.com
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Client and models for communicating with Zendesk