Merge pull request mailjet#226 from mailjet/specs-fixes

fix specs
dokeos · Mar 31, 2022 · 84930d6 · 84930d6
2 parents 2848dae + 8c67ae8
commit 84930d6
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/lib/mailjet/rack/endpoint.rb b/lib/mailjet/rack/endpoint.rb
@@ -1,4 +1,5 @@
 require 'rack/request'
+require 'json'
 
 module Mailjet
   module Rack
@@ -11,7 +12,7 @@ def initialize(app, path, &block)
 
       def call(env)
         if env['PATH_INFO'] == @path && (content = env['rack.input'].read)
-          @block.call(ActiveSupport::JSON.decode(content))
+          @block.call(JSON.parse(content))
           [200, { 'Content-Type' => 'text/html', 'Content-Length' => '0' }, []]
         else
           @app.call(env)

diff --git a/lib/mailjet/resource.rb b/lib/mailjet/resource.rb
@@ -1,6 +1,7 @@
 require 'mailjet/connection'
 require 'active_support/core_ext/string'
 require 'active_support/core_ext/module/delegation'
+require 'active_support/hash_with_indifferent_access'
 #require 'mail'
 require 'json'
 
@@ -68,7 +69,7 @@ def all(params = {}, options = {})
       def count(options = {})
         opts = define_options(options)
         response_json = connection(opts).get(default_headers.merge(params: {limit: 1, countrecords: 1}))
-        response_hash = ActiveSupport::JSON.decode(response_json)
+        response_hash = JSON.parse(response_json)
         response_hash['Total']
       end
 
@@ -128,7 +129,7 @@ def instanciate_from_api(attributes = {})
       end
 
       def parse_api_json(response_json)
-        response_hash = ActiveSupport::JSON.decode(response_json)
+        response_hash = JSON.parse(response_json)
 
         #Take the response from the API and put it through a method -- taken from the ActiveSupport library -- which converts
         #the date-time from "2014-05-19T15:31:09Z" to "Mon, 19 May 2014 15:31:09 +0000" format.
@@ -255,7 +256,7 @@ def save(options = {})
       if opts[:perform_api_call] && !persisted?
         # get attributes only for entity creation
         self.attributes = if self.resource_path == 'send'
-          ActiveSupport::JSON.decode(response)
+          JSON.parse(response)
         else
           parse_api_json(response).first
         end
@@ -320,7 +321,7 @@ def formatted_payload
       payload.tap { |hs| hs.delete("Persisted") }
       payload.inject({}) do |h, (k, v)|
         if v.respond_to? :utc
-          v = v.utc.as_json
+          v = v.utc.to_s
         end
         h.merge!({k => v})
       end

diff --git a/spec/cassettes/Mailjet_Newsletter/updates_segmentation_id_attribute.yml b/spec/cassettes/Mailjet_Newsletter/updates_segmentation_id_attribute.yml
diff --git a/spec/cassettes/resource/test_contact/update.yml b/spec/cassettes/resource/test_contact/update.yml
diff --git a/spec/mailjet/resource_spec.rb b/spec/mailjet/resource_spec.rb
@@ -37,7 +37,7 @@ class TestResource
           :accept_encoding => :deflate,
           :content_type => :json,
           :params => { "Limit" => 1 },
-          :user_agent => "mailjet-api-v3-ruby/1.6.0"
+          :user_agent => "mailjet-api-v3-ruby/1.7.0"
         }
       ).and_return('{"Data" : [{ "Test" : "Value" }]}')
     end
@@ -63,7 +63,7 @@ class TestResource
           :accept_encoding => :deflate,
           :content_type => :json,
           :params => {},
-          :user_agent => "mailjet-api-v3-ruby/1.6.0"
+          :user_agent => "mailjet-api-v3-ruby/1.7.0"
         }
       ).and_return('{"Data" : [{ "Test" : "Value1" }, { "Test" : "Value2" }]}')
     end
@@ -89,7 +89,7 @@ class TestResource
           :accept => :json,
           :accept_encoding => :deflate,
           :content_type => :json,
-          :user_agent => "mailjet-api-v3-ruby/1.6.0"
+          :user_agent => "mailjet-api-v3-ruby/1.7.0"
         }
       ).and_return("{\"Data\" : [{ \"ID\" : #{id}, \"Test\" : \"Value1\" }]}")
     end