Merge pull request #467 from DivPro/ISSUE-466

ISSUE-466 test and decode source pointers support

Author: CMogilko

encoding/decoder.go

@@ -78,7 +78,10 @@ func valueDecoder(dv, sv reflect.Value, blank bool) decoderFunc {
 
 	if dv.IsValid() {
 		dv = indirect(dv, false)
-		if blank {
+		if sv.Kind() == reflect.Ptr {
+			sv = indirect(sv, false)
+			dv.Set(sv)
+		} else if blank {
 			dv.Set(reflect.Zero(dv.Type()))
 		}
 	}

mock_test.go

@@ -2,7 +2,6 @@ package rethinkdb
 
 import (
 	"fmt"
-
 	"testing"
 
 	test "gopkg.in/check.v1"
@@ -350,6 +349,54 @@ func (s *MockSuite) TestMockAnything(c *test.C) {
 	mock.AssertExpectations(c)
 }
 
+func (s *MockSuite) TestMockMapSliceResultOk(c *test.C) {
+	type Some struct {
+		Id string
+	}
+
+	result := []map[string]interface{}{
+		{"Id": "test1"},
+		{"Id": "test2"},
+	}
+
+	mock := NewMock()
+	q := DB("test").Table("test").GetAll()
+	mock.On(q).Return(result, nil)
+	res, err := q.Run(mock)
+	c.Assert(err, test.IsNil)
+
+	var casted []*Some
+	err = res.All(&casted)
+	c.Assert(err, test.IsNil)
+
+	c.Assert(casted[0].Id, test.Equals, "test1")
+	c.Assert(casted[1].Id, test.Equals, "test2")
+}
+
+func (s *MockSuite) TestMockPointerSliceResultOk(c *test.C) {
+	type Some struct {
+		Id string
+	}
+
+	result := []*Some{
+		{Id: "test1"},
+		{Id: "test2"},
+	}
+
+	mock := NewMock()
+	q := DB("test").Table("test").GetAll()
+	mock.On(q).Return(result, nil)
+	res, err := q.Run(mock)
+	c.Assert(err, test.IsNil)
+
+	var casted []*Some
+	err = res.All(&casted)
+	c.Assert(err, test.IsNil)
+
+	c.Assert(casted[0].Id, test.Equals, "test1")
+	c.Assert(casted[1].Id, test.Equals, "test2")
+}
+
 func (s *MockSuite) TestMockRethinkStructsRunWrite(c *test.C) {
 	mock := NewMock()
 	mock.On(DB("test").Table("test").Update(map[string]int{"val": 1})).Return(WriteResponse{