Merge pull request 'Add email service and settings' (#154) from feature/email_service into master

Reviewed-on: #154
Reviewed-by: galfert <garret.alfert@gmail.com>

spec/models/user_spec.rb

@@ -66,9 +66,9 @@ RSpec.describe User, type: :model do
     it "returns the entries from the LDAP service attribute" do
       expect(user).to receive(:ldap_entry).and_return({
         uid: user.cn, ou: user.ou, mail: user.email, admin: nil,
-        service: ["discourse", "gitea", "wiki", "xmpp"]
+        service: ["discourse", "email", "gitea", "wiki", "xmpp"]
       })
-      expect(user.services_enabled).to eq(["discourse", "gitea", "wiki", "xmpp"])
+      expect(user.services_enabled).to eq(["discourse", "email", "gitea", "wiki", "xmpp"])
     end
   end
 
@@ -147,7 +147,7 @@ RSpec.describe User, type: :model do
     after { clear_enqueued_jobs }
 
     it "enables default services" do
-      expect(user).to receive(:enable_service).with(%w[ discourse gitea mediawiki xmpp ])
+      expect(user).to receive(:enable_service).with(%w[ discourse email gitea mediawiki xmpp ])
       user.send :devise_after_confirmation
     end