From f9c20b0c40a4f20944a1cf60bc0bbf0bafd174ea Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 15 Oct 2019 07:35:23 -0700
Subject: [PATCH] afform_mock - Tweak example names/text

---
 ext/afform/mock/ang/afExamplePage.aff.html         |  3 ---
 ext/afform/mock/ang/afExamplePage.aff.json         |  1 -
 ext/afform/mock/ang/afex.aff.json                  |  2 +-
 ...elibBareFile.aff.html => mockBareFile.aff.html} |  0
 .../ang/{fakelibFoo.aff.html => mockFoo.aff.html}  |  0
 .../ang/{fakelibFoo.aff.json => mockFoo.aff.json}  |  0
 ext/afform/mock/ang/mockPage.aff.html              |  3 +++
 ext/afform/mock/ang/mockPage.aff.json              |  1 +
 ext/afform/mock/ang/testAfform.aff.html            | 14 +++++++++-----
 .../mock/tests/phpunit/api/v4/AfformTest.php       |  8 ++++----
 10 files changed, 18 insertions(+), 14 deletions(-)
 delete mode 100644 ext/afform/mock/ang/afExamplePage.aff.html
 delete mode 100644 ext/afform/mock/ang/afExamplePage.aff.json
 rename ext/afform/mock/ang/{fakelibBareFile.aff.html => mockBareFile.aff.html} (100%)
 rename ext/afform/mock/ang/{fakelibFoo.aff.html => mockFoo.aff.html} (100%)
 rename ext/afform/mock/ang/{fakelibFoo.aff.json => mockFoo.aff.json} (100%)
 create mode 100644 ext/afform/mock/ang/mockPage.aff.html
 create mode 100644 ext/afform/mock/ang/mockPage.aff.json

diff --git a/ext/afform/mock/ang/afExamplePage.aff.html b/ext/afform/mock/ang/afExamplePage.aff.html
deleted file mode 100644
index 801da89856..0000000000
--- a/ext/afform/mock/ang/afExamplePage.aff.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>Hello {{routeParams.name}}.</div>
-<div>The foo says "<span fakelib-foo/>".</div>
-<div>The bare file says "<span fakelib-bare-file/>"</div>
diff --git a/ext/afform/mock/ang/afExamplePage.aff.json b/ext/afform/mock/ang/afExamplePage.aff.json
deleted file mode 100644
index 5aad8afd2c..0000000000
--- a/ext/afform/mock/ang/afExamplePage.aff.json
+++ /dev/null
@@ -1 +0,0 @@
-{"server_route": "civicrm/example-page", "requires":["fakelibFoo", "fakelibBareFile"]}
diff --git a/ext/afform/mock/ang/afex.aff.json b/ext/afform/mock/ang/afex.aff.json
index a68f14a381..7cb07054e8 100644
--- a/ext/afform/mock/ang/afex.aff.json
+++ b/ext/afform/mock/ang/afex.aff.json
@@ -1,4 +1,4 @@
 {
   "server_route": "civicrm/afex",
-  "requires":["fakelibFoo", "fakelibBareFile", "af", "afBlock", "afField"]
+  "requires":["mockFoo", "mockBareFile", "af", "afBlock", "afField"]
 }
diff --git a/ext/afform/mock/ang/fakelibBareFile.aff.html b/ext/afform/mock/ang/mockBareFile.aff.html
similarity index 100%
rename from ext/afform/mock/ang/fakelibBareFile.aff.html
rename to ext/afform/mock/ang/mockBareFile.aff.html
diff --git a/ext/afform/mock/ang/fakelibFoo.aff.html b/ext/afform/mock/ang/mockFoo.aff.html
similarity index 100%
rename from ext/afform/mock/ang/fakelibFoo.aff.html
rename to ext/afform/mock/ang/mockFoo.aff.html
diff --git a/ext/afform/mock/ang/fakelibFoo.aff.json b/ext/afform/mock/ang/mockFoo.aff.json
similarity index 100%
rename from ext/afform/mock/ang/fakelibFoo.aff.json
rename to ext/afform/mock/ang/mockFoo.aff.json
diff --git a/ext/afform/mock/ang/mockPage.aff.html b/ext/afform/mock/ang/mockPage.aff.html
new file mode 100644
index 0000000000..d3300ca8b7
--- /dev/null
+++ b/ext/afform/mock/ang/mockPage.aff.html
@@ -0,0 +1,3 @@
+<div>Hello {{routeParams.name}}.</div>
+<div>The foo says "<span mock-foo/>".</div>
+<div>The bare file says "<span mock-bare-file/>"</div>
diff --git a/ext/afform/mock/ang/mockPage.aff.json b/ext/afform/mock/ang/mockPage.aff.json
new file mode 100644
index 0000000000..bd3a6baf25
--- /dev/null
+++ b/ext/afform/mock/ang/mockPage.aff.json
@@ -0,0 +1 @@
+{"server_route": "civicrm/mock-page", "requires":["mockFoo", "mockBareFile"]}
diff --git a/ext/afform/mock/ang/testAfform.aff.html b/ext/afform/mock/ang/testAfform.aff.html
index ec38eb1805..a8fecdb4f3 100644
--- a/ext/afform/mock/ang/testAfform.aff.html
+++ b/ext/afform/mock/ang/testAfform.aff.html
@@ -2,21 +2,25 @@
   <div crm-ui-debug="modelListCtrl.getEntity('parent')" />
   <div crm-ui-debug="modelListCtrl.getData('parent')" />
   <af-entity type="Contact" data="{contact_type: 'Individual'}" name="parent" label="Parent" url-autofill="1" autofill="user" />
-  <af-entity type="Contact" name="spouse" label="Spouse" url-autofill="1" />
+  <af-entity type="Contact" data="{contact_type: 'Individual'}" name="spouse" label="Spouse" contact-relationship="['Spouse of', 'parent']" />
 
   <af-fieldset model="parent">
-    <af-field name="first_name" defn='{title: ts("Your First Name")}' />
+    <h3>About You</h3>
+
+    <af-field name="first_name" />
     <af-field name="last_name" />
-    <af-field name="contact_sub_type" defn="{widget: hidden}" value="Student" />
     <af-field name="gender_id" />
     <af-field name="constituent_information.Marital_Status" />
     <af-field name="constituent_information.Marriage_Date" />
     <af-field name="constituent_information.Most_Important_Issue" />
   </af-fieldset>
 
-  <af-fieldset model="spouse">
+  <af-fieldset model="spouse" ng-if="modelListCtrl.getData('parent')['constituent_information.Marital_Status'] == 'M'">
+    <h3>About Your Spouse</h3>
+
     <af-field name="first_name" defn='{title: ts("Spouse First Name")}' />
-    <af-field name="last_name" />
+    <af-field name="last_name" defn='{title: ts("Spouse Last Name")}' />
+    <af-field name="do_not_email" />
   </af-fieldset>
 
   <!-- General elements: FIELDSET, UL, BUTTON, P, H1 should work anywhere -->
diff --git a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
index 097b2a7759..2bbc3e106c 100644
--- a/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
+++ b/ext/afform/mock/tests/phpunit/api/v4/AfformTest.php
@@ -9,9 +9,9 @@ class api_v4_AfformTest extends api_v4_AfformTestCase {
 
   public function getBasicDirectives() {
     return [
-      ['afExamplePage', ['title' => '', 'description' => '', 'server_route' => 'civicrm/example-page']],
-      ['fakelibBareFile', ['title' => '', 'description' => '']],
-      ['fakelibFoo', ['title' => '', 'description' => '']],
+      ['mockPage', ['title' => '', 'description' => '', 'server_route' => 'civicrm/mock-page']],
+      ['mockBareFile', ['title' => '', 'description' => '']],
+      ['mockFoo', ['title' => '', 'description' => '']],
     ];
   }
 
@@ -69,7 +69,7 @@ class api_v4_AfformTest extends api_v4_AfformTestCase {
       $formats = ['html', 'shallow', 'deep'];
       foreach ($formats as $updateFormat) {
         foreach ($formats as $readFormat) {
-          $es[] = ['fakelibBareFile', $updateFormat, $example[$updateFormat], $readFormat, $example[$readFormat], $exampleFile];
+          $es[] = ['mockBareFile', $updateFormat, $example[$updateFormat], $readFormat, $example[$readFormat], $exampleFile];
         }
       }
     }
-- 
2.25.1