Merge branch 'upstream'

1 files changed, 0 insertions, 29 deletions

diff --git a/tests/test_message.rs b/tests/test_message.rs
deleted file mode 100644
index 71afcf5..0000000
--- a/tests/test_message.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-extern crate serde;
-extern crate serde_json;
-extern crate serenity;
-
-use serde::de::Deserialize;
-use serde_json::Value;
-use serenity::model::channel::Message;
-use std::fs::File;
-
-macro_rules! p {
-    ($s:ident, $filename:expr) => ({
-        let f = File::open(concat!("./tests/resources/", $filename, ".json")).unwrap();
-        let v = serde_json::from_reader::<File, Value>(f).unwrap();
-
-        $s::deserialize(v).unwrap()
-    })
-}
-
-#[test]
-fn test_footer_deser() {
-    let mut message = p!(Message, "message_footer_1");
-
-    assert_eq!(
-        message.embeds.remove(0).footer.unwrap().text,
-        "2005-09-26 - 2013-09-26"
-    );
-
-    p!(Message, "message_footer_2");
-}