postmark 1.8.1 → 1.21.3

data/spec/integration/mail_delivery_method_spec.rb

@@ -17,11 +17,7 @@ describe "Sending Mail::Messages with delivery_method Mail::Postmark" do
     end
   }
 
-  let(:tagged_message) {
-    message.tap do |m|
-      m.tag "postmark-gem"
-    end
-  }
+  let(:tagged_message) { message.tap { |m| m.tag "postmark-gem" } }
 
   let(:message_with_no_body) {
     Mail.new do
@@ -53,35 +49,37 @@ describe "Sending Mail::Messages with delivery_method Mail::Postmark" do
     expect { message.deliver }.to change{message.delivered?}.to(true)
   end
 
-  it 'updates a message object with Message-ID' do
-    expect { message.deliver }.
-        to change{message['Message-ID'].to_s}.to(postmark_message_id_format)
+  it 'updates a message object with X-PM-Message-Id' do
+    expect { message.deliver }.to change{message['X-PM-Message-Id'].to_s}.to(postmark_message_id_format)
   end
 
   it 'updates a message object with full postmark response' do
-    expect { message.deliver }.
-        to change{message.postmark_response}.from(nil)
+    expect { message.deliver }.to change{message.postmark_response}.from(nil)
   end
 
   it 'delivers a tagged message' do
-    expect { tagged_message.deliver }.
-        to change{message.delivered?}.to(true)
+    expect { tagged_message.deliver }.to change{message.delivered?}.to(true)
   end
 
   it 'delivers a message with attachment' do
-    expect { message_with_attachment.deliver }.
-        to change{message_with_attachment.delivered?}.to(true)
+    expect { message_with_attachment.deliver }.to change{message_with_attachment.delivered?}.to(true)
   end
 
-  it 'fails to deliver a message without body' do
-    expect { message_with_no_body.deliver! }.
-        to raise_error(Postmark::InvalidMessageError)
-    message_with_no_body.should_not be_delivered
-  end
+  context 'fails to deliver a message' do
+    it ' without body - raise error' do
+      expect { message_with_no_body.deliver! }.to raise_error(Postmark::InvalidMessageError)
+    end
 
-  it 'fails to deliver a message with invalid To address' do
-    expect { message_with_invalid_to.deliver! }.
-        to raise_error(Postmark::InvalidMessageError)
-    message_with_invalid_to.should_not be_delivered
+    it 'without body - do not deliver' do
+      expect(message_with_no_body).not_to be_delivered
+    end
+
+    it 'with invalid To address - raise error' do
+      expect { message_with_invalid_to.deliver! }.to raise_error(Postmark::InvalidMessageError)
+    end
+
+    it 'with invalid To address - do not deliver' do
+      expect(message_with_invalid_to).not_to be_delivered
+    end
   end
 end

data/spec/spec_helper.rb

@@ -10,8 +10,9 @@ require 'json'
 require 'fakeweb'
 require 'fakeweb_matcher'
 require 'rspec'
-require 'rspec/autorun'
+require 'rspec/its'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'support', 'shared_examples.rb')
+require File.join(File.expand_path(File.dirname(__FILE__)), 'support', 'custom_matchers.rb')
 require File.join(File.expand_path(File.dirname(__FILE__)), 'support', 'helpers.rb')
 
 if ENV['JSONGEM']
@@ -23,6 +24,8 @@ end
 RSpec.configure do |config|
   include Postmark::RSpecHelpers
 
+  config.expect_with(:rspec) { |c| c.syntax = :expect }
+
 	config.filter_run_excluding :skip_for_platform => lambda { |platform|
     RUBY_PLATFORM.to_s =~ /^#{platform.to_s}/
   }
@@ -46,9 +49,3 @@ RSpec.configure do |config|
     Postmark.response_parser_class = nil
   end
 end
-
-RSpec::Matchers.define :be_serialized_to do |json|
-  match do |mail_message|
-    Postmark.convert_message_to_options_hash(mail_message).should == JSON.parse(json)
-  end
-end

data/spec/support/custom_matchers.rb

@@ -0,0 +1,44 @@
+RSpec::Matchers.define :a_postmark_json do |string|
+  def postmark_key?(key)
+    key == ::Postmark::Inflector.to_postmark(key)
+  end
+
+  def postmark_object?(obj)
+    case obj
+    when Hash
+      return false unless obj.keys.all? { |k| postmark_key?(k) }
+      return false unless obj.values.all? { |v| postmark_object?(v) }
+    when Array
+      return false unless obj.all? { |v| postmark_object?(v) }
+    end
+
+    true
+  end
+
+  def postmark_json?(str)
+    return false unless str.is_a?(String)
+
+    json = Postmark::Json.decode(str)
+    postmark_object?(json)
+  rescue
+    false
+  end
+
+  match do |actual|
+    postmark_json?(actual)
+  end
+end
+
+RSpec::Matchers.define :json_representation_of do |x|
+  match { |actual| Postmark::Json.decode(actual) == x }
+end
+
+RSpec::Matchers.define :match_json do |x|
+  match { |actual| Postmark::Json.encode(x) == actual }
+end
+
+RSpec::Matchers.define :be_serialized_to do |json|
+  match do |mail_message|
+    Postmark.convert_message_to_options_hash(mail_message) == JSON.parse(json)
+  end
+end

data/spec/support/shared_examples.rb

@@ -1,40 +1,40 @@
 shared_examples :mail do
-  it "should set text body for plain message" do
-    Postmark.send(:convert_message_to_options_hash, subject)['TextBody'].should_not be_nil
+  it "set text body for plain message" do
+    expect(Postmark.send(:convert_message_to_options_hash, subject)['TextBody']).not_to be_nil
   end
 
-  it "should encode from properly when name is used" do
+  it "encode from properly when name is used" do
     subject.from = "Sheldon Lee Cooper <sheldon@bigbangtheory.com>"
-    subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"Sheldon Lee Cooper <sheldon@bigbangtheory.com>", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
+    expect(subject).to be_serialized_to %q[{"Subject":"Hello!", "From":"Sheldon Lee Cooper <sheldon@bigbangtheory.com>", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
   end
 
-  it "should encode reply to" do
+  it "encode reply to" do
     subject.reply_to = ['a@a.com', 'b@b.com']
-    subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "ReplyTo":"a@a.com, b@b.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
+    expect(subject).to be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "ReplyTo":"a@a.com, b@b.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
   end
 
-  it "should encode tag" do
+  it "encode tag" do
     subject.tag = "invite"
-    subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "Tag":"invite", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
+    expect(subject).to be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "Tag":"invite", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
   end
 
-  it "should encode multiple recepients (TO)" do
+  it "encode multiple recepients (TO)" do
     subject.to = ['a@a.com', 'b@b.com']
-    subject.should be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"a@a.com, b@b.com", "TextBody":"Hello Sheldon!"}]
+    expect(subject).to be_serialized_to %q[{"Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"a@a.com, b@b.com", "TextBody":"Hello Sheldon!"}]
   end
 
-  it "should encode multiple recepients (CC)" do
+  it "encode multiple recepients (CC)" do
     subject.cc = ['a@a.com', 'b@b.com']
-    subject.should be_serialized_to %q[{"Cc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
+    expect(subject).to be_serialized_to %q[{"Cc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
   end
 
-  it "should encode multiple recepients (BCC)" do
+  it "encode multiple recepients (BCC)" do
     subject.bcc = ['a@a.com', 'b@b.com']
-    subject.should be_serialized_to %q[{"Bcc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
+    expect(subject).to be_serialized_to %q[{"Bcc":"a@a.com, b@b.com", "Subject":"Hello!", "From":"sheldon@bigbangtheory.com", "To":"lenard@bigbangtheory.com", "TextBody":"Hello Sheldon!"}]
   end
 
-  it "should accept string as reply_to field" do
+  it "accept string as reply_to field" do
     subject.reply_to = ['Anton Astashov <b@b.com>']
-    subject.should be_serialized_to %q[{"From": "sheldon@bigbangtheory.com", "ReplyTo": "b@b.com", "To": "lenard@bigbangtheory.com", "Subject": "Hello!", "TextBody": "Hello Sheldon!"}]
+    expect(subject).to be_serialized_to %q[{"From": "sheldon@bigbangtheory.com", "ReplyTo": "b@b.com", "To": "lenard@bigbangtheory.com", "Subject": "Hello!", "TextBody": "Hello Sheldon!"}]
   end
 end

data/spec/unit/postmark/account_api_client_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Postmark::AccountApiClient do
-
   let(:api_token) { 'abcd-efgh' }
   subject { Postmark::AccountApiClient}
 
@@ -14,7 +13,6 @@ describe Postmark::AccountApiClient do
   end
 
   context 'instance' do
-
     subject { Postmark::AccountApiClient.new(api_token) }
 
     it 'uses the auth header specific for Account API' do
@@ -23,7 +21,6 @@ describe Postmark::AccountApiClient do
     end
 
     describe '#senders' do
-
       let(:response) {
         {
           'TotalCount' => 10, 'SenderSignatures' => [{}, {}]
@@ -44,11 +41,9 @@ describe Postmark::AccountApiClient do
             with('senders', an_instance_of(Hash)).and_return(response)
         subject.senders.take(1000)
       end
-
     end
 
     describe '#get_senders' do
-
       let(:response) {
         {
           "TotalCount" => 1,
@@ -77,7 +72,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned list of senders' do
         allow(subject.http_client).to receive(:get).and_return(response)
         keys = subject.get_senders.map { |s| s.keys }.flatten
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
       it 'accepts offset and count options' do
@@ -86,11 +81,9 @@ describe Postmark::AccountApiClient do
             and_return(response)
         subject.get_senders(:offset => 10, :count => 42)
       end
-
     end
 
     describe '#get_senders_count' do
-
       let(:response) { {'TotalCount' => 42} }
 
       it 'is aliased as #get_signatures_count' do
@@ -103,11 +96,9 @@ describe Postmark::AccountApiClient do
             with('senders', an_instance_of(Hash)).and_return(response)
         expect(subject.get_senders_count).to eq(42)
       end
-
     end
 
     describe '#get_sender' do
-
       let(:response) {
         {
           "Domain" => "example.com",
@@ -132,12 +123,11 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:get).and_return(response)
         keys = subject.get_sender(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
     end
 
     describe '#create_sender' do
-
       let(:response) {
         {
           "Domain" => "example.com",
@@ -168,12 +158,11 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:post).and_return(response)
         keys = subject.create_sender(:foo => 'bar').keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
     end
 
     describe '#update_sender' do
-
       let(:response) {
         {
           "Domain" => "example.com",
@@ -205,13 +194,11 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:put).and_return(response)
         keys = subject.update_sender(42, :foo => 'bar').keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
-
     end
 
     describe '#resend_sender_confirmation' do
-
       let(:response) {
         {
           "ErrorCode" => 0,
@@ -233,13 +220,11 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:post).and_return(response)
         keys = subject.resend_sender_confirmation(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
-
     end
 
     describe '#verified_sender_spf?' do
-
       let(:response) { {"SPFVerified" => true} }
       let(:false_response) { {"SPFVerified" => false} }
 
@@ -255,18 +240,16 @@ describe Postmark::AccountApiClient do
 
       it 'returns false when SPFVerified field of the response is false' do
         allow(subject.http_client).to receive(:post).and_return(false_response)
-        expect(subject.verified_sender_spf?(42)).to be_false
+        expect(subject.verified_sender_spf?(42)).to be false
       end
 
       it 'returns true when SPFVerified field of the response is true' do
         allow(subject.http_client).to receive(:post).and_return(response)
-        expect(subject.verified_sender_spf?(42)).to be_true
+        expect(subject.verified_sender_spf?(42)).to be true
       end
-
     end
 
     describe '#request_new_sender_dkim' do
-
       let(:response) {
         {
           "Domain" => "example.com",
@@ -292,13 +275,11 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:post).and_return(response)
         keys = subject.request_new_sender_dkim(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
-
     end
 
     describe '#delete_sender' do
-
       let(:response) {
         {
           "ErrorCode" => 0,
@@ -319,13 +300,209 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:delete).and_return(response)
         keys = subject.delete_sender(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
+      end
+    end
+    
+    describe '#domains' do
+      let(:response) {{'TotalCount' => 10, 'Domains' => [{}, {}]}}
+
+      it 'returns an enumerator' do
+        expect(subject.domains).to be_kind_of(Enumerable)
+      end
+
+      it 'lazily loads domains' do
+        allow(subject.http_client).to receive(:get).
+            with('domains', an_instance_of(Hash)).and_return(response)
+        subject.domains.take(1000)
       end
 
     end
 
-    describe '#servers' do
+    describe '#get_domains' do
+
+      let(:response) {
+        {
+          "TotalCount" => 1,
+          "Domains" => [{
+            "Name" => "example.com",
+            "ID" => 8139
+          }]
+        }
+      }
+
+      it 'performs a GET request to /domains endpoint' do
+        allow(subject.http_client).to receive(:get).
+            with('domains', :offset => 0, :count => 30).
+            and_return(response)
+        subject.get_domains
+      end
+
+      it 'formats the keys of returned list of domains' do
+        allow(subject.http_client).to receive(:get).and_return(response)
+        keys = subject.get_domains.map { |s| s.keys }.flatten
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
+      end
+
+      it 'accepts offset and count options' do
+        allow(subject.http_client).to receive(:get).
+            with('domains', :offset => 10, :count => 42).
+            and_return(response)
+        subject.get_domains(:offset => 10, :count => 42)
+      end
+
+    end
+
+    describe '#get_domains_count' do
+      let(:response) { {'TotalCount' => 42} }
+
+      it 'returns a total number of domains' do
+        allow(subject.http_client).to receive(:get).
+            with('domains', an_instance_of(Hash)).and_return(response)
+        expect(subject.get_domains_count).to eq(42)
+      end
+    end
+
+    describe '#get_domain' do
+      let(:response) {
+        {
+          "Name" => "example.com",
+          "ID" => 8139
+        }
+      }
+
+      it 'performs a GET request to /domains/:id endpoint' do
+        allow(subject.http_client).to receive(:get).with("domains/42").
+                                                    and_return(response)
+        subject.get_domain(42)
+      end
+
+      it 'formats the keys of returned response' do
+        allow(subject.http_client).to receive(:get).and_return(response)
+        keys = subject.get_domain(42).keys
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
+      end
+    end
+
+    describe '#create_domain' do
+      let(:response) {
+        {
+          "Name" => "example.com",
+          "ID" => 8139
+        }
+      }
+
+      it 'performs a POST request to /domains endpoint' do
+        allow(subject.http_client).to receive(:post).
+            with("domains", an_instance_of(String)).and_return(response)
+        subject.create_domain(:name => 'example.com')
+      end
+
+      it 'converts the domain attributes names to camel case' do
+        allow(subject.http_client).to receive(:post).
+            with("domains", {'FooBar' => 'bar'}.to_json).and_return(response)
+        subject.create_domain(:foo_bar => 'bar')
+      end
+
+      it 'formats the keys of returned response' do
+        allow(subject.http_client).to receive(:post).and_return(response)
+        keys = subject.create_domain(:foo => 'bar').keys
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
+      end
+    end
 
+    describe '#update_domain' do
+      let(:response) {
+        {
+          "Name" => "example.com",
+          "ReturnPathDomain" => "return.example.com",
+          "ID" => 8139
+        }
+      }
+
+      it 'performs a PUT request to /domains/:id endpoint' do
+        allow(subject.http_client).to receive(:put).
+            with('domains/42', an_instance_of(String)).and_return(response)
+        subject.update_domain(42, :return_path_domain => 'updated-return.example.com')
+      end
+
+      it 'converts the domain attributes names to camel case' do
+        allow(subject.http_client).to receive(:put).
+            with('domains/42', {'FooBar' => 'bar'}.to_json).and_return(response)
+        subject.update_domain(42, :foo_bar => 'bar')
+      end
+
+      it 'formats the keys of returned response' do
+        allow(subject.http_client).to receive(:put).and_return(response)
+        keys = subject.update_domain(42, :foo => 'bar').keys
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
+      end
+    end
+
+    describe '#verified_domain_spf?' do
+      let(:response) { {"SPFVerified" => true} }
+      let(:false_response) { {"SPFVerified" => false} }
+
+      it 'performs a POST request to /domains/:id/verifyspf endpoint' do
+        allow(subject.http_client).to receive(:post).
+            with('domains/42/verifyspf').and_return(response)
+        subject.verified_domain_spf?(42)
+      end
+
+      it 'returns false when SPFVerified field of the response is false' do
+        allow(subject.http_client).to receive(:post).and_return(false_response)
+        expect(subject.verified_domain_spf?(42)).to be false
+      end
+
+      it 'returns true when SPFVerified field of the response is true' do
+        allow(subject.http_client).to receive(:post).and_return(response)
+        expect(subject.verified_domain_spf?(42)).to be true
+      end
+    end
+
+    describe '#rotate_domain_dkim' do
+      let(:response) {
+        {
+          "Name" => "example.com",
+          "ID" => 8139
+        }
+      }
+
+      it 'performs a POST request to /domains/:id/rotatedkim endpoint' do
+        allow(subject.http_client).to receive(:post).
+            with('domains/42/rotatedkim').and_return(response)
+        subject.rotate_domain_dkim(42)
+      end
+
+      it 'formats the keys of returned response' do
+        allow(subject.http_client).to receive(:post).and_return(response)
+        keys = subject.rotate_domain_dkim(42).keys
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
+      end
+    end
+
+    describe '#delete_domain' do
+      let(:response) {
+        {
+          "ErrorCode" => 0,
+          "Message" => "Domain example.com removed."
+        }
+      }
+
+      it 'performs a DELETE request to /domains/:id endpoint' do
+        allow(subject.http_client).to receive(:delete).
+            with('domains/42').and_return(response)
+        subject.delete_domain(42)
+      end
+
+      it 'formats the keys of returned response' do
+        allow(subject.http_client).to receive(:delete).and_return(response)
+        keys = subject.delete_sender(42).keys
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
+      end
+    end
+
+    describe '#servers' do
       let(:response) { {'TotalCount' => 10, 'Servers' => [{}, {}]} }
 
       it 'returns an enumerator' do
@@ -337,11 +514,9 @@ describe Postmark::AccountApiClient do
             with('servers', an_instance_of(Hash)).and_return(response)
         subject.servers.take(100)
       end
-
     end
 
     describe '#get_servers' do
-
       let(:response) {
         {
           'TotalCount' => 1,
@@ -375,7 +550,7 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned list of servers' do
         allow(subject.http_client).to receive(:get).and_return(response)
         keys = subject.get_servers.map { |s| s.keys }.flatten
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
 
       it 'accepts offset and count options' do
@@ -387,7 +562,6 @@ describe Postmark::AccountApiClient do
     end
 
     describe '#get_server' do
-
       let(:response) {
         {
           "ID" => 7438,
@@ -416,13 +590,11 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:get).and_return(response)
         keys = subject.get_server(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
-
     end
 
     describe '#get_servers_count' do
-
       let(:response) { {'TotalCount' => 42} }
 
       it 'returns a total number of servers' do
@@ -434,7 +606,6 @@ describe Postmark::AccountApiClient do
     end
 
     describe '#create_server' do
-
       let(:response) {
         {
           "Name" => "Staging Testing",
@@ -463,9 +634,8 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:post).and_return(response)
         keys = subject.create_server(:foo => 'bar').keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
-
     end
 
     describe '#update_server' do
@@ -505,13 +675,11 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:put).and_return(response)
         keys = subject.update_server(42, :foo => 'bar').keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
-
     end
 
     describe '#delete_server' do
-
       let(:response) {
         {
           "ErrorCode" => "0",
@@ -528,11 +696,37 @@ describe Postmark::AccountApiClient do
       it 'formats the keys of returned response' do
         allow(subject.http_client).to receive(:delete).and_return(response)
         keys = subject.delete_server(42).keys
-        expect(keys.all? { |k| k.is_a?(Symbol) }).to be_true
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
       end
+    end
+
+    describe '#push_templates' do
+      let(:response) {
+        {"TotalCount"=>5,
+         "Templates"=>
+             [{"Action"=>"Create", "TemplateId"=>nil, "Alias"=>"alias1", "Name"=>"Comment notification"},
+              {"Action"=>"Create", "TemplateId"=>nil, "Alias"=>"alias2", "Name"=>"Password reset"}]}
+      }
 
+      let(:request_data) {{:source_server_id => 1, :destination_server_id => 2, :perform_changes => false}}
+
+      it 'gets templates info and converts it to ruby format' do
+        allow(subject.http_client).to receive(:put).and_return(response)
+        templates = subject.push_templates({:source_server_id => 1, :destination_server_id => 2, :perform_changes => false} )
+
+        expect(templates.size).to eq(2)
+        expect(templates.first[:action]).to eq('Create')
+        expect(templates.first[:alias]).to eq('alias1')
+      end
+
+      it 'formats the keys of returned response' do
+        allow(subject.http_client).to receive(:put).and_return(response)
+        templates = subject.push_templates({:source_server_id => 1, :destination_server_id => 2, :perform_changes => false} )
+
+        keys = templates.map { |template| template.keys }.flatten
+        expect(keys.all? { |k| k.is_a?(Symbol) }).to be true
+      end
     end
 
   end
-
-end
+end