finalized

Author: lmajano

commands/coldbox/create/model.cfc

@@ -159,6 +159,7 @@ component extends="coldbox-cli.models.BaseCommand" {
 		if ( arguments.boxlang ) {
 			modelContent = toBoxLangClass( modelContent );
 		}
+
 		modelTestContent = replaceNoCase(
 			modelTestContent,
 			"|modelName|",

models/BaseCommand.cfc

@@ -7,6 +7,8 @@ component accessors="true" {
 	property name="utility"  inject="utility@coldbox-cli";
 	property name="settings" inject="box:modulesettings:coldbox-cli";
 	property name="config"   inject="box:moduleconfig:coldbox-cli";
+	property name="serverService"  inject="serverService";
+	property name="packageService" inject="PackageService";
 
 	function init(){
 		return this;
@@ -75,10 +77,10 @@ component accessors="true" {
 	}
 
 	function toBoxLangClass( required content ){
-		return replaceNoCase(
+		return reReplaceNoCase(
 			arguments.content,
-			"component ",
-			"class",
+			"component(\s|\n)?",
+			"class #chr( 13 )#",
 			"all"
 		);
 	}

templates/testing/ModelBDDContent.txt

@@ -31,7 +31,7 @@ component
 		describe( "|modelName| Suite", () => {
 
 			it( "can be created", () => {
-				expect( model ).toBeComponent();
+				expect( model ).notToBeNull()
 			} )
 
 |TestCases|