Merge pull request #15 from anonx/enh/testsuite-extracted

Import path of testsuite has been updated
This commit is contained in:
anonx
2014-11-25 16:48:03 +06:00
2 changed files with 3 additions and 2 deletions

View File

@@ -322,6 +322,7 @@ import (
"reflect" "reflect"
"github.com/revel/revel"{{range $k, $v := $.ImportPaths}} "github.com/revel/revel"{{range $k, $v := $.ImportPaths}}
{{$v}} "{{$k}}"{{end}} {{$v}} "{{$k}}"{{end}}
"github.com/revel/revel/testing"
) )
var ( var (
@@ -360,7 +361,7 @@ func main() {
{{$line}}: "{{$key}}",{{end}} {{$line}}: "{{$key}}",{{end}}
},{{end}} },{{end}}
} }
revel.TestSuites = []interface{}{ {{range .TestSuites}} testing.TestSuites = []interface{}{ {{range .TestSuites}}
(*{{index $.ImportPaths .ImportPath}}.{{.StructName}})(nil),{{end}} (*{{index $.ImportPaths .ImportPath}}.{{.StructName}})(nil),{{end}}
} }

View File

@@ -681,7 +681,7 @@ func (s *SourceInfo) ControllerSpecs() []*TypeInfo {
func (s *SourceInfo) TestSuites() []*TypeInfo { func (s *SourceInfo) TestSuites() []*TypeInfo {
if s.testSuites == nil { if s.testSuites == nil {
s.testSuites = s.TypesThatEmbed(revel.REVEL_IMPORT_PATH + ".TestSuite") s.testSuites = s.TypesThatEmbed(revel.REVEL_IMPORT_PATH + "/testing.TestSuite")
} }
return s.testSuites return s.testSuites
} }