Add JSON API support

bblimke · Jan 3, 2018 · 6948175 · 6948175
1 parent d987916
commit 6948175
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 11 deletions.
diff --git a/lib/webmock/request_pattern.rb b/lib/webmock/request_pattern.rb
@@ -214,16 +214,17 @@ class BodyPattern
     include RSpecMatcherDetector
 
     BODY_FORMATS = {
-      'text/xml'               => :xml,
-      'application/xml'        => :xml,
-      'application/json'       => :json,
-      'text/json'              => :json,
-      'application/javascript' => :json,
-      'text/javascript'        => :json,
-      'text/html'              => :html,
-      'application/x-yaml'     => :yaml,
-      'text/yaml'              => :yaml,
-      'text/plain'             => :plain
+      'text/xml'                 => :xml,
+      'application/xml'          => :xml,
+      'application/json'         => :json,
+      'application/vnd.api+json' => :json,
+      'text/json'                => :json,
+      'application/javascript'   => :json,
+      'text/javascript'          => :json,
+      'text/html'                => :html,
+      'application/x-yaml'       => :yaml,
+      'text/yaml'                => :yaml,
+      'text/plain'               => :plain
     }
 
     attr_reader :pattern

diff --git a/lib/webmock/request_signature.rb b/lib/webmock/request_signature.rb
@@ -39,7 +39,7 @@ def url_encoded?
     end
 
     def json_headers?
-      !!(headers && headers['Content-Type'] == 'application/json')
+      !!(headers && ['application/vnd.api+json', 'application/json'].include?(headers['Content-Type']))
     end
 
     private

diff --git a/spec/unit/request_pattern_spec.rb b/spec/unit/request_pattern_spec.rb
@@ -424,6 +424,12 @@ def match(request_signature)
                                                          body: "{\"a\":\"1\",\"b\":\"five\",\"c\":{\"d\":[\"e\",\"f\"]}}"))
               end
 
+          it "should match when content type is set to json api" do
+            expect(WebMock::RequestPattern.new(:post, 'www.example.com', body: body_hash)).
+              to match(WebMock::RequestSignature.new(:post, "www.example.com", headers: {content_type: 'application/vnd.api+json'},
+                                                     body: "{\"a\":\"1\",\"c\":{\"d\":[\"e\",\"f\"]},\"b\":\"five\"}"))
+          end
+
           it "should not match when body is not json" do
             expect(WebMock::RequestPattern.new(:post, 'www.example.com', body: body_hash)).
               not_to match(WebMock::RequestSignature.new(:post, "www.example.com",

diff --git a/spec/unit/request_signature_spec.rb b/spec/unit/request_signature_spec.rb
@@ -142,6 +142,11 @@
       expect(subject.json_headers?).to be true
     end
 
+    it "returns true if the headers are JSON API" do
+      subject.headers = { "Content-Type" => "application/vnd.api+json" }
+      expect(subject.json_headers?).to be true
+    end
+
     it "returns false if the headers are NOT json" do
       subject.headers = { "Content-Type" => "application/made-up-format" }
       expect(subject.json_headers?).to be false