Merge pull request revel#1162 from revel/feature/load-module-tests

brendensoares · web-flow · commit c64b8e1c2113 · 2017-05-18T22:11:43.000-07:00
Adds test path detection when loading modules
diff --git a/revel.go b/revel.go
@@ -367,8 +367,13 @@ func addModule(name, importPath, modulePath string) {
 	// Hack: There is presently no way for the testrunner module to add the
 	// "test" subdirectory to the CodePaths.  So this does it instead.
 	if importPath == Config.StringDefault("module.testrunner", "github.com/revel/modules/testrunner") {
+		INFO.Print("Found testrunner module, adding `tests` path ", filepath.Join(BasePath, "tests"))
 		CodePaths = append(CodePaths, filepath.Join(BasePath, "tests"))
 	}
+	if testsPath := filepath.Join(modulePath, "tests"); DirExists(testsPath) {
+		INFO.Print("Found tests path ", testsPath)
+		CodePaths = append(CodePaths, testsPath)
+	}
 }
 
 // ModuleByName returns the module of the given name, if loaded.

Original file line number	Diff line number	Diff line change
`@@ -367,8 +367,13 @@ func addModule(name, importPath, modulePath string) {`
`367`	`367`	`// Hack: There is presently no way for the testrunner module to add the`
`368`	`368`	`// "test" subdirectory to the CodePaths. So this does it instead.`
`369`	`369`	`if importPath == Config.StringDefault("module.testrunner", "github.com/revel/modules/testrunner") {`
	`370`	+ INFO.Print("Found testrunner module, adding `tests` path ", filepath.Join(BasePath, "tests"))
`370`	`371`	`CodePaths = append(CodePaths, filepath.Join(BasePath, "tests"))`
`371`	`372`	`}`
	`373`	`+ if testsPath := filepath.Join(modulePath, "tests"); DirExists(testsPath) {`
	`374`	`+ INFO.Print("Found tests path ", testsPath)`
	`375`	`+ CodePaths = append(CodePaths, testsPath)`
	`376`	`+ }`
`372`	`377`	`}`
`373`	`378`
`374`	`379`	`// ModuleByName returns the module of the given name, if loaded.`