Changeset 1384

Timestamp:

Jan 12, 2011, 10:00:59 PM (12 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

Files:

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

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Wed Jan 12 17:31:11 CET 2011
+#Wed Jan 12 18:46:36 CET 2011
 app.build.display.info=0
 app.build.svn.revision=1079
@@ -23 +23 @@
 plugins.tomcat=1.3.6
 plugins.webflow=1.3.6
+plugins.webtest=3.0.1

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 {