Only transform the supplied request body type if type is BINARY

 - There were two bugs with the transformation.
   - Firstly it always altered the body type to String causing issues for other types such as REGEX.
   - Secondly the transformation for BINARY didn't actually happen because we was comparing
     BodyType with a symbol which was failing miserably and not actually transforming the body value.

Author: jnormington

lib/mockserver/model/request.rb

@@ -32,9 +32,12 @@ class Request < Hashie::Trash
     property :cookies, default: Cookies.new([])
     property :headers, default: Headers.new([])
     property :body, transform_with: (lambda do |body|
-      is_base_64_body = body && body.type == :BINARY
-      body_value = is_base_64_body ? Base64.decode64(body.value) : body.value
-      Body.new(type: :STRING, value: body_value)
+      if body && body.type.to_s == 'BINARY'
+        body.type = :STRING
+        body.value = Base64.decode64(body.value)
+      end
+
+      body
     end)
 
     coerce_key :method, HTTPMethod

spec/mockserver/builder_spec.rb

@@ -87,4 +87,50 @@
     expect(to_camelized_hash(at_least(2))).to eq('unlimited' => 'true', 'remainingTimes' => 2)
   end
 
+
+  describe 'transforming request body' do
+    let(:expectation) { MockServer::Model::Expectation.new }
+    let(:request) { MockServer::Model::Request.new }
+
+    [{type: :XPATH, value: '/mock/instance'},
+     {type: :REGEX, value: '\d+.\d+'},
+     {type: :STRING, value: 'Mockserver is great'}].each do |request_hash|
+
+      it "generates a request body of type #{request_hash[:type]}" do
+        request.body = MockServer::Model::Body.new(request_hash)
+        expectation.request = request
+
+        expect(to_camelized_hash(expectation)).to eq({
+          "httpRequest" => {
+          "method" => "GET",
+            "body" => {
+              "type"  => request_hash[:type].to_s,
+              "value" => request_hash[:value].to_s
+            }
+          }
+        })
+      end
+    end
+
+    context 'when request body type binary' do
+      let(:body) do
+        MockServer::Model::Body.new(type: :BINARY, value: 'TW9ja3NlcnZlciBpcyBncmVhdAo=')
+      end
+
+      it 'correctly transforms to a string and updates the object' do
+        request.body = body
+        expectation.request = request
+
+        expect(to_camelized_hash(expectation)).to eq({
+          "httpRequest" => {
+            "method" => "GET",
+            "body" => {
+              "type" => "STRING",
+              "value" => "Mockserver is great\n"
+            }
+          }
+        })
+      end
+    end
+  end
 end