diff --git a/src/tools/default.go b/src/tools/default.go index 94906d8..4fb9a81 100644 --- a/src/tools/default.go +++ b/src/tools/default.go @@ -6,9 +6,9 @@ import ( "io/ioutil" ) var title = "Tools" /** @exports */ -func Default( s string ) ( string , error ) { - var e error - var o [] byte - if o , e = ioutil.ReadFile( s ) ; e != nil { return "" , e } - return string( o ) , nil +func Default( o string ) ( r string , e error ) { + var b [] byte + if b , e = ioutil.ReadFile( o ) ; e != nil { return } + r = string( b ) + return } diff --git a/src/tools/describe.go b/src/tools/describe.go index 4067b42..977592a 100644 --- a/src/tools/describe.go +++ b/src/tools/describe.go @@ -4,8 +4,8 @@ import ( "github.com/onsi/ginkgo" ) /** @parameters */ /** @exports */ -func Describe( s string , c func() , b func() , a func() ) bool { - var t = Title( [] string { s } , true ) +func Describe( o string , c func() , b func() , a func() ) ( bool ) { + var t = Title( [] string { o } , true ) return ginkgo.Describe( t , func() { ginkgo.BeforeEach( b ) ; c() ; ginkgo.AfterEach( a ) ; diff --git a/src/tools/should.go b/src/tools/should.go index 92928e4..0e91b4a 100644 --- a/src/tools/should.go +++ b/src/tools/should.go @@ -4,6 +4,6 @@ import ( "github.com/onsi/ginkgo" ) /** @parameters */ /** @exports */ -func Should( s string , c func() ) bool { - return ginkgo.It( "should return results " + s , c ) +func Should( o string , c func() ) ( bool ) { + return ginkgo.It( "should return results " + o , c ) } diff --git a/src/tools/suite.go b/src/tools/suite.go index bb6a88f..834b4d7 100644 --- a/src/tools/suite.go +++ b/src/tools/suite.go @@ -8,8 +8,8 @@ import ( /** @parameters */ /** @exports */ -func Suite( s string , c * testing.T ) bool { - var t = Title( [] string { s } , false ) +func Suite( o string , c * testing.T ) ( bool ) { + var t = Title( [] string { o } , false ) gomega.RegisterFailHandler( ginkgo.Fail ) return ginkgo.RunSpecs( c , t ) } diff --git a/src/tools/title.go b/src/tools/title.go index ff1aced..06fb588 100644 --- a/src/tools/title.go +++ b/src/tools/title.go @@ -4,9 +4,9 @@ import ( "strings" ) /** @parameters */ /** @exports */ -func Title( s [] string , t bool ) string { - var d = " »" - var o = strings.Join( s , d ) - if t { o += d } - return o +func Title( o [] string , t bool ) ( r string ) { + var d = " » " + r = strings.Join( o , d ) + if t { r += d } + return }