diff --git a/lib/describe-metadata-result.json b/lib/describe-metadata-result.json
index 0f18ab1f..dcdc708e 100755
--- a/lib/describe-metadata-result.json
+++ b/lib/describe-metadata-result.json
@@ -106,7 +106,6 @@
"childXmlNames": [
"CustomField",
"BusinessProcess",
- "CompactLayout",
"RecordType",
"WebLink",
"ValidationRule",
diff --git a/lib/describe-metadata-service.js b/lib/describe-metadata-service.js
index bff5d59b..156744c3 100755
--- a/lib/describe-metadata-service.js
+++ b/lib/describe-metadata-service.js
@@ -37,11 +37,6 @@ var childTypes = [{
tagName: 'businessProcesses',
parent: 'CustomObject',
key: 'fullName'
-}, {
- xmlName: 'CompactLayout',
- tagName: 'compactLayouts',
- parent: 'CustomObject',
- key: 'fullName'
}, {
xmlName: 'RecordType',
tagName: 'recordTypes',
diff --git a/test-functional/data/complex-metadata/compactLayout-added/expected/objects/CustomObjectTest__c.object b/test-functional/data/complex-metadata/compactLayout-added/expected/objects/CustomObjectTest__c.object
index 6ece6749..f8e3d063 100644
--- a/test-functional/data/complex-metadata/compactLayout-added/expected/objects/CustomObjectTest__c.object
+++ b/test-functional/data/complex-metadata/compactLayout-added/expected/objects/CustomObjectTest__c.object
@@ -1,12 +1,32 @@
+ false
+ SYSTEM
compactLayoutTest
CreatedById
- CurrencyIsoCode
Name
LastModifiedById
OwnerId
-
+ Deployed
+ false
+ true
+ false
+ false
+ false
+ false
+ true
+ true
+ true
+
+
+
+ Text
+
+ CustomObjectTest
+
+ ReadWrite
+ Public
+
\ No newline at end of file
diff --git a/test-functional/data/complex-metadata/compactLayout-added/v0/objects/CustomObjectTest__c.object b/test-functional/data/complex-metadata/compactLayout-added/v0/objects/CustomObjectTest__c.object
index f7637219..0d0f09c9 100644
--- a/test-functional/data/complex-metadata/compactLayout-added/v0/objects/CustomObjectTest__c.object
+++ b/test-functional/data/complex-metadata/compactLayout-added/v0/objects/CustomObjectTest__c.object
@@ -141,6 +141,7 @@
Default
false
+ SYSTEM
Deployed
false
true
diff --git a/test-functional/data/complex-metadata/compactLayout-added/v1/objects/CustomObjectTest__c.object b/test-functional/data/complex-metadata/compactLayout-added/v1/objects/CustomObjectTest__c.object
index 9905881d..28c6a605 100644
--- a/test-functional/data/complex-metadata/compactLayout-added/v1/objects/CustomObjectTest__c.object
+++ b/test-functional/data/complex-metadata/compactLayout-added/v1/objects/CustomObjectTest__c.object
@@ -145,7 +145,6 @@
compactLayoutTest
CreatedById
- CurrencyIsoCode
Name
LastModifiedById
OwnerId
diff --git a/test-functional/data/complex-metadata/pluralLabel-updated/expected/objects/CustomObjectTest__c.object b/test-functional/data/complex-metadata/pluralLabel-updated/expected/objects/CustomObjectTest__c.object
new file mode 100644
index 00000000..f7a73b43
--- /dev/null
+++ b/test-functional/data/complex-metadata/pluralLabel-updated/expected/objects/CustomObjectTest__c.object
@@ -0,0 +1,24 @@
+
+
+ false
+ SYSTEM
+ Deployed
+ false
+ true
+ false
+ false
+ false
+ false
+ true
+ true
+ true
+
+
+
+ Text
+
+ CustomObjectRenamed
+
+ ReadWrite
+ Public
+
\ No newline at end of file
diff --git a/test-functional/data/complex-metadata/pluralLabel-updated/expected/package.xml b/test-functional/data/complex-metadata/pluralLabel-updated/expected/package.xml
new file mode 100644
index 00000000..268667b0
--- /dev/null
+++ b/test-functional/data/complex-metadata/pluralLabel-updated/expected/package.xml
@@ -0,0 +1,8 @@
+
+
+
+ CustomObjectTest__c
+ CustomObject
+
+ 46.0
+
diff --git a/test-functional/data/complex-metadata/pluralLabel-updated/v0/objects/CustomObjectTest__c.object b/test-functional/data/complex-metadata/pluralLabel-updated/v0/objects/CustomObjectTest__c.object
new file mode 100644
index 00000000..57916cf9
--- /dev/null
+++ b/test-functional/data/complex-metadata/pluralLabel-updated/v0/objects/CustomObjectTest__c.object
@@ -0,0 +1,169 @@
+
+
+
+ Accept
+ Default
+
+
+ Accept
+ Large
+ Default
+
+
+ Accept
+ Small
+ Default
+
+
+ CancelEdit
+ Default
+
+
+ CancelEdit
+ Large
+ Default
+
+
+ CancelEdit
+ Small
+ Default
+
+
+ Clone
+ Default
+
+
+ Clone
+ Large
+ Default
+
+
+ Clone
+ Small
+ Default
+
+
+ Delete
+ Default
+
+
+ Delete
+ Large
+ Default
+
+
+ Delete
+ Small
+ Default
+
+
+ Edit
+ Default
+
+
+ Edit
+ Large
+ Default
+
+
+ Edit
+ Small
+ Default
+
+
+ List
+ Default
+
+
+ List
+ Large
+ Default
+
+
+ List
+ Small
+ Default
+
+
+ New
+ Default
+
+
+ New
+ Large
+ Default
+
+
+ New
+ Small
+ Default
+
+
+ SaveEdit
+ Default
+
+
+ SaveEdit
+ Large
+ Default
+
+
+ SaveEdit
+ Small
+ Default
+
+
+ Tab
+ Default
+
+
+ Tab
+ Large
+ Default
+
+
+ Tab
+ Small
+ Default
+
+
+ View
+ Default
+
+
+ View
+ Large
+ Default
+
+
+ View
+ Small
+ Default
+
+ false
+ SYSTEM
+ Deployed
+ false
+ true
+ false
+ false
+ false
+ false
+ true
+ true
+ true
+
+
+ All
+ Everything
+
+
+
+
+ Text
+
+ CustomObjectTest
+
+ ReadWrite
+ Public
+
\ No newline at end of file
diff --git a/test-functional/data/complex-metadata/pluralLabel-updated/v0/package.xml b/test-functional/data/complex-metadata/pluralLabel-updated/v0/package.xml
new file mode 100644
index 00000000..dfc4541e
--- /dev/null
+++ b/test-functional/data/complex-metadata/pluralLabel-updated/v0/package.xml
@@ -0,0 +1,8 @@
+
+
+
+ CustomObject
+ CustomObjectTest__c
+
+ 46.0
+
\ No newline at end of file
diff --git a/test-functional/data/complex-metadata/pluralLabel-updated/v1/objects/CustomObjectTest__c.object b/test-functional/data/complex-metadata/pluralLabel-updated/v1/objects/CustomObjectTest__c.object
new file mode 100644
index 00000000..57ccc0fb
--- /dev/null
+++ b/test-functional/data/complex-metadata/pluralLabel-updated/v1/objects/CustomObjectTest__c.object
@@ -0,0 +1,169 @@
+
+
+
+ Accept
+ Default
+
+
+ Accept
+ Large
+ Default
+
+
+ Accept
+ Small
+ Default
+
+
+ CancelEdit
+ Default
+
+
+ CancelEdit
+ Large
+ Default
+
+
+ CancelEdit
+ Small
+ Default
+
+
+ Clone
+ Default
+
+
+ Clone
+ Large
+ Default
+
+
+ Clone
+ Small
+ Default
+
+
+ Delete
+ Default
+
+
+ Delete
+ Large
+ Default
+
+
+ Delete
+ Small
+ Default
+
+
+ Edit
+ Default
+
+
+ Edit
+ Large
+ Default
+
+
+ Edit
+ Small
+ Default
+
+
+ List
+ Default
+
+
+ List
+ Large
+ Default
+
+
+ List
+ Small
+ Default
+
+
+ New
+ Default
+
+
+ New
+ Large
+ Default
+
+
+ New
+ Small
+ Default
+
+
+ SaveEdit
+ Default
+
+
+ SaveEdit
+ Large
+ Default
+
+
+ SaveEdit
+ Small
+ Default
+
+
+ Tab
+ Default
+
+
+ Tab
+ Large
+ Default
+
+
+ Tab
+ Small
+ Default
+
+
+ View
+ Default
+
+
+ View
+ Large
+ Default
+
+
+ View
+ Small
+ Default
+
+ false
+ SYSTEM
+ Deployed
+ false
+ true
+ false
+ false
+ false
+ false
+ true
+ true
+ true
+
+
+ All
+ Everything
+
+
+
+
+ Text
+
+ CustomObjectRenamed
+
+ ReadWrite
+ Public
+
\ No newline at end of file
diff --git a/test-functional/data/complex-metadata/pluralLabel-updated/v1/package.xml b/test-functional/data/complex-metadata/pluralLabel-updated/v1/package.xml
new file mode 100644
index 00000000..dfc4541e
--- /dev/null
+++ b/test-functional/data/complex-metadata/pluralLabel-updated/v1/package.xml
@@ -0,0 +1,8 @@
+
+
+
+ CustomObject
+ CustomObjectTest__c
+
+ 46.0
+
\ No newline at end of file
diff --git a/test-functional/feature/changeset-complex-metadata.feature b/test-functional/feature/changeset-complex-metadata.feature
index 69d24c03..bdcbbf1c 100644
--- a/test-functional/feature/changeset-complex-metadata.feature
+++ b/test-functional/feature/changeset-complex-metadata.feature
@@ -7,11 +7,6 @@ Feature: Change Set: Handle Properties of Complex Metadata Types
And excluding any "" metadata in the change set
And the change set could be deployed correctly
- @doing
- Examples:
- | parent | child | changeSetTag | excludedTag | data |
- | CustomObject | CustomField | CustomField | CustomObject | complex-metadata/customField-added |
-
Examples:
| parent | child | changeSetTag | excludedTag | data |
| CustomObject | CustomField | CustomField | CustomObject | complex-metadata/customField-added |
@@ -51,7 +46,6 @@ Feature: Change Set: Handle Properties of Complex Metadata Types
| CustomObject | CompactLayout | complex-metadata/compactLayout-removed | destructiveChanges.xml is not created |
| CustomObject | SharingReason | complex-metadata/sharingReason-removed | destructiveChanges.xml is not created |
- @doing @skipped
Scenario Outline: Parent metadata are added, updated and/or removed
Given a list of "" metadata in "" folder which has been changed in a git repository
When a user launches a change set with force-dev-tool
@@ -59,10 +53,16 @@ Feature: Change Set: Handle Properties of Complex Metadata Types
And excluding any "" metadata in the change set
And the change set could be deployed correctly
+ @doing
+ Examples:
+ | parent | child | data |
+ | CustomObject | CustomField | complex-metadata/compactLayout-added |
+
Examples:
| parent | child | data |
| CustomObject | CustomField | complex-metadata/label-updated |
- # | CustomObject | CustomField | complex-metadata/compactLayout-added |
+ | CustomObject | CustomField | complex-metadata/pluralLabel-updated |
+ | CustomObject | CustomField | complex-metadata/compactLayout-added |
@todo @skipped
Scenario: Parent & child metadata are changed