gds_zendesk 1.0.2 → 1.0.3

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+# 1.0.3
+
+* Update the `zendesk_api` library to the latest version (1.5.1)

data/gds_zendesk.gemspec

@@ -18,11 +18,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'null_logger', '0.0.1'
-  gem.add_dependency 'zendesk_api', '1.0.2'
+  gem.add_dependency 'zendesk_api', '1.5.1'
 
   gem.add_development_dependency 'rake', '10.0.3'
-  gem.add_development_dependency 'rspec', '2.12.0'
+  gem.add_development_dependency 'rspec', '3.1.0'
   gem.add_development_dependency 'gem_publisher', '1.2.0'
-  gem.add_development_dependency 'faraday_middleware', '0.8.8' # had to pin for gem resolution to work on Jenkins
-  gem.add_development_dependency "webmock", '1.9.0'
+  gem.add_development_dependency "webmock", '1.18.0'
 end

data/jenkins_branches.sh

@@ -0,0 +1,20 @@
+#!/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

data/lib/gds_zendesk/test_helpers.rb

@@ -4,39 +4,43 @@ module GDSZendesk
   module TestHelpers
     def zendesk_has_no_user_with_email(email)
       stub_request(:get, "#{zendesk_endpoint}/users/search?query=#{email}").
-        to_return(body: {users: [], previous_page: nil, next_page: nil, count: 0}.to_json, 
+        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]}").
-        to_return(body: {users: [user_details], previous_page: nil, next_page: nil, count: 1}.to_json, 
+        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.with(body: {user: user_properties}) unless user_properties.nil?
-      stub.to_return(status: 201, body: { user: { id: 12345, name: "abc" }})
+      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.with(body: {ticket: ticket_properties}) unless ticket_properties.nil?
-      stub.to_return(status: 201, body: { ticket: { id: 12345 }})
+      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").
         with(body: body).
-        to_return(status: 201, body: { ticket: { id: 12345 }})
+        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}").
         with(body: {user: user_properties}).
-        to_return(status: 201, body: { user: { id: 12345, name: "abc" }})
-    end      
+        to_return(status: 201, body: { user: { id: 12345, name: "abc" }}.to_json,
+                  headers: {'Content-Type' => 'application/json'})
+    end
 
     def zendesk_is_unavailable
       stub_request(:any, /#{zendesk_endpoint}\/.*/).to_return(status: 503)
@@ -64,4 +68,4 @@ module GDSZendesk
         body: { ticket: hash_including(requester: hash_including(requester_options)) }, times: 1
     end
   end
-end
+end

data/lib/gds_zendesk/version.rb

@@ -1,3 +1,3 @@
 module GDSZendesk
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/gds_zendesk/client_spec.rb

@@ -16,23 +16,23 @@ module GDSZendesk
     end
 
     it "should raise an error if no username is provided" do
-      lambda { Client.new(password: "abc") }.should raise_error(ArgumentError,
+      expect { Client.new(password: "abc") }.to raise_error(ArgumentError,
         /username not provided/)
     end
 
     it "should raise an error if no password is provided" do
-      lambda { Client.new(username: "abc") }.should raise_error(ArgumentError,
+      expect { Client.new(username: "abc") }.to raise_error(ArgumentError,
         /password not provided/)
     end
 
     it "should use a null logger if no logger has been provided" do
-      client.config_options[:logger].should be_an_instance_of(NullLogger::Logger)
+      expect(client.config_options[:logger]).to be_an_instance_of(NullLogger::Logger)
     end
 
     it "should use the passed logger if one has been provided" do
-      custom_logger = stub("logger")
+      custom_logger = double("logger")
 
-      client(logger: custom_logger).config_options[:logger].should eq(custom_logger)
+      expect(client(logger: custom_logger).config_options[:logger]).to eq(custom_logger)
     end
 
     it "should raise tickets in Zendesk" do
@@ -41,7 +41,7 @@ module GDSZendesk
 
       client.ticket.create(some: "data")
 
-      post_stub.should have_been_requested
+      expect(post_stub).to have_been_requested
     end
   end
 end

data/spec/gds_zendesk/dummy_client_spec.rb

@@ -6,25 +6,25 @@ module GDSZendesk
       let(:ticket_options) { { opt1: "val1" } }
 
       it "should log the ticket details" do
-        logger = stub("logger")
-        logger.should_receive(:info).with("Zendesk ticket created: #{ticket_options.inspect}")
+        logger = double("logger")
+        expect(logger).to receive(:info).with("Zendesk ticket created: #{ticket_options.inspect}")
 
         client = DummyClient.new(logger: logger)
         client.ticket.create!(ticket_options)
       end
 
       it "can simulate failures, triggered by a specific description or comment" do
-        logger = mock("logger")
+        logger = double("logger")
         client = DummyClient.new(logger: logger)
-        logger.should_receive(:info).with(/Simulating Zendesk ticket creation failure/).twice
+        expect(logger).to receive(:info).with(/Simulating Zendesk ticket creation failure/).twice
 
-        lambda { 
+        expect {
           client.ticket.create!(description: "break_zendesk")
-        }.should raise_error(ZendeskAPI::Error::RecordInvalid)
-        
-        lambda { 
+        }.to raise_error(ZendeskAPI::Error::RecordInvalid)
+
+        expect {
           client.ticket.create!(comment: { value: "break_zendesk" })
-        }.should raise_error(ZendeskAPI::Error::RecordInvalid)
+        }.to raise_error(ZendeskAPI::Error::RecordInvalid)
       end
     end
 
@@ -32,8 +32,8 @@ module GDSZendesk
       let(:created_user_options) { { email: "a@b.com" } }
 
       it "should log the user details" do
-        logger = stub("logger")
-        logger.should_receive(:info).with("Zendesk user created: #{created_user_options.inspect}")
+        logger = double("logger")
+        expect(logger).to receive(:info).with("Zendesk user created: #{created_user_options.inspect}")
 
         client = DummyClient.new(logger: logger)
         client.users.create!(created_user_options)

data/spec/gds_zendesk/users_spec.rb

@@ -18,15 +18,15 @@ module GDSZendesk
       context "creating/updating a user" do
         it "should update the phone and job title if those are set" do
           stub_post = stub_zendesk_user_update(123, phone: "12345", details: "Job title: Developer")
-          users.create_or_update_user(stub("requested user", email: "test@test.com", phone: "12345", job: "Developer"))
+          users.create_or_update_user(double("requested user", email: "test@test.com", phone: "12345", job: "Developer"))
 
-          stub_post.should have_been_requested
+          expect(stub_post).to have_been_requested
         end
       end
 
       it "should know whether the user is suspended or not" do
         zendesk_has_user(email: "test@test.com", id: 123, suspended: "true")
-        users.suspended?("test@test.com").should be_true
+        expect(users.suspended?("test@test.com")).to be_truthy
       end
     end
 
@@ -36,7 +36,7 @@ module GDSZendesk
       end
 
       it "should not be suspended" do
-        users.should_not be_suspended("test@test.com")
+        expect(users).to_not be_suspended("test@test.com")
       end
 
       context "creating/updating" do
@@ -48,13 +48,13 @@ module GDSZendesk
             phone: "12345",
             details: "Job title: Developer"
           )
-          user_being_requested = stub("requested user",
+          user_being_requested = double("requested user",
             name: "Abc", email: "test@test.com", phone: "12345", job: "Developer")
 
           users.create_or_update_user(user_being_requested)
-          stub_post.should have_been_requested
+          expect(stub_post).to have_been_requested
         end
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gds_zendesk
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: null_logger
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -91,22 +91,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.8
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.8
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.18.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.18.0
 description: Client and models for communicating with Zendesk
 email:
 - benilov@gmail.com
@@ -131,12 +115,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - 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
@@ -163,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4508364526887278478
+      hash: -991943749347888154
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -172,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4508364526887278478
+      hash: -991943749347888154
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23