Changeset 1384 for trunk/grails-app

Timestamp:

Jan 12, 2011, 10:00:59 PM (10 years ago)

Author:

business@…

Message:

added webtest plugin and first (working) webtest, renamed 'test' configuration to 'nmcdsptest' to avoid conflicts with grails default test environment

Location:

trunk/grails-app

Files:

• conf/BootStrap.groovy (modified) (1 diff)
• conf/config-nmcdsptest.properties (copied) (copied from trunk/grails-app/conf/config-test.properties)
• conf/config-test.properties (copied) (copied from trunk/grails-app/conf/config-development.properties)
• controllers/HomeController.groovy (modified) (2 diffs)

trunk/grails-app/conf/BootStrap.groovy

@@ -60 +60 @@
                 //      - ontologies
                 //      - and/or studies
-                if (grails.util.GrailsUtil.environment == GrailsApplication.ENV_DEVELOPMENT || grails.util.GrailsUtil.environment == "dbnpdemo") {
+                if (grails.util.GrailsUtil.environment == GrailsApplication.ENV_DEVELOPMENT || grails.util.GrailsUtil.environment == GrailsApplication.ENV_TEST || grails.util.GrailsUtil.environment == "dbnpdemo") {
                         // add ontologies?
                         if (!Ontology.count()) BootStrapTemplates.initTemplateOntologies()

trunk/grails-app/controllers/HomeController.groovy

@@ -1 +1 @@
 import dbnp.studycapturing.Study
 import dbnp.studycapturing.Template
+import org.codehaus.groovy.grails.commons.GrailsApplication
 
 /**
@@ -18 +19 @@
 class HomeController {
     def index = {
-            if (!Template.count()) {
+            if (!Template.count() && grails.util.GrailsUtil.environment != GrailsApplication.ENV_TEST) {
                     redirect(controller:'setup',action:'index')             
             } else {