fixes CNVS-11838
and then choose the host more intelligently to use one the user
can actually log in to
test plan
- have accounts on two shards, referred to as "account 1" and
"account 2" from now on
- have account domains that are resolvable for the accounts,
referred to as account1.canvas.dev and account2.canvas.dev from
now on
- have account 2 trust account 1 by POSTing to
account2.canvas.dev/api/v1/accounts/<account 2 id>/trust_links
with a site admin's auth token and setting
trust_link[managing_account_id] to account 1's global id.
you can now use users from account 1 on account 2
- regression test notifications, especially considering
notifications generated by account 2 that are sent to account 1
users.
- account 1 users should have links that use account1.canvas.dev
and have global ids for referenced objects that live on
account 2's shard,
e.g. account1.canvas.dev/courses/2~1/discussion_topics/2~30
- avatars should use the avatar owner's account domain
- account 2 users should have links that use account2.canvas.dev
and have local ids,
e.g. account2.canvas.dev/courses/1/discussion_topics/30
- following the links when the user receiving the notification is
logged in should take the user to the linked object
- following the links when not logged in should take the user to
a login page that they are able to log in to
- be sure to at least check:
context file downloads links (e.g. discussion topic attachments)
file downloads links (e.g. conversation message attachments)
avatars links
conversation notifications
discussion notifications
peer review notifications
Change-Id: Idebd247fee99a2b973d3fa6f4f2fca0e723d99a5
Reviewed-on: https://gerrit.instructure.com/31867
Tested-by: Jenkins
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
fixes CNVS-18195
removes the extra closing era construct from
the attachments area in both templates.
Also added specs, though this feels *close* to
a copy change I prefer having specs for bugs
if possible. With the amount of logic in
place in those templates it may make sense in
the long term to create some kind of message
presenter object that provides helper methods
that produce these interpolated values
and shift these template tests there at that
point.
Change-Id: I782b3fd8ae4bae7be490eadb5f2b404fc35cdd9d
Reviewed-on: https://gerrit.instructure.com/48169
Tested-by: Jenkins
Reviewed-by: Andrew Butterfield <abutterfield@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
Some avatars are insanley huge. This should fix that problem
Fixes CNVS-15478
Test Plan:
- Enable the Show email in notifications account preference
- Setup email servers
- Generate the folloowing notifications
- Announcement Reply
- Enable the notification preference
- Create an Announcement
- Reply to it
- Check email
- Conversation Message
- Create a Conversation
- Check email
- New Discussion Entry
- Create a discussion
- Add a comment to it
- Check email
- Submission Comment
- Not really sure??
- Submission Comment for Teacher
- Not really sure??
Change-Id: Iacb5059f06be1a4315be69cd9225504cae6267fb
Reviewed-on: https://gerrit.instructure.com/41183
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Brad Horrocks <bhorrocks@instructure.com>
Product-Review: Vincent Gonzalez <vgonzalez@instructure.com>
Reviewed-by: Joel Hough <joel@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Notifications that show the author email will now be mailto links to
that email.
Fixes CNVS-15430
Test Plan:
- Enable the Show email in notifications account preference
- Generate the folloowing notifications
- Announcement Reply
- Enable the notification preference
- Create an Announcement
- Reply to it
- Check /users/[user_id]/messages
- Conversation Message
- Create a Conversation
- Check /users/[user_id]/messages
- New Discussion Entry
- Create a discussion
- Add a comment to it
- Check /users/[user_id]/messages
- Submission Comment
- Not really sure??
- Submission Comment for Teacher
- Not really sure??
Change-Id: Iafab62d7492f749a8021bdf57d43c93315285e2f
Reviewed-on: https://gerrit.instructure.com/41111
Reviewed-by: Joel Hough <joel@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Product-Review: Brad Horrocks <bhorrocks@instructure.com>
fixes CNVS-15068
test plan
- cause a conversation message notification email to be sent
- ensure that the text and html versions of the email include text
saying that you can reply to the email to reply to the
conversation message
- cause a discussion entry notification email to be sent
- ensure that the html version of the email includes text saying
that you can reply to the email to reply to the comment (the text
version should have the text, too, but it was there before this
commit)
Change-Id: I79c40ecb55bd17eef96931bbb3f255768914fcc7
Reviewed-on: https://gerrit.instructure.com/39925
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
fixes CNVS-14220
test plan
- cause a conversation message notification to be sent
- check the html email notification that was sent
- ensure that the conversation subject appears in the message
Change-Id: Ie2e1c7cb2865e2cb9a1ac1763ade2eebd88dc373
Reviewed-on: https://gerrit.instructure.com/37716
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Matthew Wheeler <mwheeler@instructure.com>
Product-Review: Matthew Wheeler <mwheeler@instructure.com>
Tested-by: Matthew Wheeler <mwheeler@instructure.com>
QA-Review: Steven Shepherd <sshepherd@instructure.com>
Fixes: CNVS-12970
We needed an avatar and signature for notifications
sent out via conversations. Also reformatted all the
notifications to take on a cleaner and more easy to
read format.
The majority of testing can be done on the conversation
notifications. I was using letter opener to do this.
I have included letter opener and the relevant setup
stuff in this commit so that it can be tested.
Test-Plan:
-Make sure that your organization has allowed avatars
-Give a student or a teacher an avatar
-Send a conversation message to another user from
the user that has an avatar
-If you have letter_opener installed, the email
should be intercepted and you'll see its formatting.
Otherwise, use whatever method you'd like to view
the email.
-Verify that everything looks alright and we have
an avatar and good formatting.
-STEP 2-
-Disable avatars
-Send another email and verify that the avatar isn't
showing up
Change-Id: I876dc119c5daefa10811c75c08b315722a50f63d
Reviewed-on: https://gerrit.instructure.com/35144
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Ethan Vizitei <evizitei@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Drew Bowman <dbowman@instructure.com>
fixes CNVS-11269
test plan
- start conversations and send messages from new and old
conversations between users who share no contexts, one context,
two context, and >2 contexts
- ensure that the notification emails include shared courses next
to the author's name
- ensure that messages sent from new conversations only include
the selected context next to the author name
Change-Id: Ibc05752100dfb4b139c8dce64cfe1985987c6467
Reviewed-on: https://gerrit.instructure.com/30778
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Jon Willesen <jonw@instructure.com>
QA-Review: Trevor deHaan <tdehaan@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
fixes CNVS-5793
test plan:
* set a user's notification settings to ASAP;
* as another user, do the following and verify that
the email received contains messaging informing the
user that they can reply directly to the email:
* send a conversation message;
* comment on a discussion topic that the first user is
subscribed to;
* comment on one of the user's assignment submissions.
Change-Id: Iffe0763aad26579e5b5955f4f31e5e5242c14355
Reviewed-on: https://gerrit.instructure.com/29504
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: Braden Anderson <banderson@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Product-Review: Zach Pendleton <zachp@instructure.com>
fixes CNVS-10397
test plan
- set conversation message notification preference to asap
- send a conversation message from new conversations
- check the receiving user's notification messages
- ensure that the subject of the conversation appears in the
plain test and html versions of the message
- send a conversation message from old conversations
- check the receiving user's notification messages
- ensure that no subject appears in the plain test or html
versions of the message
- set conversation message notification preference to delayed
- send a conversation message from new conversations
- ensure that the summary notification message shows the subject
- send a conversation message from old conversations
- ensure that the summary notification message does not show a
subject
Change-Id: I5d333d6bb1daa16213974cc06b2c36aa74b53a73
Reviewed-on: https://gerrit.instructure.com/28740
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Matt Fairbourn <mfairbourn@instructure.com>
Reviewed-by: Braden Anderson <banderson@instructure.com>
Product-Review: Joel Hough <joel@instructure.com>
fixes CNVS-5493
test steps:
Trigger the following emails and ensure that the HTML and plain text
versions of the email appear proper.
* conversation message received
* new announcement
* new discussion entry
* new discussion topic
* updated wiki page
* summary (daily or weekly)
Change-Id: I9638badb500eeb6cb23e4a83bd8395cd5dc40608
Reviewed-on: https://gerrit.instructure.com/20296
Reviewed-by: Jon Jensen <jon@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
Product-Review: Eric Berry <ericb@instructure.com>
QA-Review: Eric Berry <ericb@instructure.com>
All of the outbound email notifications have been updated to have
a matching HTML version of the email in order for us to send multi-
part emails. There has also been some tweaking of the other email
messages (summary, plain text, etc) with a better looking layout
fixes CNVS-4728
fixes CNVS-4795
test steps:
- generate email messages for each template and review the results
in the users message list view (/users/1/messages)
Change-Id: I1fd9cf2b134209e42c8d174f19b50963e6502f6a
Reviewed-on: https://gerrit.instructure.com/18942
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Marc LeGendre <marc@instructure.com>
Reviewed-by: Zach Pendleton <zachp@instructure.com>
Product-Review: Eric Berry <ericb@instructure.com>
Cody Cutrer