From 40fa873a9b4598fa9ac34a2340cbb177a9b7debb Mon Sep 17 00:00:00 2001
From: CactusPuppy <puppycactus@gmail.com>
Date: Sun, 14 Mar 2021 13:54:44 -0700
Subject: [PATCH] Get WebMock matchers to work

---
 app/helpers/external/mailbluster_helper.rb       | 6 ++++--
 spec/helpers/external/mailbluster_helper_spec.rb | 5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/helpers/external/mailbluster_helper.rb b/app/helpers/external/mailbluster_helper.rb
index ae2b4b7b..11501c43 100644
--- a/app/helpers/external/mailbluster_helper.rb
+++ b/app/helpers/external/mailbluster_helper.rb
@@ -9,11 +9,13 @@ module External
         http = Net::HTTP.new(uri.host, uri.port)
         request = Net::HTTP::Post.new(uri.path,
           {'Authorization' => ENV["MAILBLUSTER_API_KEY"]}) # TODO Authorization=APIKEY
-        request.body = {'firstName' => user.name,
+        request.body = {
             'email' => user.email,
+            'firstName' => user.name,
+            'overrideExisting' => true,
             'subscribed' => true,
             'tags' => ["snapcon"],
-            'overrideExisting' => true}.to_json
+        }.to_json
         puts request.body.to_json
         response = http.request(request)
         puts response.body.to_json
diff --git a/spec/helpers/external/mailbluster_helper_spec.rb b/spec/helpers/external/mailbluster_helper_spec.rb
index f3f45640..ea680b6c 100644
--- a/spec/helpers/external/mailbluster_helper_spec.rb
+++ b/spec/helpers/external/mailbluster_helper_spec.rb
@@ -37,11 +37,12 @@ describe  External::MailblusterHelper, type: :helper do
         }', status: 200)
       create_lead(user)
       expect(WebMock).to have_requested(:post, "api.mailbluster.com/api/leads").with(body: {
-        'firstName': user.name,
         'email': user.email,
+        'firstName': user.name,
+        'overrideExisting': true,
         'subscribed': true,
         'tags': ["snapcon"],
-        'overrideExisting': true})
+      }.to_json)
     end
   end
 end