inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
71592: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      70331: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         70280: MNT-10122 : Related to MNT-2234 - Incorrect workflow history when using jBPM
           - Fixed tests failure.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74690 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 15:10:16 +00:00
parent d88b6f4d22
commit caf168e07e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/test-java/org/alfresco/repo/web/scripts/workflow/AbstractWorkflowRestApiTest.java
View File

@@ -678,6 +678,7 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
assertNotNull(result); assertNotNull(result);
JSONObject editedJsonProperties = result.getJSONObject("properties"); JSONObject editedJsonProperties = result.getJSONObject("properties");
editedJsonProperties.remove(qnameToString(ContentModel.PROP_CREATOR));
compareProperties(jsonProperties, editedJsonProperties); compareProperties(jsonProperties, editedJsonProperties);
// test USER1 (the task workflow initiator) can update the task // test USER1 (the task workflow initiator) can update the task
@@ -691,6 +692,7 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
assertNotNull(result); assertNotNull(result);
editedJsonProperties = result.getJSONObject("properties"); editedJsonProperties = result.getJSONObject("properties");
editedJsonProperties.remove(qnameToString(ContentModel.PROP_CREATOR));
compareProperties(jsonProperties, editedJsonProperties); compareProperties(jsonProperties, editedJsonProperties);
// Reassign the task to USER3 using taskInstance PUT // Reassign the task to USER3 using taskInstance PUT
@@ -713,6 +715,7 @@ public abstract class AbstractWorkflowRestApiTest extends BaseWebScriptTest
assertNotNull(result); assertNotNull(result);
editedJsonProperties = result.getJSONObject("properties"); editedJsonProperties = result.getJSONObject("properties");
editedJsonProperties.remove(qnameToString(ContentModel.PROP_CREATOR));
compareProperties(jsonProperties, editedJsonProperties); compareProperties(jsonProperties, editedJsonProperties);
} }