Merge branch 'development'

Author: lmajano

.gitignore

@@ -4,7 +4,7 @@
 .tmp/**
 
 .env
-test-harness/.engine/**
+.engine
 test-harness/coldbox/**
 test-harness/docbox/**
 test-harness/testbox/**

box.json

@@ -1,6 +1,6 @@
 {
     "name":"ColdBox Mail Services",
-    "version":"2.6.1",
+    "version":"2.6.2",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbmailservices/@build.version@/[email protected]@.zip",
     "author":"Ortus Solutions.com <[email protected]",
     "slug":"cbmailservices",

changelog.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ----
 
+
+## [v2.6.2] => 2022-DEC-20
+
+### Fixed
+
+* If the incoming `layout` arugment for the `setView()` method in the mail is empty, it should ignore it.
+
+----
+
 ## [v2.6.1] => 2022-NOV-21
 
 ### Changed

models/Mail.cfc

@@ -195,6 +195,20 @@ component accessors="true" {
 		);
 	}
 
+	/**
+	 * Run email validation and throw an InvalidMailException if required params are missing.
+	 */
+	Mail function validateOrFail(){
+		if ( NOT this.validate() ){
+			throw(
+				type   : "InvalidMailException",
+				message: "One or more required fields are missing.",
+				detail : "Please check the basic mail fields of To, From, Subject and Body as they are empty. To: #variables.config.to#, From: #variables.config.from#, Subject Len = #variables.config.subject.length()#, Body Len = #variables.config.body.length()#."
+			);
+		}
+		return this;
+	}
+
 	/**
 	 * Validate that the basic fields of from, to, subject, and body are set for sending mail
 	 */
@@ -442,7 +456,7 @@ component accessors="true" {
 		variables.config.type = "html";
 
 		// Do we have a layout?
-		if ( !isNull( arguments.layout ) ) {
+		if ( !isNull( arguments.layout ) && len( arguments.layout ) ) {
 			variables.config.body = variables.wirebox
 				.getInstance( "Renderer@coldbox" )
 				.layout(

test-harness/tests/specs/MailTest.cfc

@@ -61,6 +61,29 @@
 				expect( mail.validate() ).toBeTrue();
 			} );
 
+			it( "validateOrFail will throw for invalid mail", function() {
+
+				expect(function() {
+					mail.configure(
+						from    = "[email protected]",
+						to      = "[email protected]"
+						// OMIT subject... "Oops! DID I DO THAT???"
+					)
+					.validateOrFail()
+				}).toThrow( "InvalidMailException" );
+			});
+
+			it( "validateOrFail won't throw for valid emails", function() {
+				expect( function() {
+					mail.configure(
+						subject = "Hello",
+						from    = "[email protected]",
+						to      = "[email protected]",
+						body    = "Hello"
+					).validateOrFail();
+				}).notToThrow( "InvalidMailException" );
+			});
+
 			it( "can set html types", function(){
 				mail.configure(
 						subject = "Hello",