Merge branch 'master' into check-for-alias-in-file

Conflicts:
	src/tests.rs

1 files changed, 11 insertions, 11 deletions

diff --git a/src/tests.rs b/src/tests.rs
index 712b41e..c884188 100644
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -1,42 +1,42 @@
-use super::{build_alias, is_alias_in_file};
+use super::{Alias, is_alias_in_file};
 
 #[test]
-fn build_alias_with_only_email() {
+fn new_alias_with_only_email() {
     assert_eq!(
         "alias producer@765pro.ductions producer@765pro.ductions",
-        build_alias("From: producer@765pro.ductions")
+        Alias::new("From: producer@765pro.ductions").to_string()
     );
 }
 
 #[test]
-fn build_alias_with_1_name() {
+fn new_alias_with_1_name() {
     assert_eq!(
         "alias decim Decim <decim@quindecim.jp>",
-        build_alias("From: Decim <decim@quindecim.jp>")
+        Alias::new("From: Decim <decim@quindecim.jp>").to_string()
     );
 }
 
 #[test]
-fn build_alias_with_2_names() {
+fn new_alias_with_2_names() {
     assert_eq!(
         "alias farnsworth-hubert Hubert Farnsworth <professor@planetexpress.com>",
-        build_alias("From: Hubert Farnsworth <professor@planetexpress.com>")
+        Alias::new("From: Hubert Farnsworth <professor@planetexpress.com>").to_string()
     );
 }
 
 #[test]
-fn build_alias_with_3_names() {
+fn new_alias_with_3_names() {
     assert_eq!(
         "alias lab-harvard Harvard Innovation Lab <noreply@eventbrite.com>",
-        build_alias("From: Harvard Innovation Lab <noreply@eventbrite.com>")
+        Alias::new("From: Harvard Innovation Lab <noreply@eventbrite.com>").to_string()
     );
 }
 
 #[test]
-fn build_alias_with_special_characters() {
+fn new_alias_with_special_characters() {
     assert_eq!(
         "alias celty-ostrulson \"O'Strulson, Celty\" <celty@dollars.co>",
-        build_alias("From: \"O'Strulson, Celty\" <celty@dollars.co>")
+        Alias::new("From: \"O'Strulson, Celty\" <celty@dollars.co>").to_string()
     );
 }