updating to work with gds_zendesk changes

Gemfile

@@ -22,7 +22,7 @@ gem 'validates_timeliness', '3.0.14'
 if ENV['GDS_ZENDESK_DEV']
   gem "gds_zendesk", :path => '../gds_zendesk'
 else
-  gem "gds_zendesk", :git => 'https://github.com/alphagov/gds_zendesk.git', :ref => '0643641afc'
+  gem "gds_zendesk", :git => 'https://github.com/alphagov/gds_zendesk.git', :ref => 'cb88a21e1f'
 end
 
 group :test do

Gemfile.lock

@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/alphagov/gds_zendesk.git
-  revision: 0643641afcf957f9ccf49e2ed0785c3a4f5f2bb8
-  ref: 0643641afc
+  revision: cb88a21e1f74bdb8a28f43d124eadbda6ea61f46
+  ref: cb88a21e1f
   specs:
     gds_zendesk (0.0.1)
       null_logger (= 0.0.1)

app/controllers/create_new_user_requests_controller.rb

@@ -23,7 +23,7 @@ def process_valid_request(submitted_request)
 
   def create_or_update_user_in_zendesk(requested_user)
     begin
-      GDSZendesk::Users.new(client).create_or_update_user(requested_user)
+      GDSZendesk::Users.new(GDS_ZENDESK_CLIENT).create_or_update_user(requested_user)
     rescue GDSZendesk::ZendeskError => e
       ExceptionNotifier::Notifier.exception_notification(request.env, e).deliver
     end

app/controllers/requests_controller.rb

@@ -1,5 +1,5 @@
 require "zendesk_tickets"
-require "gds_zendesk/client"
+require 'gds_zendesk/zendesk_error'
 
 class RequestsController < ApplicationController
   def new
@@ -22,16 +22,12 @@ def process_valid_request(submitted_request)
 
   private
   def raise_ticket(ticket)
-    ticket = ZendeskTickets.new(client).raise_ticket(ticket)
+    ticket = ZendeskTickets.new(GDS_ZENDESK_CLIENT).raise_ticket(ticket)
 
     if ticket
       redirect_to acknowledge_path
     else
       return render "support/zendesk_error", :locals => {:error_string => "zendesk_error_upon_submit"}
     end
   end
-
-  def client
-    GDSZendesk::Client.instance
-  end
-end
+end

config/initializers/gds_zendesk.rb

@@ -1,15 +1,18 @@
 require 'yaml'
+require 'gds_zendesk/client'
+require 'gds_zendesk/dummy_client'
 
-Support::Application.configure do |app|
-  app.config.gds_zendesk.logger = Rails.logger
-  app.config.gds_zendesk.development_mode = Rails.env.development? || Rails.env.test?
-
+GDS_ZENDESK_CLIENT = if Rails.env.development? || Rails.env.test?
+  GDSZendesk::DummyClient.new(logger: Rails.logger)
+else
+  username, password = nil
   config_yaml_file = File.join(Rails.root, 'config', 'zendesk.yml')
   if File.exist?(config_yaml_file)
     config = YAML.load_file(config_yaml_file)[Rails.env]
     unless config.nil?
-      app.config.gds_zendesk.username = config['username']
-      app.config.gds_zendesk.password = config['password']
+      username = config['username']
+      password = config['password']
     end
   end
+  GDSZendesk::Client.new(username: username, password: password, logger: Rails.logger)
 end

features/step_definitions/zendesk_steps.rb

@@ -1,6 +1,6 @@
 Then /^the following ticket is raised in ZenDesk:$/ do |ticket_properties_table|
   expected_ticket_props = ticket_properties_table.hashes.first
-  @raised_ticket = GDSZendesk::Client.instance.ticket
+  @raised_ticket = GDS_ZENDESK_CLIENT.ticket
 
   assert_equal expected_ticket_props["Subject"],         @raised_ticket.subject if expected_ticket_props["Subject"]
   assert_equal expected_ticket_props["Requester email"], @raised_ticket.email if expected_ticket_props["Requester email"]
@@ -17,7 +17,7 @@
 
 Then /^the time constraints on the ticket are:$/ do |ticket_properties_table|
   expected_ticket_props = ticket_properties_table.hashes.first
-  @raised_ticket = GDSZendesk::Client.instance.ticket
+  @raised_ticket = GDS_ZENDESK_CLIENT.ticket
 
   assert_equal expected_ticket_props["Need by date"], @raised_ticket.needed_by_date if expected_ticket_props["Need by date"]
   assert_equal expected_ticket_props["Not before date"], @raised_ticket.not_before_date if expected_ticket_props["Not before date"]

test/test_helper.rb

@@ -23,9 +23,7 @@ def login_as_stub_user
   end
 
   def switch_zendesk_into_dummy_mode
-    GDSZendesk::Client.reset
-    GDSZendesk::Client.configure(development_mode: true)
-    @zendesk_api = GDSZendesk::Client.instance
+    @zendesk_api = GDS_ZENDESK_CLIENT
   end
 end