Merge branch 'master' into fvilela/omnichannel

Author: fbvilela

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 Adding support to the agent availabilities API endpoints
 
+Adding multiple Gemfile and Gemfile.lock files for differen Ruby versions so that Snyk can scan the repo for vulnerabilities.
+
 ## v3.0.5
 
 Adding CBP support to more endpoints. please see `cbp_support_spec.rb` for the complete list.

lib/zendesk_api/version.rb

@@ -1,3 +1,3 @@
 module ZendeskAPI
-  VERSION = "3.0.5"
+  VERSION = "3.0.6"
 end

spec/core/spec_helper.rb

@@ -156,6 +156,10 @@ def stub_json_request(verb, path_matcher, body = json, options = {})
   c.default_cassette_options = { :record => :new_episodes, :decode_compressed_response => true, :serialize_with => :json, :preserve_exact_body_bytes => true }
   c.hook_into :webmock
   c.configure_rspec_metadata!
+
+  # In CI this doesn't matter, since we start by deleting all the cassettes.
+  # In development, this helps debugging.
+  c.allow_http_connections_when_no_cassette = true
 end
 
 include WebMock::API

spec/fixtures/zendesk.rb

@@ -30,6 +30,7 @@ def find_or_create_user(role)
 
     def topic
       VCR.use_cassette('valid_topic') do
+        @topic ||= client.topics.fetch.find { |t| t.name == "Test Topic" }
         @topic ||= client.topics.create(
           :name => "Test Topic",
           :description => "This is the body of a topic."

spec/live/automation_spec.rb

@@ -3,7 +3,7 @@
 describe ZendeskAPI::Automation, :delete_after do
   def valid_attributes
     {
-      :title => "my test automation",
+      :title => "my test automation_ruby_sdk_test",
       :conditions => {
         :all => [{ :field => "status", :operator => "is", :value => "open" }]
       },

spec/live/brand_spec.rb

@@ -2,11 +2,11 @@
 
 describe ZendeskAPI::Brand, :delete_after do
   def valid_attributes
-    { :name => "awesomesauce", :subdomain => "zendeskapi#{SecureRandom.hex(3)}" }
+    { :name => "awesomesauce_ruby_sdk_test", :subdomain => "zendeskapi#{SecureRandom.hex(3)}" }
   end
 
   it_should_be_creatable
-  it_should_be_updatable :name
+  it_should_be_updatable :name, "awesomesauce_ruby_sdk_updated_name"
   it_should_be_readable :brands
 
   # Deleted brands are still findable by id, but in the index action

spec/live/custom_status_spec.rb

@@ -14,7 +14,7 @@ def valid_attributes
   end
 
   it_should_be_creatable
-  it_should_be_updatable :agent_label, 'New Agent Label'
+  it_should_be_updatable :agent_label, "ruby_sdk_test_agent_label_updated"
   it_should_be_updatable :end_user_label, 'New End User Label'
   it_should_be_updatable :description, 'New Description'
   it_should_be_updatable :end_user_description, 'New End User Description'

spec/live/dynamic_content/item_spec.rb

@@ -3,14 +3,14 @@
 describe ZendeskAPI::DynamicContent::Item, :delete_after do
   def valid_attributes
     {
-      :name => "Snowboard Problem",
+      :name => "Dynamic Content Item name Ruby SDK test",
       :default_locale_id => 1,
-      :content => "Snowboard Problem variant"
+      :content => "Ruby SDK test content"
     }
   end
 
   it_should_be_readable :dynamic_content, :items, :create => true
   it_should_be_creatable
-  it_should_be_updatable :name
+  it_should_be_updatable :name, 'Updated Dynamic Content Item name Ruby SDK test'
   it_should_be_deletable
 end

spec/live/dynamic_content/variant_spec.rb

@@ -6,7 +6,7 @@ def valid_attributes
       :locale_id => 2,
       :active => true,
       :default => false,
-      :content => 'Mon dieu!'
+      :content => 'Ruby SDK Test Variant Content'
     }
   end
 

spec/live/identity_spec.rb

@@ -2,7 +2,7 @@
 
 describe ZendeskAPI::User::Identity, :delete_after do
   def valid_attributes
-    { :type => "email", :value => "abcdef@example.com" }
+    { :type => "email", :value => "ruby_sdk_test@example.com" }
   end
 
   under current_user do