udpates to tests for 6 and 7 compats

Author: lmajano

[email protected]

@@ -19,5 +19,8 @@
     "openBrowser":"false",
 	"cfconfig": {
 		"file" : ".cfconfig.json"
-	}
+	},
+	"scripts" : {
+        "onServerInstall":"cfpm install zip,debugger"
+    }
 }

test-harness/tests/specs/protocols/MailgunProtocolTest.cfc

@@ -12,9 +12,15 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 		setup();
 		variables.mailservice = getInstance( "MailService@cbmailservices" );
-		variables.apikey      = getUtil().getSystemSetting( "MAILGUN_API_KEY", "MAILGUN_API_KEY" );
-		variables.domain      = getUtil().getSystemSetting( "MAILGUN_DOMAIN", "MAILGUN_DOMAIN" );
-		variables.baseURL     = getUtil().getSystemSetting( "MAILGUN_BASEURL", "MAILGUN_BASEURL" );
+		if( getController().getColdBoxSetting( "version" ).listFirst( "." ) > 6 ){
+			variables.apikey      = getEnv().getSystemSetting( "MAILGUN_API_KEY", "MAILGUN_API_KEY" );
+			variables.domain      = getEnv().getSystemSetting( "MAILGUN_DOMAIN", "MAILGUN_DOMAIN" );
+			variables.baseURL     = getEnv().getSystemSetting( "MAILGUN_BASEURL", "MAILGUN_BASEURL" );
+		} else{
+			variables.apikey      = getUtil().getSystemSetting( "MAILGUN_API_KEY", "MAILGUN_API_KEY" );
+			variables.domain      = getUtil().getSystemSetting( "MAILGUN_DOMAIN", "MAILGUN_DOMAIN" );
+			variables.baseURL     = getUtil().getSystemSetting( "MAILGUN_BASEURL", "MAILGUN_BASEURL" );
+		}
 	}
 
 	/*********************************** BDD SUITES ***********************************/

test-harness/tests/specs/protocols/PostmarkProtocolTest.cfc

@@ -12,7 +12,12 @@ component extends="coldbox.system.testing.BaseTestCase" {
 		super.beforeAll();
 		setup();
 		variables.mailservice = getInstance( "MailService@cbmailservices" );
-		variables.apikey      = getUtil().getSystemSetting( "POSTMARK_API_KEY", "POSTMARK_API_TEST" );
+		if( getController().getColdBoxSetting( "version" ).listFirst( "." ) > 6 ){
+			variables.apikey      = getEnv().getSystemSetting( "POSTMARK_API_KEY", "POSTMARK_API_TEST" );
+		} else{
+			variables.apikey      = getUtil().getSystemSetting( "POSTMARK_API_KEY", "POSTMARK_API_TEST" );
+		}
+
 	}
 
 	/*********************************** BDD SUITES ***********************************/