Merge branch 'hotfix-10.3.1' into stable

pixl8 · Nov 17, 2015 · a510a15 · a510a15
2 parents f48286c + 4a71e35
commit a510a15
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/support/docs/build.sh b/support/docs/build.sh
@@ -13,7 +13,7 @@ if [ -f .exitcode ]; then
 fi
 
 echo "Building complete"
-if [[ $TRAVIS_BRANCH == 'stable' ]] ; then
+if [[ $TRAVIS_TAG == v* ]] ; then
   echo "Zipping up docs for offline download..."
   cd builds/html
   zip -q -r presidecms-docs.zip *
@@ -30,4 +30,4 @@ if [[ $TRAVIS_BRANCH == 'stable' ]] ; then
   echo "Syncing with S3..."
   s3_website push
   echo "All done :)"
-fi
+fi
diff --git a/support/tests/Application.cfc b/support/tests/Application.cfc
@@ -11,7 +11,7 @@ component {
 	this.mappings['/mxunit' ]     = currentDir & "testbox/system/compat";
 	this.mappings['/app']         = currentDir & "resources/testSite";
 	this.mappings['/preside']     = currentDir & "../../";
-	this.mappings['/coldbox']     = currentDir & "../../system/externals/coldbox-standalone-3/coldbox";
+	this.mappings['/coldbox']     = currentDir & "../../system/externals/coldbox-standalone-3.8.2/coldbox";
 
 	setting requesttimeout="6000";
 	_loadDsn();

diff --git a/support/tests/integration/api/i18n/MultilingualPresideObjectServiceTest.cfc b/support/tests/integration/api/i18n/MultilingualPresideObjectServiceTest.cfc
@@ -21,7 +21,7 @@ component extends="tests.resources.HelperObjects.PresideTestCase" {
 
 		var languagesCombined = ListToArray( mockSettings.additional_languages );
 		languagesCombined.prepend( mockSettings.default_language );
-		mockSystemConfigurationService.$( "getCategorySettings" ).$args( "multilingual" ).$results( mockSettings );
+		svc.$( "$getPresideCategorySettings" ).$args( "multilingual" ).$results( mockSettings );
 		mockLanguageDao.$( "selectData" ).$args( filter={ id=languagesCombined } ).$results( mockDbData );
 
 		super.assertEquals( expectedResult, svc.listLanguages() );
@@ -45,7 +45,7 @@ component extends="tests.resources.HelperObjects.PresideTestCase" {
 		];
 
 		var languagesCombined = ListToArray( mockSettings.additional_languages );
-		mockSystemConfigurationService.$( "getCategorySettings" ).$args( "multilingual" ).$results( mockSettings );
+		svc.$( "$getPresideCategorySettings" ).$args( "multilingual" ).$results( mockSettings );
 		mockLanguageDao.$( "selectData" ).$args( filter={ id=languagesCombined } ).$results( mockDbData );
 
 		super.assertEquals( expectedResult, svc.listLanguages( includeDefault=false ) );
@@ -259,11 +259,13 @@ component extends="tests.resources.HelperObjects.PresideTestCase" {
 		mockPresideObjectService       = getMockbox().createEmptyMock( "preside.system.services.presideObjects.PresideObjectService" );
 		mockLanguageDao                = getMockbox().createStub();
 
-		return getMockbox().createMock( object=new preside.system.services.i18n.MultilingualPresideObjectService(
-			  relationshipGuidance       = mockRelationshipGuidance
-			, systemConfigurationService = mockSystemConfigurationService
-			, presideObjectService       = mockPresideObjectService
-			, languageDao                = mockLanguageDao
+		var svc = getMockbox().createMock( object=new preside.system.services.i18n.MultilingualPresideObjectService(
+			 relationshipGuidance       = mockRelationshipGuidance
 		) );
+
+		svc.$( "$getPresideObject" ).$args( "multilingual_language" ).$results( mockLanguageDao );
+		svc.$( "$getPresideObjectService", mockPresideObjectService );
+
+		return svc;
 	}
 }