gds_zendesk 2.2.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e953b3046d16eb42757c645c2d39aa161dee2cd1
-  data.tar.gz: e9cfdb28cdd23c1417716eb171b04b9ebff7170e
+SHA256:
+  metadata.gz: fa67dd4263a0871478498235472781ed6cdcd7542ec8e4706cab92e00a2e9d13
+  data.tar.gz: 61563e3f57a552f46d1834da3190fbc594d08eef23bcd82c8d6e6165ed0d2bcc
 SHA512:
-  metadata.gz: 46bad7c7e91d7890c37967dd1c13ce84591de97f2a353b380814eca29cd75ceca21bd5bacb16a84bec652d95356488192a202567f2bc394c51db6cd7bbcee8b4
-  data.tar.gz: 784efe7c47b57437dbb36223b61ce5ac2d53664b6c466f6d805fd9498b76b5a34378b49d342ef53c9cd1efd62931e95536e620589e96dc2e4b481bc5463c2056
+  metadata.gz: f8cae830c9fbd5df42e35bd91a4bf34176a157285cc99c7a6df435272a224de0ba106613f2fc3dd1235c0f2b75631e5e037240ddb9f534b791b6294c111e3c9e
+  data.tar.gz: 19db1a96ee36e0beeac2fcbf407a785a2cbda80956325cec9fa4f3b6bb69f4492fc79151d532062219e7a9e8d7984664c125a404de97035a789b66a1c421d634

data/.ruby-version

@@ -1 +1 @@
-2.2
+2.6.6

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+# 3.1.0
+
+* Update `zendesk_api` library to v1.27
+
+# 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
+Hashie about setting a key called `class`.
+
+# 2.3.1
+
+* Patch release as the previous upgrade didn't include the required
+  feature due to rapid successive merges.
+
+# 2.3.0
+
+* Add a test helper to stub Zendesk returning a 302
+
 # 2.2.0
 
 * Allow the zendesk URL to be specified in the configuration

data/Jenkinsfile

@@ -0,0 +1,7 @@
+#!/usr/bin/env groovy
+
+library("govuk")
+
+node {
+  govuk.buildProject()
+}

data/Rakefile

@@ -1,14 +1,7 @@
 require "rake"
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
-require "gem_publisher"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-
-desc "Publish the gem"
-task :publish_gem do |t|
-  gem = GemPublisher.publish_if_updated("gds_zendesk.gemspec", :rubygems)
-  puts "Published #{gem}" if gem
-end

data/gds_zendesk.gemspec

@@ -6,8 +6,8 @@ require 'gds_zendesk/version'
 Gem::Specification.new do |gem|
   gem.name          = "gds_zendesk"
   gem.version       = GDSZendesk::VERSION
-  gem.authors       = ["Jake Benilov"]
-  gem.email         = ["benilov@gmail.com"]
+  gem.authors       = ["GOV.UK Dev"]
+  gem.email         = ["govuk-dev@digital.cabinet-office.gov.uk"]
   gem.description   = %q{Client and models for communicating with Zendesk}
   gem.summary       = %q{Client and models for communicating with Zendesk}
   gem.homepage      = "https://github.com/alphagov/gds_zendesk"
@@ -17,11 +17,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'null_logger', '0.0.1'
-  gem.add_dependency 'zendesk_api', '1.8.0'
+  gem.add_dependency 'null_logger', '~> 0'
+  gem.add_dependency 'zendesk_api', '~> 1.27'
 
-  gem.add_development_dependency 'rake', '10.0.3'
-  gem.add_development_dependency 'rspec', '3.1.0'
-  gem.add_development_dependency 'gem_publisher', '1.2.0'
-  gem.add_development_dependency "webmock", '1.18.0'
+  gem.add_development_dependency 'rake', '~> 10'
+  gem.add_development_dependency 'rspec', '~> 3'
+  gem.add_development_dependency 'webmock', '~> 2'
 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
@@ -50,8 +60,12 @@ module GDSZendesk
       stub_request(:any, /#{zendesk_endpoint}\/.*/).to_return(status: 409)
     end
 
+    def zendesk_returns_redirect
+      stub_request(:any, /#{zendesk_endpoint}\/.*/).to_return(status: 302)
+    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.2.0"
+  VERSION = "3.1.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,102 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: gds_zendesk
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.1.0
 platform: ruby
 authors:
-- Jake Benilov
+- GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2020-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: null_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zendesk_api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.27'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
-- !ruby/object:Gem::Dependency
-  name: gem_publisher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '2'
 description: Client and models for communicating with Zendesk
 email:
-- benilov@gmail.com
+- govuk-dev@digital.cabinet-office.gov.uk
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -105,12 +91,11 @@ files:
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
+- Jenkinsfile
 - LICENCE.txt
 - README.md
 - Rakefile
 - gds_zendesk.gemspec
-- jenkins.sh
-- jenkins_branches.sh
 - lib/gds_zendesk.rb
 - lib/gds_zendesk/client.rb
 - lib/gds_zendesk/dummy_client.rb
@@ -140,8 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Client and models for communicating with Zendesk

data/jenkins.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-rm -f Gemfile.lock
-bundle install --path "${HOME}/bundles/${JOB_NAME}"
-bundle exec rake
-bundle exec rake publish_gem

data/jenkins_branches.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-VENV_PATH="${HOME}/venv/${JOB_NAME}"
-
-[ -x ${VENV_PATH}/bin/pip ] || virtualenv ${VENV_PATH}
-. ${VENV_PATH}/bin/activate
-
-pip install -q ghtools
-
-REPO="alphagov/gds_zendesk"
-gh-status "$REPO" "$GIT_COMMIT" pending -d "\"Build #${BUILD_NUMBER} is running on Jenkins\"" -u "$BUILD_URL" >/dev/null
-
-if ./jenkins.sh; then
-  gh-status "$REPO" "$GIT_COMMIT" success -d "\"Build #${BUILD_NUMBER} succeeded on Jenkins\"" -u "$BUILD_URL" >/dev/null
-  exit 0
-else
-  gh-status "$REPO" "$GIT_COMMIT" failure -d "\"Build #${BUILD_NUMBER} failed on Jenkins\"" -u "$BUILD_URL" >/dev/null
-  exit 1
-fi