Fix no-feature tests

10 files changed, 135 insertions, 105 deletions

diff --git a/src/model/channel/reaction.rs b/src/model/channel/reaction.rs
index a9d17fa..c1413d5 100644
--- a/src/model/channel/reaction.rs
+++ b/src/model/channel/reaction.rs
@@ -241,6 +241,7 @@ impl ReactionType {
     }
 }
 
+#[cfg(feature="model")]
 impl From<char> for ReactionType {
     /// Creates a `ReactionType` from a `char`.
     ///
diff --git a/src/model/error.rs b/src/model/error.rs
index 17e657c..41c8f0a 100644
--- a/src/model/error.rs
+++ b/src/model/error.rs
@@ -13,11 +13,13 @@ use super::Permissions;
 /// re-ban all members with an odd discriminator:
 ///
 /// ```rust,no_run
+/// # #[cfg(feature="client")]
+/// # fn try_main() -> Result<(), Box<Error>> {
 /// use serenity::{Client, Error};
 /// use serenity::model::ModelError;
 /// use std::env;
 ///
-/// let token = env::var("DISCORD_BOT_TOKEN").unwrap();
+/// let token = env::var("DISCORD_BOT_TOKEN")?;
 /// let mut client = Client::new(&token);
 ///
 /// client.on_member_unban(|context, guild_id, user| {
@@ -38,6 +40,16 @@ use super::Permissions;
 ///         },
 ///     }
 /// });
+/// #     Ok(())
+/// # }
+/// #
+/// # #[cfg(feature="client")]
+/// # fn main() {
+/// #     try_main().unwrap();
+/// # }
+/// #
+/// # #[cfg(not(feature="client"))]
+/// # fn main() { }
 /// ```
 ///
 /// [`Error`]: ../enum.Error.html
diff --git a/tests/test_channels.rs b/tests/test_channels.rs
index 5ceb333..8da96a1 100644
--- a/tests/test_channels.rs
+++ b/tests/test_channels.rs
@@ -1,79 +1,82 @@
 extern crate serenity;
 
-use serenity::model::*;
-use std::collections::HashMap;
-use std::sync::{Arc, RwLock};
+#[cfg(feature="utils")]
+mod utils {
+    use serenity::model::*;
+    use std::collections::HashMap;
+    use std::sync::{Arc, RwLock};
 
-fn group() -> Group {
-    Group {
-        channel_id: ChannelId(1),
-        icon: None,
-        last_message_id: None,
-        last_pin_timestamp: None,
-        name: None,
-        owner_id: UserId(2),
-        recipients: HashMap::new(),
+    fn group() -> Group {
+        Group {
+            channel_id: ChannelId(1),
+            icon: None,
+            last_message_id: None,
+            last_pin_timestamp: None,
+            name: None,
+            owner_id: UserId(2),
+            recipients: HashMap::new(),
+        }
     }
-}
 
-fn guild_channel() -> GuildChannel {
-    GuildChannel {
-        id: ChannelId(1),
-        bitrate: None,
-        guild_id: GuildId(2),
-        kind: ChannelType::Text,
-        last_message_id: None,
-        last_pin_timestamp: None,
-        name: "nsfw-stuff".to_owned(),
-        permission_overwrites: vec![],
-        position: 0,
-        topic: None,
-        user_limit: None,
+    fn guild_channel() -> GuildChannel {
+        GuildChannel {
+            id: ChannelId(1),
+            bitrate: None,
+            guild_id: GuildId(2),
+            kind: ChannelType::Text,
+            last_message_id: None,
+            last_pin_timestamp: None,
+            name: "nsfw-stuff".to_owned(),
+            permission_overwrites: vec![],
+            position: 0,
+            topic: None,
+            user_limit: None,
+        }
     }
-}
 
-fn private_channel() -> PrivateChannel {
-    PrivateChannel {
-        id: ChannelId(1),
-        last_message_id: None,
-        last_pin_timestamp: None,
-        kind: ChannelType::Private,
-        recipient: Arc::new(RwLock::new(User {
-            id: UserId(2),
-            avatar: None,
-            bot: false,
-            discriminator: 1,
-            name: "ab".to_owned(),
-        })),
+    fn private_channel() -> PrivateChannel {
+        PrivateChannel {
+            id: ChannelId(1),
+            last_message_id: None,
+            last_pin_timestamp: None,
+            kind: ChannelType::Private,
+            recipient: Arc::new(RwLock::new(User {
+                id: UserId(2),
+                avatar: None,
+                bot: false,
+                discriminator: 1,
+                name: "ab".to_owned(),
+            })),
+        }
     }
-}
 
-#[test]
-fn nsfw_checks() {
-    let mut channel = guild_channel();
-    assert!(channel.is_nsfw());
-    channel.kind = ChannelType::Voice;
-    assert!(!channel.is_nsfw());
+    #[test]
+    fn nsfw_checks() {
+        let mut channel = guild_channel();
+        assert!(channel.is_nsfw());
+        channel.kind = ChannelType::Voice;
+        assert!(!channel.is_nsfw());
 
-    channel.kind = ChannelType::Text;
-    channel.name = "nsfw-".to_owned();
-    assert!(channel.is_nsfw());
+        channel.kind = ChannelType::Text;
+        channel.name = "nsfw-".to_owned();
+        assert!(channel.is_nsfw());
 
-    channel.name = "nsfw".to_owned();
-    assert!(channel.is_nsfw());
-    channel.kind = ChannelType::Voice;
-    assert!(!channel.is_nsfw());
-    channel.kind = ChannelType::Text;
+        channel.name = "nsfw".to_owned();
+        assert!(channel.is_nsfw());
+        channel.kind = ChannelType::Voice;
+        assert!(!channel.is_nsfw());
+        channel.kind = ChannelType::Text;
 
-    channel.name = "nsf".to_owned();
-    assert!(!channel.is_nsfw());
+        channel.name = "nsf".to_owned();
+        assert!(!channel.is_nsfw());
 
-    let channel = Channel::Guild(Arc::new(RwLock::new(channel)));
-    assert!(!channel.is_nsfw());
+        let channel = Channel::Guild(Arc::new(RwLock::new(channel)));
+        assert!(!channel.is_nsfw());
 
-    let group = group();
-    assert!(!group.is_nsfw());
+        let group = group();
+        assert!(!group.is_nsfw());
 
-    let private_channel = private_channel();
-    assert!(!private_channel.is_nsfw());
+        let private_channel = private_channel();
+        assert!(!private_channel.is_nsfw());
+    }
 }
diff --git a/tests/test_colour.rs b/tests/test_colour.rs
index 833f4e0..4cd11c0 100644
--- a/tests/test_colour.rs
+++ b/tests/test_colour.rs
@@ -1,3 +1,5 @@
+#![cfg(feature="utils")]
+
 extern crate serenity;
 
 use serenity::utils::Colour;
diff --git a/tests/test_create_embed.rs b/tests/test_create_embed.rs
index 8e9537d..527d3e8 100644
--- a/tests/test_create_embed.rs
+++ b/tests/test_create_embed.rs
@@ -1,3 +1,5 @@
+#![cfg(feature="utils")]
+
 #[macro_use] extern crate serde_json;
 extern crate serenity;
 
diff --git a/tests/test_formatters.rs b/tests/test_formatters.rs
index 787a3e2..ba21033 100644
--- a/tests/test_formatters.rs
+++ b/tests/test_formatters.rs
@@ -1,8 +1,6 @@
 extern crate serenity;
 
 use serenity::model::*;
-use serenity::utils::Colour;
-use std::sync::{Arc, RwLock};
 
 #[test]
 fn test_formatters() {
@@ -13,8 +11,12 @@ fn test_formatters() {
     assert_eq!(UserId(5).to_string(), "5");
 }
 
+#[cfg(feature="utils")]
 #[test]
 fn test_mention() {
+    use serenity::utils::Colour;
+    use std::sync::{Arc, RwLock};
+
     let channel = Channel::Guild(Arc::new(RwLock::new(GuildChannel {
         bitrate: None,
         guild_id: GuildId(1),
diff --git a/tests/test_msg_builder.rs b/tests/test_msg_builder.rs
index 8cead22..56767b8 100644
--- a/tests/test_msg_builder.rs
+++ b/tests/test_msg_builder.rs
@@ -1,3 +1,5 @@
+#![cfg(feature="utils")]
+
 extern crate serenity;
 
 use serenity::utils::MessageBuilder;
@@ -14,7 +16,6 @@ fn code_blocks() {
     assert_eq!(content, "```rb\ntest\n```");
 }
 
-
 #[test]
 fn safe_content() {
     let content = MessageBuilder::new()
@@ -23,7 +24,6 @@ fn safe_content() {
     assert_ne!(content, "@everyone discord.gg/discord-api");
 }
 
-
 #[test]
 fn no_free_formatting() {
     let content = MessageBuilder::new()
diff --git a/tests/test_parsers.rs b/tests/test_parsers.rs
index 768c7c4..7823ccb 100644
--- a/tests/test_parsers.rs
+++ b/tests/test_parsers.rs
@@ -1,3 +1,5 @@
+#![cfg(feature="utils")]
+
 extern crate serenity;
 
 use serenity::utils::*;
diff --git a/tests/test_prelude.rs b/tests/test_prelude.rs
index e8cf9cf..8c20540 100644
--- a/tests/test_prelude.rs
+++ b/tests/test_prelude.rs
@@ -1,4 +1,7 @@
 extern crate serenity;
 
 #[allow(unused_imports)]
-use serenity::prelude::{Client, ClientError, SerenityError, Mentionable};
+use serenity::prelude::{Mentionable, SerenityError};
+
+#[cfg(feature="client")]
+use serenity::prelude::{Client, ClientError};
diff --git a/tests/test_user.rs b/tests/test_user.rs
index 494e66b..d037dc2 100644
--- a/tests/test_user.rs
+++ b/tests/test_user.rs
@@ -1,46 +1,49 @@
 extern crate serenity;
 
-use serenity::model::{User, UserId};
-
-fn gen() -> User {
-    User {
-        id: UserId(210),
-        avatar: Some("abc".to_owned()),
-        bot: true,
-        discriminator: 1432,
-        name: "test".to_owned(),
+#[cfg(feature="model")]
+mod model {
+    use serenity::model::{User, UserId};
+
+    fn gen() -> User {
+        User {
+            id: UserId(210),
+            avatar: Some("abc".to_owned()),
+            bot: true,
+            discriminator: 1432,
+            name: "test".to_owned(),
+        }
     }
-}
 
-#[test]
-fn test_core() {
-    let mut user = gen();
+    #[test]
+    fn test_core() {
+        let mut user = gen();
 
-    assert!(user.avatar_url().unwrap().ends_with("/avatars/210/abc.webp?size=1024"));
-    assert!(user.static_avatar_url().unwrap().ends_with("/avatars/210/abc.webp?size=1024"));
+        assert!(user.avatar_url().unwrap().ends_with("/avatars/210/abc.webp?size=1024"));
+        assert!(user.static_avatar_url().unwrap().ends_with("/avatars/210/abc.webp?size=1024"));
 
-    user.avatar = Some("a_aaa".to_owned());
-    assert!(user.avatar_url().unwrap().ends_with("/avatars/210/a_aaa.gif?size=1024"));
-    assert!(user.static_avatar_url().unwrap().ends_with("/avatars/210/a_aaa.webp?size=1024"));
+        user.avatar = Some("a_aaa".to_owned());
+        assert!(user.avatar_url().unwrap().ends_with("/avatars/210/a_aaa.gif?size=1024"));
+        assert!(user.static_avatar_url().unwrap().ends_with("/avatars/210/a_aaa.webp?size=1024"));
 
-    user.avatar = None;
-    assert!(user.avatar_url().is_none());
+        user.avatar = None;
+        assert!(user.avatar_url().is_none());
 
-    assert_eq!(user.tag(), "test#1432");
-}
+        assert_eq!(user.tag(), "test#1432");
+    }
 
-#[test]
-fn default_avatars() {
-    let mut user = gen();
-
-    user.discriminator = 0;
-    assert!(user.default_avatar_url().ends_with("0.png"));
-    user.discriminator = 1;
-    assert!(user.default_avatar_url().ends_with("1.png"));
-    user.discriminator = 2;
-    assert!(user.default_avatar_url().ends_with("2.png"));
-    user.discriminator = 3;
-    assert!(user.default_avatar_url().ends_with("3.png"));
-    user.discriminator = 4;
-    assert!(user.default_avatar_url().ends_with("4.png"));
+    #[test]
+    fn default_avatars() {
+        let mut user = gen();
+
+        user.discriminator = 0;
+        assert!(user.default_avatar_url().ends_with("0.png"));
+        user.discriminator = 1;
+        assert!(user.default_avatar_url().ends_with("1.png"));
+        user.discriminator = 2;
+        assert!(user.default_avatar_url().ends_with("2.png"));
+        user.discriminator = 3;
+        assert!(user.default_avatar_url().ends_with("3.png"));
+        user.discriminator = 4;
+        assert!(user.default_avatar_url().ends_with("4.png"));
+    }
 }