Merge branch 'master' of github.com:unitedstates/contact-congress

tvroom · Apr 16, 2014 · d5e6bf1 · d5e6bf1
2 parents 689cbdc + cfc26c7
commit d5e6bf1
Show file tree

Hide file tree

Showing 6 changed files with 669 additions and 231 deletions.
diff --git a/members/B001243.yaml b/members/B001243.yaml
@@ -48,7 +48,7 @@ contact_form:
         - name: required-message
           selector: "form.zipform textarea[name='required-message']"
           value: $MESSAGE
-          required: true
+          required: false
     - select:
         - name: required-prefix
           selector: "form.zipform select[name='required-prefix']"
@@ -61,7 +61,7 @@ contact_form:
             - Miss
         - name: required-state
           selector: "form.zipform select[name='required-state']"
-          value: $ADDRESS_STATE_POSTAL_ABBREV
+          value: TN
           required: true
           options:
             - AK
@@ -118,7 +118,7 @@ contact_form:
         - name: required-issue
           selector: "form.zipform select[name='required-issue']"
           value: $TOPIC
-          required: true
+          required: false
           options:
             Agriculture: AGR
             Budget: BUD
@@ -150,4 +150,4 @@ contact_form:
     headers:
       status: 200
     body:
-      contains: Thank you for contacting my office.
+      contains: "Thank you for contacting my office."
diff --git a/members/B001256.yaml b/members/B001256.yaml
@@ -1,105 +1,107 @@
 bioguide: B001256
 contact_form:
-  method: POST
-  action: ""
+  method: post
+  action: "/htbin/formproc_za/zip-auth.txt&form=/contact/email-michele-zip-authenticated&nobase&fpGetVer=2"
   steps:
-    - visit: https://bachmann.house.gov/contact/email-michele
+    - visit: "https://bachmann.house.gov/contact/email-michele"
     - fill_in:
-      - name: zipcode
-        selector: "#required-zip5"
-        value: $ADDRESS_ZIP5
-        required: Yes
-      - name: zipfour
-        selector: "#zip4"
-        value: $ADDRESS_ZIP4
+        - name: required-zip5
+          selector: "#required-zip5"
+          value: $ADDRESS_ZIP5
+          required: true
+        - name: zip4
+          selector: "#zip4"
+          value: $ADDRESS_ZIP4
+          required: true
     - click_on:
-      - value: "Go To Next Step"
-        selector: "#submit"
-    - find:
-      - selector: "#contactForm"
+        - value: Go To Next Step
+          selector: "#submit"
     - fill_in:
-      - name: prefix
-        selector: "#prefix"
-        value: $NAME_PREFIX
-      - name: firstname
-        selector: "#required-first"
-        value: $NAME_FIRST
-        required: Yes
-      - name: lastname
-        selector: "#required-last"
-        value: $NAME_LAST
-        required: Yes
-      - name: street
-        selector: "#required-address"
-        value: $ADDRESS_STREET
-        required: Yes
-      - name: street2
-        selector: "#address2"
-        value: $ADDRESS_STREET_2
-      - name: city
-        selector: "#required-city"
-        value: $ADDRESS_CITY
-        required: Yes
-      - name: emailaddress
-        selector: "#required-valid-email"
-        value: $EMAIL
-        required: Yes
-      - name: phone
-        selector: "#phone"
-        value: $PHONE
-      - name: subject
-        selector: "#required-subject"
-        value: $SUBJECT
-        required: Yes
-      - name: message
-        selector: "#required-message"
-        value: $MESSAGE
-        required: Yes
+        - name: prefix
+          selector: "#prefix"
+          value: $NAME_PREFIX
+          required: false
+        - name: required-first
+          selector: "#required-first"
+          value: $NAME_FIRST
+          required: true
+        - name: required-last
+          selector: "#required-last"
+          value: $NAME_LAST
+          required: true
+        - name: required-address
+          selector: "#required-address"
+          value: $ADDRESS_STREET
+          required: true
+        - name: address2
+          selector: "#address2"
+          value: $ADDRESS_STREET_2
+          required: false
+        - name: required-city
+          selector: "#required-city"
+          value: $ADDRESS_CITY
+          required: true
+        - name: required-valid-email
+          selector: "#required-valid-email"
+          value: $EMAIL
+          required: true
+        - name: phone
+          selector: "#phone"
+          value: $PHONE
+          required: false
+        - name: required-subject
+          selector: "#required-subject"
+          value: $SUBJECT
+          required: true
+        - name: required-message
+          selector: "#required-message"
+          value: $MESSAGE
+          required: true
     - select:
-      - name: issue
-        selector: "#required-issue"
-        value: $TOPIC
-        required: Yes
-        options:
-          - "Agriculture"
-          - "Animals"
-          - "Arts and Humanities"
-          - "Badger Army Ammunition Plant"
-          - "Banking and Finance"
-          - "Budget and Economy"
-          - "Campaign Finance Reform"
-          - "Congress and Elections"
-          - "District of Columbia--Tours"
-          - "Defense and Military"
-          - "Education"
-          - "Energy"
-          - "Environment"
-          - "Federal Employees"
-          - "Foreign Relations"
-          - "Guns"
-          - "Health"
-          - "Housing and Urban Development"
-          - "Immigration"
-          - "Judiciary"
-          - "Labor"
-          - "LGBT"
-          - "Post Office"
-          - "Science and Technology"
-          - "Senior Citizens"
-          - "Social Security"
-          - "Social Services"
-          - "Taxes"
-          - "Telecommunications"
-          - "Transportation"
-          - "Trade"
-          - "Veterans"
-          - "Women's Issues"
-          - "Other Issues"
-      - click_on:
-          - value: "Send Email"
-            selector: "#submit"
+        - name: required-issue
+          selector: "#required-issue"
+          value: $TOPIC
+          required: true
+          options:
+            Agriculture: AG
+            Animals: AN
+            Arts and Humanities: ART
+            Badger Army Ammunition Plant: BAAP
+            Banking and Finance: BANK
+            Budget and Economy: BUD
+            Campaign Finance Reform: CFR
+            Congress and Elections: CONG
+            District of Columbia--Tours: TOUR
+            Defense and Military: DEF
+            Education: ED
+            Energy: EN
+            Environment: ENV
+            Federal Employees: FED
+            Foreign Relations: FR
+            Guns: GUN
+            Health: HE
+            Housing and Urban Development: HUD
+            Immigration: IM
+            Judiciary: JUD
+            Labor: LAB
+            LGBT: LGBT
+            Post Office: POST
+            Science and Technology: SCI
+            Senior Citizens: SENIORS
+            Social Security: SS
+            Social Services: SOC.SERVICES
+            Taxes: TAX
+            Telecommunications: COMM
+            Transportation: TRAN
+            Trade: TRD
+            Veterans: VET
+            "Women's Issues": WOMEN
+            Other Issues: OTHER
+    - click_on:
+        - value: Send Email
+          selector: "#submit"
   success:
     headers:
       status: 200
     body:
-      contains: "Thank You"
+      contains: Thank You