Update tests

Updated the tests.cfm file and moved the functions to a new CFC named TestRunner so that adobe wouldn't throw the duplicate routine error

Author: zainforbjs

templates/base/src/tests/TestRunner.cfc

@@ -0,0 +1,73 @@
+component {
+    // Setup the test environment
+    function setTestboxEnvironment() {
+        // creating backup for original environment
+        if (structKeyExists(server, "boxlang")) {
+            application.$$$wheels = {}
+            for (local.key in application.wheels) {
+                if (IsSimpleValue(application.wheels[local.key]) || IsArray(application.wheels[local.key]) || IsStruct(application.wheels[local.key])) {
+                    application.$$$wheels[local.key] = application.wheels[local.key]
+                }
+            }
+        } else {
+            application.$$$wheels = Duplicate(application.wheels)
+        }
+
+        // load testbox routes
+        application.wo.$include(template = "/tests/routes.cfm")
+        application.wo.$setNamedRoutePositions()
+
+        local.AssetPath = "/tests/_assets/"
+        
+        application.wo.set(rewriteFile = "index.cfm")
+        application.wo.set(controllerPath = local.AssetPath & "controllers")
+        application.wo.set(viewPath = local.AssetPath & "views")
+        application.wo.set(modelPath = local.AssetPath & "models")
+        application.wo.set(wheelsComponentPath = "/wheels")
+
+        /* turn off default validations for testing */
+        application.wheels.automaticValidations = false
+        application.wheels.assetQueryString = false
+        application.wheels.assetPaths = false
+
+        /* redirections should always delay when testing */
+        application.wheels.functions.redirectTo.delay = true
+
+        /* enable transactions for proper test isolation */
+        application.wheels.transactionMode = "commit"
+
+        /* turn off request query caching */
+        application.wheels.cacheQueriesDuringRequest = false
+
+        // CSRF
+        application.wheels.csrfCookieName = "_wheels_test_authenticity"
+        application.wheels.csrfCookieEncryptionAlgorithm = "AES"
+        application.wheels.csrfCookieEncryptionSecretKey = GenerateSecretKey("AES")
+        application.wheels.csrfCookieEncryptionEncoding = "Base64"
+
+        // Setup CSRF token and cookie. The cookie can always be in place, even when the session-based CSRF storage is being
+        // tested.
+        dummyController = application.wo.controller("dummy")
+        csrfToken = dummyController.$generateCookieAuthenticityToken()
+
+        cookie[application.wheels.csrfCookieName] = Encrypt(
+            SerializeJSON({authenticityToken = csrfToken}),
+            application.wheels.csrfCookieEncryptionSecretKey,
+            application.wheels.csrfCookieEncryptionAlgorithm,
+            application.wheels.csrfCookieEncryptionEncoding
+        )
+        if(structKeyExists(url, "db") && listFind("mysql,sqlserver,postgres,h2", url.db)){
+            application.wheels.dataSourceName = "wheelstestdb_" & url.db;
+        } else if (application.wheels.coreTestDataSourceName eq "|datasourceName|") {
+            application.wheels.dataSourceName = "wheelstestdb"; 
+        } else {
+            application.wheels.dataSourceName = application.wheels.coreTestDataSourceName;
+        }
+        application.testenv.db = application.wo.$dbinfo(datasource = application.wheels.dataSourceName, type = "version")
+
+        local.populate = StructKeyExists(url, "populate") ? url.populate : true
+        if (local.populate) {
+            include "/tests/populate.cfm"
+        }
+    }
+}

templates/base/src/tests/runner.cfm

@@ -104,7 +104,9 @@
         );
     }
 
-    setTestboxEnvironment()
+    // Sets up the test environment
+    local.testRunner = new tests.TestRunner();
+    local.testRunner.setTestboxEnvironment()
 
     if (!structKeyExists(url, "format") || url.format eq "html") {
         // Determine reporter for HTML format
@@ -256,80 +258,4 @@
         type = "App";
         include "/wheels/tests_testbox/html.cfm";
     }
-
-    private function setTestboxEnvironment() {
-        // creating backup for original environment
-        if (structKeyExists(server, "boxlang")) {
-            application.$$$wheels = $duplicateWheelsEnvironment(application.wheels)
-        } else {
-            application.$$$wheels = Duplicate(application.wheels)
-        }
-
-        // load testbox routes
-        application.wo.$include(template = "/tests/routes.cfm")
-        application.wo.$setNamedRoutePositions()
-
-        local.AssetPath = "/tests/_assets/"
-        
-        application.wo.set(rewriteFile = "index.cfm")
-        application.wo.set(controllerPath = local.AssetPath & "controllers")
-        application.wo.set(viewPath = local.AssetPath & "views")
-        application.wo.set(modelPath = local.AssetPath & "models")
-        application.wo.set(wheelsComponentPath = "/wheels")
-
-        /* turn off default validations for testing */
-        application.wheels.automaticValidations = false
-        application.wheels.assetQueryString = false
-        application.wheels.assetPaths = false
-
-        /* redirections should always delay when testing */
-        application.wheels.functions.redirectTo.delay = true
-
-        /* enable transactions for proper test isolation */
-        application.wheels.transactionMode = "commit"
-
-        /* turn off request query caching */
-        application.wheels.cacheQueriesDuringRequest = false
-
-        // CSRF
-        application.wheels.csrfCookieName = "_wheels_test_authenticity"
-        application.wheels.csrfCookieEncryptionAlgorithm = "AES"
-        application.wheels.csrfCookieEncryptionSecretKey = GenerateSecretKey("AES")
-        application.wheels.csrfCookieEncryptionEncoding = "Base64"
-
-        // Setup CSRF token and cookie. The cookie can always be in place, even when the session-based CSRF storage is being
-        // tested.
-        dummyController = application.wo.controller("dummy")
-        csrfToken = dummyController.$generateCookieAuthenticityToken()
-
-        cookie[application.wheels.csrfCookieName] = Encrypt(
-            SerializeJSON({authenticityToken = csrfToken}),
-            application.wheels.csrfCookieEncryptionSecretKey,
-            application.wheels.csrfCookieEncryptionAlgorithm,
-            application.wheels.csrfCookieEncryptionEncoding
-        )
-        if(structKeyExists(url, "db") && listFind("mysql,sqlserver,postgres,h2", url.db)){
-            application.wheels.dataSourceName = "wheelstestdb_" & url.db;
-        } else if (application.wheels.coreTestDataSourceName eq "|datasourceName|") {
-            application.wheels.dataSourceName = "wheelstestdb"; 
-        } else {
-            application.wheels.dataSourceName = application.wheels.coreTestDataSourceName;
-        }
-        application.testenv.db = application.wo.$dbinfo(datasource = application.wheels.dataSourceName, type = "version")
-
-        local.populate = StructKeyExists(url, "populate") ? url.populate : true
-        if (local.populate) {
-            include "/tests/populate.cfm"
-        }
-    }
-
-    private function $duplicateWheelsEnvironment(required struct original) {
-        local.backup = {}
-        for (local.key in arguments.original) {
-            if (IsSimpleValue(arguments.original[local.key]) || IsArray(arguments.original[local.key]) || IsStruct(arguments.original[local.key])) {
-                local.backup[local.key] = arguments.original[local.key]
-            }
-        }
-        return local.backup
-    }
 </cfscript>