merge master into feature/run-apex-tests

SFDO-Tooling · Nov 1, 2016 · 202f92e · 202f92e
2 parents 0289211 + 3e1891e
commit 202f92e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/build/admin_profile.xml b/build/admin_profile.xml
@@ -4,6 +4,7 @@
         <members>*</members>
         <members>Account</members>
         <members>Campaign</members>
+        <members>CampaignMember</members>
         <members>Contact</members>
         <members>Lead</members>
         <members>Opportunity</members>

diff --git a/cumulusci/tasks/metadata/metadata_map_manual.yml b/cumulusci/tasks/metadata/metadata_map_manual.yml
@@ -16,6 +16,10 @@ components:
 connectedApps:
     - type: ConnectedApp
       class: MetadataFilenameParser
+contentassets:
+    - type: ContentAsset
+      class: MetadataFilenameParser
+      extension: asset
 customMetadata:
     - type: CustomMetadata
       class: MetadataFilenameParser
@@ -31,6 +35,18 @@ documents:
 email:
     - type: EmailTemplate
       class: MetadataFolderParser
+flexipages:
+    - type: FlexiPage
+      class: MetadataFilenameParser
+      extension: flexipage
+globalPicklist:
+    - type: GlobalPicklist
+      class: MetadataFilenameParser
+      extension: globalPicklist
+globalValueSets:
+    - type: GlobalValueSet
+      class: MetadataFilenameParser
+      extension: globalValueSet
 homePageComponents:
     - type: HomePageComponent
       class: MetadataFilenameParser
@@ -179,3 +195,8 @@ workflows:
       extension: workflow
       options:
             item_xpath: './sf:rules'
+    - type: WorkflowTask
+      class: MetadataXmlElementParser
+      extension: workflow
+      options:
+            item_xpath: './sf:tasks'
diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ mock
 sarge==0.1.4
 requests[security]==2.9.1
 responses==0.5.1
-selenium
+selenium==2.52
 simple-salesforce==0.68.1
 HiYaPyCo==0.4.8
 PyCrypto==2.6.1