DeforaNetworks/corteza
3
0
Fork 0
Code Activity

fix(crm): unmarshal chart, fix page tests

Browse Source
This commit is contained in:
Tit Petric
2018-11-22 11:30:54 +01:00
parent b9cd623221
commit e596e5227f
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crm/repository/chart.go
View File

@@ -1,6 +1,8 @@
package repository
import (
"encoding/json"
"github.com/pkg/errors"
"github.com/titpetric/statik/fs"
@@ -34,5 +36,8 @@ func (m *module) Chart(r *request.ModuleChart) (interface{}, error) {
if err != nil {
return nil, errors.Wrap(err, "Error when reading "+filename)
}
return body, err
var response interface{}
err = json.Unmarshal(body, &response)
return response, err
}

8
crm/repository/page_test.go
View File

@@ -78,7 +78,7 @@ func TestPage(t *testing.T) {
// fetch all pages
{
ms, err := repository.Find(0)
ms, err := repository.FindBySelfID(0)
assert(t, err == nil, "Error when retrieving pages: %+v", err)
assert(t, len(ms) >= 1, "Expected at least one page, got %d", len(ms))
prevPageCount = len(ms)
@@ -86,7 +86,7 @@ func TestPage(t *testing.T) {
// fetch all pages
{
ms, err := repository.Find(m.ID)
ms, err := repository.FindBySelfID(m.ID)
assert(t, err == nil, "Error when retrieving pages: %+v", err)
assert(t, len(ms) == 2, "Expected two pages with selfID=%d, got %v", m.ID, spew.Sdump(ms))
prevPageCount = len(ms)
@@ -98,7 +98,7 @@ func TestPage(t *testing.T) {
err := repository.Reorder(parent, ids)
assert(t, err == nil, "Error when reordering pages: %+v", err)
ms, err = repository.Find(m.ID)
ms, err = repository.FindBySelfID(m.ID)
assert(t, err == nil, "Error when retrieving pages: %+v", err)
assert(t, len(ms) == 2, "Expected two pages with selfID=%d, got %v", m.ID, spew.Sdump(ms))
assert(t, ms[0].Weight < ms[1].Weight, "Expected ascending order, %+v", errors.Errorf("%d < %d", ms[0].Weight, ms[1].Weight))
@@ -113,7 +113,7 @@ func TestPage(t *testing.T) {
// fetch all pages
{
ms, err := repository.Find(0)
ms, err := repository.FindBySelfID(0)
assert(t, err == nil, "Error when retrieving pages: %+v", err)
assert(t, len(ms) < prevPageCount, "Expected pages count to decrease after deletion, %d < %d", len(ms), prevPageCount)
}