Skip to content

Commit b2832e8

Browse files
stiwarisemanticbitsstiwarisemanticbits
authored
BB2-1647: Improved Email templates as per latest design (#1213)
* BB2-1647: Improved Email templates * Fixed tests
1 parent 2b86b4f commit b2832e8

File tree

7 files changed

+33
-163
lines changed

7 files changed

+33
-163
lines changed

‎apps/integration_tests/common_utils.py‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import jsonschema
2+
import re
23

34
from jsonschema import validate
45

@@ -11,3 +12,26 @@ def validate_json_schema(schema, content):
1112
print("jsonschema.exceptions.ValidationError: ", e)
1213
return False
1314
return True
15+
16+
17+
def extract_href_from_html(html):
18+
# Regular expression patterns
19+
# title_pattern = r'title="([^"]*)"'
20+
href_pattern = r'href="([^"]*)"'
21+
22+
# Search for title and href attributes
23+
# title_match = re.search(title_pattern, html)
24+
href_match = re.search(href_pattern, html)
25+
26+
# title = title_match.group(1) if title_match else None
27+
href = href_match.group(1) if href_match else None
28+
29+
return href
30+
31+
32+
def extract_last_part_of_url(url):
33+
# Split the URL by '/' and get the last part
34+
parts = url.rstrip('/').split('/')
35+
last_part = parts[-1]
36+
37+
return last_part

‎apps/integration_tests/selenium_cases.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class Action(Enum):
7474
# email notification subjects
7575
USER_ACCT_ACTIVATION_EMAIL_SUBJ = "Subject: Verify Your Blue Button 2.0 Developer Sandbox Account"
7676
USER_ACCT_1ST_APP_EMAIL_SUBJ = "Subject: Congrats on Registering Your First Application!"
77-
USER_ACCT_ACTIVATION_KEY_PREFIX = "Activation Key: "
77+
USER_ACCT_ACTIVATION_KEY_PREFIX = 'title="Verify Your Email"'
7878
APP_1ST_API_CALL_EMAIL_SUBJ = "Subject: Congrats on Making Your First API Call"
7979

8080
# create user account form fields

‎apps/integration_tests/selenium_generic.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from selenium.webdriver.support import expected_conditions as EC
88
from selenium.webdriver.support.wait import WebDriverWait
99
from selenium.webdriver.common.keys import Keys
10+
from .common_utils import extract_href_from_html, extract_last_part_of_url
1011

1112
from .selenium_cases import (
1213
Action,
@@ -96,9 +97,10 @@ def _validate_email_content(self, subj_line, key_line_prefix, **kwargs):
9697
if r.startswith(subj_line):
9798
# print("SUBJ: {}".format(r))
9899
email_subj_cnt += 1
99-
elif key_line_prefix is not None and r.startswith(key_line_prefix):
100+
elif key_line_prefix is not None and key_line_prefix in r:
100101
# print("KEY: {}".format(r))
101-
ak = r.split(key_line_prefix)[1]
102+
href = extract_href_from_html(r)
103+
ak = extract_last_part_of_url(href)
102104
key_cnt += 1
103105
else:
104106
pass

‎templates/email/email-activate.html‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<h2>Welcome to the Blue Button 2.0 Developer Sandbox!</h2>
1313

1414
<p style="font-size:18px !important;">To verify your email address and complete your signup, click the button below (Note, link will expire in {{ EXPIRATION }} days).</p>
15-
<p style="font-size:18px !important;">Activation Key: {{ ACTIVATION_KEY }}</p>
1615

1716
</td>
1817
</tr>

‎templates/email/email-activate.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ your signup:
88

99
{{ ACTIVATION_LINK }}
1010

11-
Activation Key: {{ ACTIVATION_KEY }}
1211
Note, link will expire in {{ EXPIRATION }} days!
1312

1413
{% endblock %}

‎templates/email/email-common-get-started-template.html‎

Lines changed: 2 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -16,160 +16,8 @@
1616
</td>
1717
</tr>
1818
</tbody>
19-
</table><table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnTextBlock" style="min-width:100%;">
20-
<tbody class="mcnTextBlockOuter">
21-
<tr>
22-
<td valign="top" class="mcnTextBlockInner" style="padding-top:9px;">
23-
<!--[if mso]>
24-
<table align="left" border="0" cellspacing="0" cellpadding="0" width="100%" style="width:100%;">
25-
<tr>
26-
<![endif]-->
27-
28-
<!--[if mso]>
29-
<td valign="top" width="599" style="width:599px;">
30-
<![endif]-->
31-
<table align="left" border="0" cellpadding="0" cellspacing="0" style="max-width:100%; min-width:100%;" width="100%" class="mcnTextContentContainer">
32-
<tbody><tr>
33-
34-
<td valign="top" class="mcnTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
35-
36-
<h2 class="null">Get started with Blue Button 2.0</h2>
37-
38-
</td>
39-
</tr>
40-
</tbody></table>
41-
<!--[if mso]>
42-
</td>
43-
<![endif]-->
44-
45-
<!--[if mso]>
46-
</tr>
47-
</table>
48-
<![endif]-->
49-
</td>
50-
</tr>
51-
</tbody>
52-
</table><table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnBoxedTextBlock" style="min-width:100%;">
53-
<!--[if gte mso 9]>
54-
<table align="center" border="0" cellspacing="0" cellpadding="0" width="100%">
55-
<![endif]-->
56-
<tbody class="mcnBoxedTextBlockOuter">
57-
<tr>
58-
<td valign="top" class="mcnBoxedTextBlockInner">
59-
60-
<!--[if gte mso 9]>
61-
<td align="center" valign="top" ">
62-
<![endif]-->
63-
<table align="left" border="0" cellpadding="0" cellspacing="0" width="100%" style="min-width:100%;" class="mcnBoxedTextContentContainer">
64-
<tbody><tr>
65-
66-
<td style="padding-top:9px; padding-left:18px; padding-bottom:9px; padding-right:18px;">
67-
68-
<table border="0" cellspacing="0" class="mcnTextContentContainer" width="100%" style="min-width: 100% !important;background-color: #F7F7F7;">
69-
<tbody><tr>
70-
<td valign="top" class="mcnTextContent" style="padding: 18px; text-align: center;">
71-
<h3 style="text-align:center;">Read Our&nbsp;Documentation</h3>
72-
73-
<p style="text-align:center !important;"><a href="https://bluebutton.cms.gov/developers/" target="_blank">Check out our documentation</a> to get your app up and running.</p>
74-
75-
</td>
76-
</tr>
77-
</tbody></table>
78-
</td>
79-
</tr>
80-
</tbody></table>
81-
<!--[if gte mso 9]>
82-
</td>
83-
<![endif]-->
84-
85-
<!--[if gte mso 9]>
86-
</tr>
87-
</table>
88-
<![endif]-->
89-
</td>
90-
</tr>
91-
</tbody>
92-
</table><table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnBoxedTextBlock" style="min-width:100%;">
93-
<!--[if gte mso 9]>
94-
<table align="center" border="0" cellspacing="0" cellpadding="0" width="100%">
95-
<![endif]-->
96-
<tbody class="mcnBoxedTextBlockOuter">
97-
<tr>
98-
<td valign="top" class="mcnBoxedTextBlockInner">
99-
100-
<!--[if gte mso 9]>
101-
<td align="center" valign="top" ">
102-
<![endif]-->
103-
<table align="left" border="0" cellpadding="0" cellspacing="0" width="100%" style="min-width:100%;" class="mcnBoxedTextContentContainer">
104-
<tbody><tr>
105-
106-
<td style="padding-top:9px; padding-left:18px; padding-bottom:9px; padding-right:18px;">
107-
108-
<table border="0" cellspacing="0" class="mcnTextContentContainer" width="100%" style="min-width: 100% !important;background-color: #F7F7F7;">
109-
<tbody><tr>
110-
<td valign="top" class="mcnTextContent" style="padding: 18px; text-align: center;">
111-
<h3 style="text-align:center;">Get Help and Support</h3>
112-
113-
<p style="text-align:center !important;">Join our <a href="https://groups.google.com/forum/#!forum/Developer-group-for-cms-blue-button-api" target="_blank">Google Group</a> to find the support you need.</p>
114-
115-
</td>
116-
</tr>
117-
</tbody></table>
118-
</td>
119-
</tr>
120-
</tbody></table>
121-
<!--[if gte mso 9]>
122-
</td>
123-
<![endif]-->
124-
125-
<!--[if gte mso 9]>
126-
</tr>
127-
</table>
128-
<![endif]-->
129-
</td>
130-
</tr>
131-
</tbody>
132-
</table><table border="0" cellpadding="0" cellspacing="0" width="100%" class="mcnBoxedTextBlock" style="min-width:100%;">
133-
<!--[if gte mso 9]>
134-
<table align="center" border="0" cellspacing="0" cellpadding="0" width="100%">
135-
<![endif]-->
136-
<tbody class="mcnBoxedTextBlockOuter">
137-
<tr>
138-
<td valign="top" class="mcnBoxedTextBlockInner">
139-
140-
<!--[if gte mso 9]>
141-
<td align="center" valign="top" ">
142-
<![endif]-->
143-
<table align="left" border="0" cellpadding="0" cellspacing="0" width="100%" style="min-width:100%;" class="mcnBoxedTextContentContainer">
144-
<tbody><tr>
145-
146-
<td style="padding-top:9px; padding-left:18px; padding-bottom:9px; padding-right:18px;">
147-
148-
<table border="0" cellspacing="0" class="mcnTextContentContainer" width="100%" style="min-width: 100% !important;background-color: #F7F7F7;">
149-
<tbody><tr>
150-
<td valign="top" class="mcnTextContent" style="padding: 18px; text-align: center;">
151-
<h3 style="text-align:center;"><strong>Get Started with Our Sample Apps</strong></h3>
152-
153-
<p style="text-align:center !important;">Our <a href="https://bluebutton.cms.gov/resources/" target="_blank">Blue Button 2.0 API Resources</a> can help make your idea a reality.</p>
154-
155-
</td>
156-
</tr>
157-
</tbody></table>
158-
</td>
159-
</tr>
160-
</tbody></table>
161-
<!--[if gte mso 9]>
162-
</td>
163-
<![endif]-->
164-
165-
<!--[if gte mso 9]>
166-
</tr>
167-
</table>
168-
<![endif]-->
169-
</td>
170-
</tr>
171-
</tbody>
172-
</table></td>
19+
</table>
20+
</td>
17321
</tr>
17422
</table>
17523
<!--[if (gte mso 9)|(IE)]>

‎templates/email/email-common-style-template.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,7 @@
155155
/*@editable*/background-size:cover;
156156
/*@editable*/border-top:0;
157157
/*@editable*/border-bottom:0;
158-
/*@editable*/padding-top:54px;
159-
/*@editable*/padding-bottom:54px;
158+
/*@editable*/height:40px;
160159
}
161160
/*
162161
@tab Header
@@ -255,8 +254,7 @@
255254
/*@editable*/background-size:cover;
256255
/*@editable*/border-top:0;
257256
/*@editable*/border-bottom:0;
258-
/*@editable*/padding-top:45px;
259-
/*@editable*/padding-bottom:63px;
257+
/*@editable*/height:40px;
260258
}
261259
/*
262260
@tab Footer

0 commit comments

Comments
 (0)