Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-19 21:29:42 +02:00
Code Releases Activity

removed embed init() for unit testing

Browse source
This commit is contained in:
Harvey Kandola 2017-09-01 14:11:09 +01:00
parent a982af6e79
commit dba57a15a8
4 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
domain/space/space_test.go
View file

@ -38,7 +38,7 @@ func TestAddSpace(t *testing.T) {
return return
} }
if sp != sp2 { if sp.Name != sp2.Name {
t.Errorf("Test Failed, space one (%v) does not match space 2(%v)", sp, sp2) t.Errorf("Test Failed, space one (%v) does not match space 2(%v)", sp, sp2)
} }
} }

8
domain/test/test.go
View file

@ -7,6 +7,8 @@ import (
"github.com/documize/community/domain" "github.com/documize/community/domain"
"github.com/documize/community/edition/boot" "github.com/documize/community/edition/boot"
"github.com/documize/community/edition/logging" "github.com/documize/community/edition/logging"
"github.com/documize/community/embed"
"github.com/documize/community/server/web"
_ "github.com/go-sql-driver/mysql" // testing _ "github.com/go-sql-driver/mysql" // testing
) )
@ -20,7 +22,9 @@ func SetupTest() (rt *env.Runtime, s *domain.Store, ctx domain.RequestContext) {
func startRuntime() (rt *env.Runtime, s *domain.Store) { func startRuntime() (rt *env.Runtime, s *domain.Store) {
rt = new(env.Runtime) rt = new(env.Runtime)
s = new(domain.Store) s = new(domain.Store)
rt.Log = logging.NewLogger() rt.Log = logging.NewLogger()
web.Embed = embed.NewEmbedder()
rt.Product = env.ProdInfo{} rt.Product = env.ProdInfo{}
rt.Product.Major = "0" rt.Product.Major = "0"
@ -53,7 +57,7 @@ func setupContext() domain.RequestContext {
ctx.Guest = false ctx.Guest = false
ctx.Editor = true ctx.Editor = true
ctx.Global = true ctx.Global = true
ctx.UserID = "1" ctx.UserID = "test"
ctx.OrgID = "1" ctx.OrgID = "test"
return ctx return ctx
} }

7
edition/community.go
View file

@ -20,8 +20,10 @@ import (
"github.com/documize/community/domain/section" "github.com/documize/community/domain/section"
"github.com/documize/community/edition/boot" "github.com/documize/community/edition/boot"
"github.com/documize/community/edition/logging" "github.com/documize/community/edition/logging"
_ "github.com/documize/community/embed" // the compressed front-end code and static data "github.com/documize/community/embed"
// _"github.com/documize/community/embed" // the compressed front-end code and static data
"github.com/documize/community/server" "github.com/documize/community/server"
"github.com/documize/community/server/web"
_ "github.com/go-sql-driver/mysql" // the mysql driver is required behind the scenes _ "github.com/go-sql-driver/mysql" // the mysql driver is required behind the scenes
) )
@ -34,6 +36,9 @@ func main() {
// wire up logging implementation // wire up logging implementation
rt.Log = logging.NewLogger() rt.Log = logging.NewLogger()
// wire up embedded web assets handler
web.Embed = embed.NewEmbedder()
// product details // product details
rt.Product = env.ProdInfo{} rt.Product = env.ProdInfo{}
rt.Product.Major = "1" rt.Product.Major = "1"

11
embed/embed.go
View file

@ -17,7 +17,6 @@ package embed
import ( import (
"net/http" "net/http"
"github.com/documize/community/server/web"
assetfs "github.com/elazarl/go-bindata-assetfs" assetfs "github.com/elazarl/go-bindata-assetfs"
) )
@ -38,6 +37,12 @@ func (embedderT) StaticAssetsFileSystem() http.FileSystem {
var embedder embedderT var embedder embedderT
func init() { // NewEmbedder returns embed assets handler instance
web.Embed = embedder func NewEmbedder() embedderT {
return embedder
} }
// func init() {
// fmt.Println("firing embed init()")
// web.Embed = embedder
// }