Skip to content
Permalink
Browse files

Merge branch 'hotfix-10.10.96' into stable

  • Loading branch information...
DominicWatson committed Oct 1, 2019
2 parents e2f4a50 + 7a7ee21 commit dd81147b3df18204d80f9df6b48b40512a165512
@@ -655,7 +655,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {

for( var r in mockResult ) { expected = r; }

mockTemplateDao.$( "selectData" ).$args( id=template, allowDraftVersions=false, fromversionTable=false, specificVersion=0 ).$results( mockResult );
mockTemplateDao.$( "selectData" ).$args( id=template, allowDraftVersions=false, fromversionTable=false, specificVersion=0, useCache=false ).$results( mockResult );

expect( service.getTemplate( template ) ).toBe( expected );
} );
@@ -668,7 +668,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {

for( var r in mockResult ) { expected = r; }

mockTemplateDao.$( "selectData" ).$args( id=template, allowDraftVersions=true, fromversionTable=true, specificVersion=0 ).$results( mockResult );
mockTemplateDao.$( "selectData" ).$args( id=template, allowDraftVersions=true, fromversionTable=true, specificVersion=0, useCache=false ).$results( mockResult );

expect( service.getTemplate( id=template, allowDrafts=true ) ).toBe( expected );
} );
@@ -687,6 +687,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
, allowDraftVersions = false
, fromversionTable = true
, specificVersion = version
, useCache = false
).$results( mockResult );

expect( service.getTemplate( id=template, version=version ) ).toBe( expected );
@@ -705,7 +706,7 @@ component extends="resources.HelperObjects.PresideBddTestCase" {
, service_provider = mockBlueprint.service_provider
};

mockTemplateDao.$( "selectData" ).$args( id=template, allowDraftVersions=false, fromversionTable=false, specificVersion=0 ).$results( mockResult );
mockTemplateDao.$( "selectData" ).$args( id=template, allowDraftVersions=false, fromversionTable=false, specificVersion=0, useCache=false ).$results( mockResult );
mockBlueprintDao.$( "selectData" ).$args( id=mockResult.email_blueprint ).$results( mockBlueprint );

expect( service.getTemplate( template ) ).toBe( expected );
@@ -444,6 +444,7 @@ component {
, allowDraftVersions = arguments.allowDrafts
, fromversionTable = arguments.fromVersionTable
, specificVersion = arguments.version
, useCache = false
);

for( var t in template ) {

0 comments on commit dd81147

Please sign in to comment.
You can’t perform that action at this time.