104 files changed, 34 insertions, 62 deletions
diff --git a/users/app/assets/images/leap_web_users/.gitkeep b/app/assets/images/leap_web_users/.gitkeep
index e69de29..e69de29 100644
--- a/users/app/assets/images/leap_web_users/.gitkeep
+++ b/app/assets/images/leap_web_users/.gitkeep
diff --git a/users/app/assets/javascripts/leap_web_users/.gitkeep b/app/assets/javascripts/leap_web_users/.gitkeep
index e69de29..e69de29 100644
--- a/users/app/assets/javascripts/leap_web_users/.gitkeep
+++ b/app/assets/javascripts/leap_web_users/.gitkeep
diff --git a/users/app/assets/javascripts/users.js b/app/assets/javascripts/users.js
index 8486756..8486756 100644
--- a/users/app/assets/javascripts/users.js
+++ b/app/assets/javascripts/users.js
diff --git a/users/app/assets/stylesheets/leap_web_users/.gitkeep b/app/assets/stylesheets/leap_web_users/.gitkeep
index e69de29..e69de29 100644
--- a/users/app/assets/stylesheets/leap_web_users/.gitkeep
+++ b/app/assets/stylesheets/leap_web_users/.gitkeep
diff --git a/users/app/controllers/.gitkeep b/app/controllers/.gitkeep
index e69de29..e69de29 100644
--- a/users/app/controllers/.gitkeep
+++ b/app/controllers/.gitkeep
diff --git a/users/app/controllers/account_settings_controller.rb b/app/controllers/account_settings_controller.rb
index e69de29..e69de29 100644
--- a/users/app/controllers/account_settings_controller.rb
+++ b/app/controllers/account_settings_controller.rb
diff --git a/users/app/controllers/controller_extension/authentication.rb b/app/controllers/controller_extension/authentication.rb
index 03d3989..03d3989 100644
--- a/users/app/controllers/controller_extension/authentication.rb
+++ b/app/controllers/controller_extension/authentication.rb
diff --git a/users/app/controllers/controller_extension/token_authentication.rb b/app/controllers/controller_extension/token_authentication.rb
index 6e0a6ce..6e0a6ce 100644
--- a/users/app/controllers/controller_extension/token_authentication.rb
+++ b/app/controllers/controller_extension/token_authentication.rb
diff --git a/users/app/controllers/keys_controller.rb b/app/controllers/keys_controller.rb
index fb28901..fb28901 100644
--- a/users/app/controllers/keys_controller.rb
+++ b/app/controllers/keys_controller.rb
diff --git a/users/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 8919a4d..8919a4d 100644
--- a/users/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
diff --git a/users/app/controllers/users_base_controller.rb b/app/controllers/users_base_controller.rb
index 9becf0d..9becf0d 100644
--- a/users/app/controllers/users_base_controller.rb
+++ b/app/controllers/users_base_controller.rb
diff --git a/users/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c8e09b6..c8e09b6 100644
--- a/users/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
diff --git a/users/app/controllers/v1/messages_controller.rb b/app/controllers/v1/messages_controller.rb
index f71d0f1..f71d0f1 100644
--- a/users/app/controllers/v1/messages_controller.rb
+++ b/app/controllers/v1/messages_controller.rb
diff --git a/users/app/controllers/v1/sessions_controller.rb b/app/controllers/v1/sessions_controller.rb
index eae3a1e..eae3a1e 100644
--- a/users/app/controllers/v1/sessions_controller.rb
+++ b/app/controllers/v1/sessions_controller.rb
diff --git a/users/app/controllers/v1/users_controller.rb b/app/controllers/v1/users_controller.rb
index 8897d01..8897d01 100644
--- a/users/app/controllers/v1/users_controller.rb
+++ b/app/controllers/v1/users_controller.rb
diff --git a/users/app/controllers/webfinger_controller.rb b/app/controllers/webfinger_controller.rb
index 8872802..8872802 100644
--- a/users/app/controllers/webfinger_controller.rb
+++ b/app/controllers/webfinger_controller.rb
diff --git a/users/app/designs/message/by_user_ids_to_show.js b/app/designs/message/by_user_ids_to_show.js
index e33566b..e33566b 100644
--- a/users/app/designs/message/by_user_ids_to_show.js
+++ b/app/designs/message/by_user_ids_to_show.js
diff --git a/users/app/designs/message/by_user_ids_to_show_and_created_at.js b/app/designs/message/by_user_ids_to_show_and_created_at.js
index 54e4604..54e4604 100644
--- a/users/app/designs/message/by_user_ids_to_show_and_created_at.js
+++ b/app/designs/message/by_user_ids_to_show_and_created_at.js
diff --git a/users/app/designs/user/by_created_at_and_one_month_warning_not_sent.js b/app/designs/user/by_created_at_and_one_month_warning_not_sent.js
index 53a95de..53a95de 100644
--- a/users/app/designs/user/by_created_at_and_one_month_warning_not_sent.js
+++ b/app/designs/user/by_created_at_and_one_month_warning_not_sent.js
diff --git a/users/app/helpers/.gitkeep b/app/helpers/.gitkeep
index e69de29..e69de29 100644
--- a/users/app/helpers/.gitkeep
+++ b/app/helpers/.gitkeep
diff --git a/users/app/helpers/email_aliases_helper.rb b/app/helpers/email_aliases_helper.rb
index b56b068..b56b068 100644
--- a/users/app/helpers/email_aliases_helper.rb
+++ b/app/helpers/email_aliases_helper.rb
diff --git a/users/app/helpers/sessions_helper.rb b/app/helpers/sessions_helper.rb
index 309f8b2..309f8b2 100644
--- a/users/app/helpers/sessions_helper.rb
+++ b/app/helpers/sessions_helper.rb
diff --git a/users/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index f56faab..f56faab 100644
--- a/users/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
diff --git a/users/app/models/account.rb b/app/models/account.rb
index cf998e4..cf998e4 100644
--- a/users/app/models/account.rb
+++ b/app/models/account.rb
diff --git a/users/app/models/email.rb b/app/models/email.rb
index a9a503f..a9a503f 100644
--- a/users/app/models/email.rb
+++ b/app/models/email.rb
diff --git a/users/app/models/identity.rb b/app/models/identity.rb
index 9b97b51..9b97b51 100644
--- a/users/app/models/identity.rb
+++ b/app/models/identity.rb
diff --git a/users/app/models/local_email.rb b/app/models/local_email.rb
index 2b4c65e..2b4c65e 100644
--- a/users/app/models/local_email.rb
+++ b/app/models/local_email.rb
diff --git a/users/app/models/login_format_validation.rb b/app/models/login_format_validation.rb
index c1fcf70..c1fcf70 100644
--- a/users/app/models/login_format_validation.rb
+++ b/app/models/login_format_validation.rb
diff --git a/users/app/models/message.rb b/app/models/message.rb
index 424f094..424f094 100644
--- a/users/app/models/message.rb
+++ b/app/models/message.rb
diff --git a/users/app/models/pgp_key.rb b/app/models/pgp_key.rb
index 66f8660..66f8660 100644
--- a/users/app/models/pgp_key.rb
+++ b/app/models/pgp_key.rb
diff --git a/users/app/models/service_level.rb b/app/models/service_level.rb
index 299aaf1..299aaf1 100644
--- a/users/app/models/service_level.rb
+++ b/app/models/service_level.rb
diff --git a/users/app/models/session.rb b/app/models/session.rb
index 0d7e10e..0d7e10e 100644
--- a/users/app/models/session.rb
+++ b/app/models/session.rb
diff --git a/users/app/models/token.rb b/app/models/token.rb
index 4856c31..4856c31 100644
--- a/users/app/models/token.rb
+++ b/app/models/token.rb
diff --git a/users/app/models/unauthenticated_user.rb b/app/models/unauthenticated_user.rb
index 0fc17d2..0fc17d2 100644
--- a/users/app/models/unauthenticated_user.rb
+++ b/app/models/unauthenticated_user.rb
diff --git a/users/app/models/user.rb b/app/models/user.rb
index c297ac8..c297ac8 100644
--- a/users/app/models/user.rb
+++ b/app/models/user.rb
diff --git a/users/app/mailers/.gitkeep b/app/views/.gitkeep
index e69de29..e69de29 100644
--- a/users/app/mailers/.gitkeep
+++ b/app/views/.gitkeep
diff --git a/users/app/views/emails/_email.html.haml b/app/views/emails/_email.html.haml
index ea59cec..ea59cec 100644
--- a/users/app/views/emails/_email.html.haml
+++ b/app/views/emails/_email.html.haml
diff --git a/users/app/views/sessions/new.html.haml b/app/views/sessions/new.html.haml
index 771dc97..771dc97 100644
--- a/users/app/views/sessions/new.html.haml
+++ b/app/views/sessions/new.html.haml
diff --git a/users/app/views/sessions/new.json.erb b/app/views/sessions/new.json.erb
index 36154b8..36154b8 100644
--- a/users/app/views/sessions/new.json.erb
+++ b/app/views/sessions/new.json.erb
diff --git a/users/app/views/users/_change_password.html.haml b/app/views/users/_change_password.html.haml
index 425e3ee..425e3ee 100644
--- a/users/app/views/users/_change_password.html.haml
+++ b/app/views/users/_change_password.html.haml
diff --git a/users/app/views/users/_change_pgp_key.html.haml b/app/views/users/_change_pgp_key.html.haml
index e465125..e465125 100644
--- a/users/app/views/users/_change_pgp_key.html.haml
+++ b/app/views/users/_change_pgp_key.html.haml
diff --git a/users/app/views/users/_change_service_level.html.haml b/app/views/users/_change_service_level.html.haml
index 61e67d9..61e67d9 100644
--- a/users/app/views/users/_change_service_level.html.haml
+++ b/app/views/users/_change_service_level.html.haml
diff --git a/users/app/views/users/_destroy_account.html.haml b/app/views/users/_destroy_account.html.haml
index 445f3c4..445f3c4 100644
--- a/users/app/views/users/_destroy_account.html.haml
+++ b/app/views/users/_destroy_account.html.haml
diff --git a/users/app/views/users/_edit.html.haml b/app/views/users/_edit.html.haml
index 1d2b68a..1d2b68a 100644
--- a/users/app/views/users/_edit.html.haml
+++ b/app/views/users/_edit.html.haml
diff --git a/users/app/views/users/_user.html.haml b/app/views/users/_user.html.haml
index 583d22f..583d22f 100644
--- a/users/app/views/users/_user.html.haml
+++ b/app/views/users/_user.html.haml
diff --git a/users/app/views/users/_warnings.html.haml b/app/views/users/_warnings.html.haml
index 79ab103..79ab103 100644
--- a/users/app/views/users/_warnings.html.haml
+++ b/app/views/users/_warnings.html.haml
diff --git a/users/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 434c025..434c025 100644
--- a/users/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
diff --git a/users/app/views/users/index.html.haml b/app/views/users/index.html.haml
index fc1001e..fc1001e 100644
--- a/users/app/views/users/index.html.haml
+++ b/app/views/users/index.html.haml
diff --git a/users/app/views/users/new.html.haml b/app/views/users/new.html.haml
index aecf831..aecf831 100644
--- a/users/app/views/users/new.html.haml
+++ b/app/views/users/new.html.haml
diff --git a/users/app/views/users/show.html.haml b/app/views/users/show.html.haml
index c587017..c587017 100644
--- a/users/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
diff --git a/users/app/views/v1/sessions/new.json.erb b/app/views/v1/sessions/new.json.erb
index 36154b8..36154b8 100644
--- a/users/app/views/v1/sessions/new.json.erb
+++ b/app/views/v1/sessions/new.json.erb
diff --git a/users/app/views/webfinger/host_meta.xml.erb b/app/views/webfinger/host_meta.xml.erb
index cfcbcc0..cfcbcc0 100644
--- a/users/app/views/webfinger/host_meta.xml.erb
+++ b/app/views/webfinger/host_meta.xml.erb
diff --git a/users/app/views/webfinger/search.xml.erb b/app/views/webfinger/search.xml.erb
index 7328552..7328552 100644
--- a/users/app/views/webfinger/search.xml.erb
+++ b/app/views/webfinger/search.xml.erb
diff --git a/test/factories.rb b/test/factories.rb
index 6c671f8..98bb39b 100644
--- a/test/factories.rb
+++ b/test/factories.rb
@@ -1,3 +1,37 @@
 Dir.glob(Rails.root.join('**','test','factories.rb')) do |factory_file|
   require factory_file
 end
+FactoryGirl.define do
+
+  factory :user do
+    login { Faker::Internet.user_name }
+    password_verifier "1234ABCD"
+    password_salt "4321AB"
+
+    factory :user_with_settings do
+      email_forward { Faker::Internet.email }
+      email_aliases_attributes do
+        {:a => Faker::Internet.user_name + '@' + APP_CONFIG[:domain]}
+      end
+    end
+
+    factory :admin_user do
+      after(:build) do |admin|
+        admin.stubs(:is_admin?).returns(true)
+      end
+    end
+  end
+
+  factory :token do
+    user
+  end
+
+  factory :pgp_key do
+    keyblock <<-EOPGP
+-----BEGIN PGP PUBLIC KEY BLOCK-----
++Dummy+PGP+KEY+++Dummy+PGP+KEY+++Dummy+PGP+KEY+++Dummy+PGP+KEY+
+#{SecureRandom.base64(4032)}
+-----END PGP PUBLIC KEY BLOCK-----
+    EOPGP
+  end
+end
diff --git a/users/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index c4c922b..c4c922b 100644
--- a/users/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
diff --git a/users/test/functional/helper_methods_test.rb b/test/functional/helper_methods_test.rb
index 44226ae..44226ae 100644
--- a/users/test/functional/helper_methods_test.rb
+++ b/test/functional/helper_methods_test.rb
diff --git a/users/test/functional/keys_controller_test.rb b/test/functional/keys_controller_test.rb
index 863be93..863be93 100644
--- a/users/test/functional/keys_controller_test.rb
+++ b/test/functional/keys_controller_test.rb
diff --git a/users/test/functional/sessions_controller_test.rb b/test/functional/sessions_controller_test.rb
index fe7903f..fe7903f 100644
--- a/users/test/functional/sessions_controller_test.rb
+++ b/test/functional/sessions_controller_test.rb
diff --git a/users/test/functional/test_helpers_test.rb b/test/functional/test_helpers_test.rb
index 845e516..845e516 100644
--- a/users/test/functional/test_helpers_test.rb
+++ b/test/functional/test_helpers_test.rb
diff --git a/users/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 0713836..0713836 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
diff --git a/users/test/functional/v1/messages_controller_test.rb b/test/functional/v1/messages_controller_test.rb
index 24a5b1f..24a5b1f 100644
--- a/users/test/functional/v1/messages_controller_test.rb
+++ b/test/functional/v1/messages_controller_test.rb
diff --git a/users/test/functional/v1/sessions_controller_test.rb b/test/functional/v1/sessions_controller_test.rb
index df0d681..df0d681 100644
--- a/users/test/functional/v1/sessions_controller_test.rb
+++ b/test/functional/v1/sessions_controller_test.rb
diff --git a/users/test/functional/v1/users_controller_test.rb b/test/functional/v1/users_controller_test.rb
index 7cd9b0c..7cd9b0c 100644
--- a/users/test/functional/v1/users_controller_test.rb
+++ b/test/functional/v1/users_controller_test.rb
diff --git a/users/test/functional/webfinger_controller_test.rb b/test/functional/webfinger_controller_test.rb
index 6597b69..6597b69 100644
--- a/users/test/functional/webfinger_controller_test.rb
+++ b/test/functional/webfinger_controller_test.rb
diff --git a/users/test/integration/api/Readme.md b/test/integration/api/Readme.md
index 04363bd..04363bd 100644
--- a/users/test/integration/api/Readme.md
+++ b/test/integration/api/Readme.md
diff --git a/users/test/integration/api/login_test.rb b/test/integration/api/login_test.rb
index 92d153f..92d153f 100644
--- a/users/test/integration/api/login_test.rb
+++ b/test/integration/api/login_test.rb
diff --git a/users/test/integration/api/pgp_key_test.rb b/test/integration/api/pgp_key_test.rb
index 4c7fb4c..4c7fb4c 100644
--- a/users/test/integration/api/pgp_key_test.rb
+++ b/test/integration/api/pgp_key_test.rb
diff --git a/users/test/integration/api/python/flow_with_srp.py b/test/integration/api/python/flow_with_srp.py
index 9fc168b..9fc168b 100755
--- a/users/test/integration/api/python/flow_with_srp.py
+++ b/test/integration/api/python/flow_with_srp.py
diff --git a/users/test/integration/api/python/login_wrong_username.py b/test/integration/api/python/login_wrong_username.py
index 390f250..390f250 100755
--- a/users/test/integration/api/python/login_wrong_username.py
+++ b/test/integration/api/python/login_wrong_username.py
diff --git a/users/test/integration/api/python/signup.py b/test/integration/api/python/signup.py
index 0d3a4e0..0d3a4e0 100755
--- a/users/test/integration/api/python/signup.py
+++ b/test/integration/api/python/signup.py
diff --git a/users/test/integration/api/python/signup_and_login.py b/test/integration/api/python/signup_and_login.py
index ac611d7..ac611d7 100755
--- a/users/test/integration/api/python/signup_and_login.py
+++ b/test/integration/api/python/signup_and_login.py
diff --git a/users/test/integration/api/python/signup_and_login_wrong_password.py b/test/integration/api/python/signup_and_login_wrong_password.py
index 9efffa1..9efffa1 100755
--- a/users/test/integration/api/python/signup_and_login_wrong_password.py
+++ b/test/integration/api/python/signup_and_login_wrong_password.py
diff --git a/users/test/integration/api/python/umlauts.py b/test/integration/api/python/umlauts.py
index 96fecbf..96fecbf 100755
--- a/users/test/integration/api/python/umlauts.py
+++ b/test/integration/api/python/umlauts.py
diff --git a/users/test/integration/api/signup_test.rb b/test/integration/api/signup_test.rb
index 236c547..236c547 100644
--- a/users/test/integration/api/signup_test.rb
+++ b/test/integration/api/signup_test.rb
diff --git a/users/test/integration/api/srp_test.rb b/test/integration/api/srp_test.rb
index 946450e..946450e 100644
--- a/users/test/integration/api/srp_test.rb
+++ b/test/integration/api/srp_test.rb
diff --git a/users/test/integration/api/update_account_test.rb b/test/integration/api/update_account_test.rb
index 63429e7..63429e7 100644
--- a/users/test/integration/api/update_account_test.rb
+++ b/test/integration/api/update_account_test.rb
diff --git a/users/test/integration/browser/account_test.rb b/test/integration/browser/account_test.rb
index a5677ad..a5677ad 100644
--- a/users/test/integration/browser/account_test.rb
+++ b/test/integration/browser/account_test.rb
diff --git a/users/test/integration/browser/session_test.rb b/test/integration/browser/session_test.rb
index 3a41b3a..3a41b3a 100644
--- a/users/test/integration/browser/session_test.rb
+++ b/test/integration/browser/session_test.rb
diff --git a/users/test/integration/navigation_test.rb b/test/integration/navigation_test.rb
index eec8c0e..eec8c0e 100644
--- a/users/test/integration/navigation_test.rb
+++ b/test/integration/navigation_test.rb
diff --git a/users/test/leap_web_users_test.rb b/test/leap_web_users_test.rb
index f142e54..f142e54 100644
--- a/users/test/leap_web_users_test.rb
+++ b/test/leap_web_users_test.rb
diff --git a/users/test/support/auth_test_helper.rb b/test/support/auth_test_helper.rb
index 57f9f9b..57f9f9b 100644
--- a/users/test/support/auth_test_helper.rb
+++ b/test/support/auth_test_helper.rb
diff --git a/users/test/support/stub_record_helper.rb b/test/support/stub_record_helper.rb
index 25138a0..25138a0 100644
--- a/users/test/support/stub_record_helper.rb
+++ b/test/support/stub_record_helper.rb
diff --git a/users/test/support/time_test_helper.rb b/test/support/time_test_helper.rb
index f673f12..f673f12 100644
--- a/users/test/support/time_test_helper.rb
+++ b/test/support/time_test_helper.rb
diff --git a/users/test/unit/account_test.rb b/test/unit/account_test.rb
index 4fb3c3d..4fb3c3d 100644
--- a/users/test/unit/account_test.rb
+++ b/test/unit/account_test.rb
diff --git a/users/test/unit/helpers/session_helper_test.rb b/test/unit/helpers/session_helper_test.rb
index 2824733..2824733 100644
--- a/users/test/unit/helpers/session_helper_test.rb
+++ b/test/unit/helpers/session_helper_test.rb
diff --git a/users/test/unit/helpers/users_helper_test.rb b/test/unit/helpers/users_helper_test.rb
index 96af37a..96af37a 100644
--- a/users/test/unit/helpers/users_helper_test.rb
+++ b/test/unit/helpers/users_helper_test.rb
diff --git a/users/test/unit/identity_test.rb b/test/unit/identity_test.rb
index eca104f..eca104f 100644
--- a/users/test/unit/identity_test.rb
+++ b/test/unit/identity_test.rb
diff --git a/users/test/unit/local_email_test.rb b/test/unit/local_email_test.rb
index 20ee7f1..20ee7f1 100644
--- a/users/test/unit/local_email_test.rb
+++ b/test/unit/local_email_test.rb
diff --git a/users/test/unit/token_test.rb b/test/unit/token_test.rb
index a3c6cf6..a3c6cf6 100644
--- a/users/test/unit/token_test.rb
+++ b/test/unit/token_test.rb
diff --git a/users/test/unit/unauthenticated_user_test.rb b/test/unit/unauthenticated_user_test.rb
index e5fafb8..e5fafb8 100644
--- a/users/test/unit/unauthenticated_user_test.rb
+++ b/test/unit/unauthenticated_user_test.rb
diff --git a/users/test/unit/user_test.rb b/test/unit/user_test.rb
index ffbb7d8..ffbb7d8 100644
--- a/users/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
diff --git a/users/test/unit/warden_strategy_secure_remote_password_test.rb b/test/unit/warden_strategy_secure_remote_password_test.rb
index e6fcfbe..e6fcfbe 100644
--- a/users/test/unit/warden_strategy_secure_remote_password_test.rb
+++ b/test/unit/warden_strategy_secure_remote_password_test.rb
diff --git a/users/test/unit/webfinger/host_meta_presenter_test.rb b/test/unit/webfinger/host_meta_presenter_test.rb
index af86404..af86404 100644
--- a/users/test/unit/webfinger/host_meta_presenter_test.rb
+++ b/test/unit/webfinger/host_meta_presenter_test.rb
diff --git a/users/test/unit/webfinger/user_presenter_test.rb b/test/unit/webfinger/user_presenter_test.rb
index 04aeb22..04aeb22 100644
--- a/users/test/unit/webfinger/user_presenter_test.rb
+++ b/test/unit/webfinger/user_presenter_test.rb
diff --git a/users/app/assets/javascripts/srp b/users/app/assets/javascripts/srp
deleted file mode 160000
-Subproject 8f33d32d40b1e21ae7fb9a92c78a275422af421
diff --git a/users/app/models/.gitkeep b/users/app/models/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/users/app/models/.gitkeep
+++ /dev/null
diff --git a/users/app/views/.gitkeep b/users/app/views/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/users/app/views/.gitkeep
+++ /dev/null
diff --git a/users/test/factories.rb b/users/test/factories.rb
deleted file mode 100644
index ae00d43..0000000
--- a/users/test/factories.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-FactoryGirl.define do
-
-  factory :user do
-    login { Faker::Internet.user_name }
-    password_verifier "1234ABCD"
-    password_salt "4321AB"
-
-    factory :user_with_settings do
-      email_forward { Faker::Internet.email }
-      email_aliases_attributes do
-        {:a => Faker::Internet.user_name + '@' + APP_CONFIG[:domain]}
-      end
-    end
-
-    factory :admin_user do
-      after(:build) do |admin|
-        admin.stubs(:is_admin?).returns(true)
-      end
-    end
-  end
-
-  factory :token do
-    user
-  end
-
-  factory :pgp_key do
-    keyblock <<-EOPGP
------BEGIN PGP PUBLIC KEY BLOCK-----
-+Dummy+PGP+KEY+++Dummy+PGP+KEY+++Dummy+PGP+KEY+++Dummy+PGP+KEY+
-#{SecureRandom.base64(4032)}
------END PGP PUBLIC KEY BLOCK-----
-    EOPGP
-  end
-end
diff --git a/users/test/fixtures/.gitkeep b/users/test/fixtures/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/users/test/fixtures/.gitkeep
+++ /dev/null
diff --git a/users/test/functional/.gitkeep b/users/test/functional/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/users/test/functional/.gitkeep
+++ /dev/null
diff --git a/users/test/integration/.gitkeep b/users/test/integration/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/users/test/integration/.gitkeep
+++ /dev/null
diff --git a/users/test/test_helper.rb b/users/test/test_helper.rb
deleted file mode 100644
index 52dff53..0000000
--- a/users/test/test_helper.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path('../../../test/dummy/config/environment', __FILE__)
-require 'rails/test_help'
-require 'mocha/setup'
-
-Rails.backtrace_cleaner.remove_silencers!
-
-# Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
diff --git a/users/test/unit/.gitkeep b/users/test/unit/.gitkeep
deleted file mode 100644
index e69de29..0000000
--- a/users/test/unit/.gitkeep
+++ /dev/null
diff --git a/users/test/unit/email_test.rb b/users/test/unit/email_test.rb
deleted file mode 100644
index 7cfbc84..0000000
--- a/users/test/unit/email_test.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-require 'test_helper'
-
-class EmailTest < ActiveSupport::TestCase
-
-  test "valid format" do
-    email = Email.new(email_string)
-    assert email.valid?
-  end
-
-  test "validates format" do
-    email = Email.new("email")
-    assert !email.valid?
-    assert_equal ["needs to be a valid email address"], email.errors[:email]
-  end
-
-  def email_string
-    @email_string ||= Faker::Internet.email
-  end
-end