fix mock encoding

Author: CMogilko

.travis.yml

@@ -6,6 +6,7 @@ go:
   - 1.9.x
   - 1.10.x
   - 1.11.x
+  - 1.12.x
   - master
 
 cache: apt

connection.go

@@ -464,7 +464,7 @@ func (c *Connection) processResponse(ctx context.Context, q Query, response *Res
 	case p.Response_WAIT_COMPLETE:
 		return c.processWaitResponse(response)
 	default:
-		return nil, nil, RQLDriverError{rqlError("Unexpected response type: %v")}
+		return nil, nil, RQLDriverError{rqlError(fmt.Sprintf("Unexpected response type: %v", response.Type.String()))}
 	}
 }
 

mock.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"gopkg.in/check.v1"
+	"gopkg.in/rethinkdb/rethinkdb-go.v5/encoding"
 	"net"
 	"reflect"
 	"sync"
@@ -472,7 +473,11 @@ func (c *mockConn) Read(b []byte) (n int, err error) {
 
 		jresps := make([]json.RawMessage, len(values))
 		for i := range values {
-			jresps[i], err = json.Marshal(values[i])
+			coded, err := encoding.Encode(values[i])
+			if err != nil {
+				panic(fmt.Sprintf("failed to encode response: %v", err))
+			}
+			jresps[i], err = json.Marshal(coded)
 			if err != nil {
 				panic(fmt.Sprintf("failed to encode response: %v", err))
 			}

mock_test.go

@@ -350,6 +350,27 @@ func (s *MockSuite) TestMockAnything(c *test.C) {
 	mock.AssertExpectations(c)
 }
 
+func (s *MockSuite) TestMockRethinkStructsRunWrite(c *test.C) {
+	mock := NewMock()
+	mock.On(DB("test").Table("test").Update(map[string]int{"val": 1})).Return(WriteResponse{
+		Replaced: 1,
+		Changes: []ChangeResponse{
+			{NewValue: map[string]interface{}{"val": 1}, OldValue: map[string]interface{}{"val": 0}},
+		},
+	}, nil)
+
+	res, err := DB("test").Table("test").Update(map[string]int{"val": 1}).RunWrite(mock)
+	c.Assert(err, test.IsNil)
+
+	c.Assert(res, tests.JsonEquals, WriteResponse{
+		Replaced: 1,
+		Changes: []ChangeResponse{
+			{NewValue: map[string]interface{}{"val": 1}, OldValue: map[string]interface{}{"val": 0}},
+		},
+	})
+	mock.AssertExpectations(c)
+}
+
 type simpleTestingT struct {
 	failed bool
 }