sugoi-mail 0.1.0 → 0.1.5

data/test/functional/mailservice_controller_test.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'mailservice_controller'
 require 'net-smtp-stub'
+require 'pp'
 
 # Re-raise errors caught by the controller.
 class MailserviceController; def rescue_action(e) raise e end; end
@@ -95,7 +96,8 @@ class TC_Mailservice_DomainLogin < MailserviceControllerTest
 
     def test_baddomain
         # bad username, bad password
-        assert_equal(false, invoke(:domain_login,"junkdomain", "blort"))
+        assert_equal(false, invoke(:domain_login,"junkdomain", "blort"), 
+                     "logging in shouldn't have worked here")
        
         # good username, bad password
         assert_equal(false, invoke(:domain_login,@domain_name, "blort"))
@@ -140,7 +142,7 @@ class TC_Mailservice_TroublesomeAdminTask < MailserviceDomainAdmin
             assert invoke(:is_admin)
         end
         assert_nothing_raised do 
-            assert invoke(:admin_user_signup,"newuser", "password", "password")
+            assert invoke(:admin_user_signup,"newuser", "New User", "password", "password", false, false)
         end
 
         # user exists, login succeeds
@@ -156,19 +158,27 @@ class TC_Mailservice_TroublesomeAdminTask < MailserviceDomainAdmin
     end
 end
 
+class TC_Mailservice_DeleteSelf < MailserviceDomainAdmin
+    def test_deleteself
+        assert_raises RuntimeError do
+            invoke(:admin_user_delete, "root", "root")
+        end
+    end
+end
+
 class TC_Mailservice_AdminTasks_UserCreation < MailserviceDomainAdmin
     def test_passwordmismatch
         assert invoke(:is_admin)
         # password doesn't match
         assert_raises RuntimeError do
-            invoke(:admin_user_signup,"newuser", "password", "drowssap")
+            invoke(:admin_user_signup,"newuser", "New User", "password", "drowssap", false, false)
         end
     end
 
     def test_usercreate
         # user doesn't exist; gets created
         assert invoke(:is_admin)
-        assert invoke(:admin_user_signup,"newuser", "password", "password")
+        assert invoke(:admin_user_signup,"newuser", "New User", "password", "password", false, false)
         assert_raises RuntimeError do
             assert invoke(:admin_user_delete,"newuser", "resuwen"), 
                  "login and confirmation don't match on delete"
@@ -183,10 +193,10 @@ class TC_Mailservice_AdminTasks_UserCreation < MailserviceDomainAdmin
         assert_nothing_raised do
             assert invoke(:is_admin)
         end
-        assert invoke(:admin_user_signup,"newuser", "password", "password")
+        assert invoke(:admin_user_signup,"newuser", "New User", "password", "password", false, false)
         # user already exists; creation fails
         assert_raises RuntimeError do
-            invoke(:admin_user_signup,"newuser", "password", "password")
+            invoke(:admin_user_signup,"newuser", "New User", "password", "password", false, false)
         end
         assert invoke(:admin_user_delete,"newuser", "newuser")
     end
@@ -204,6 +214,14 @@ class TC_Mailservice_AdminTasks_UserCreation < MailserviceDomainAdmin
                        [ "nodesc", nil ],
                        [ "proxuser", "Proxy Mailing List" ]
                        ].sort, list.sort
+
+        list = nil
+        assert_nothing_raised do
+            list = invoke :admin_user_collection
+        end
+        assert list
+        assert_equal [ @admin_name, "testuser", "virtuser", "nodesc",
+                       "proxuser" ].sort, list.map { |u| u.login }.sort
     end
 
 end
@@ -214,30 +232,47 @@ class TC_Mailservice_AdminTasks_UserDeletion < MailserviceDomainAdmin
             assert invoke(:is_admin)
         end
 
+        # Check the user isn't there
+        assert_equal 0, User.find_all_by_login("newuser").length
+
         # create the user
+        result = nil
         assert_nothing_raised do
-            assert invoke(:admin_user_signup,"newuser", "password", "password")
+            result = invoke(:admin_user_signup,"newuser", "New User", "password", "password", false, false)
         end
+        assert_equal true, result, "user to be deleted successfully created"
+
+        assert_equal 1, User.find_all_by_login("newuser").length
 
         # user exists; deletion succeeds
+        result = nil
         assert_nothing_raised do
-            assert invoke(:admin_user_delete,"newuser", "newuser")
+            result=invoke(:admin_user_delete,"newuser", "newuser")
         end
+        assert_equal true, result, "user delete should succeed"
+
+        assert_equal [], User.find_all_by_login("newuser")
 
         # user doesn't exist; login fails
+        result=nil
         assert_nothing_raised do
-            assert_equal false, invoke(:user_login,"newuser", "password")
+            result=invoke(:user_login,"newuser", "password")
         end
+        assert_equal false, result, "deleted user shouldn't be able to log in"
 
         # okay, our session's just been trashed again.  Get it back.
+        result=nil
         assert_nothing_raised do
-            assert invoke(:user_login,@admin_name, "foobar")
+            result=invoke(:user_login,@admin_name, "foobar")
         end
+        assert_equal result, true
 
         # user doesn't exist; deletion fails
+        result=nil
         assert_nothing_raised do
-            assert_equal false, invoke(:admin_user_delete,"newuser", "newuser")
+            result = invoke(:admin_user_delete,"newuser", "newuser")
         end
+        assert_equal false, result
     end
 end
 
@@ -269,6 +304,38 @@ class TC_Mailservice_AdminTasks_UserPasswords < MailserviceDomainAdmin
     end
 end
 
+class TC_Mailservice_AdminTasks_AllMailinglists < MailserviceDomainAdmin
+    def test_all_mailinglists 
+        assert invoke(:is_admin)
+
+        result = nil
+        assert_nothing_raised do
+            result = invoke(:admin_mailinglists_all)
+        end
+
+        assert_equal ["nodesc", "nodescml", "proxuser", "root", 
+                      "testml", "testuser", "virtml", "virtuser"], 
+            result.map { |ml| ml.name }.sort
+    end
+end
+
+# class TC_Mailservice_AdminTasks_Users < MailserviceDomainAdmin
+#     def test_user_collection
+#         assert invoke :is_admin
+#         collection = nil
+#         assert_nothing_raised do
+#             collection = invoke :admin_user_collection
+#         end
+#         assert_equal(@loaded_fixtures["users"].find_all do |user|
+#             pp user
+#             user["domain_id"] == "1"
+#         end.map do |user|
+#                 user.id.to_i
+#         end.sort, collection.map { |u| u.id }.sort)
+#     end
+# end
+    
+
 class TC_Mailservice_UserTasks_ChangePassword < MailserviceUserLogin
     def test_normal
         assert_nothing_raised do
@@ -309,13 +376,28 @@ class TC_Mailservice_UserTasks_RealName < MailserviceUserLogin
     end
 
     def test_change
+        oldpassword = User.find_by_login("testuser").password
+        
+        old_pw = User.find(@loaded_fixtures["users"]["testuser"]["id"]).password
+        result = nil
         assert_nothing_raised do
-            assert_equal @new_name, invoke(:user_change_real_name,
-                                           "foobar",
-                                           @new_name)
+            result = invoke(:user_change_real_name, "foobar", @new_name)
         end
 
+        assert_equal @new_name,  result
+
+        newpassword = User.find_by_login("testuser").password
+        
+
+        new_pw = User.find(@loaded_fixtures["users"]["testuser"]["id"]).password
         assert_equal @new_name, invoke(:user_real_name)
+
+        assert_equal old_pw, new_pw
+    end
+
+    def test_change_twice
+        test_change
+        test_change
     end
 
     def test_bad_password
@@ -323,6 +405,12 @@ class TC_Mailservice_UserTasks_RealName < MailserviceUserLogin
             invoke(:user_change_real_name, "nofoobar", @new_name)
         end
     end
+    
+    def test_excessively_long_new_name
+        assert_raises RuntimeError do
+            invoke(:user_change_real_name, "foobar", "x"*16384)
+        end
+    end
 end
 
 class TC_MailService_EmailAddresses < MailserviceUserLogin
@@ -354,11 +442,13 @@ class TC_MailService_EmailAddresses < MailserviceUserLogin
             assert_equal [ "address1@foo.test" ],
                 invoke(:user_email_addresses_confirmed).sort
         end
+        result = nil
         assert_nothing_raised do
-            assert_equal [ "address2@foo.test", "brandnewuser@foo.test" ], 
-                invoke(:user_email_addresses_unconfirmed).sort
+            result = invoke(:user_email_addresses_unconfirmed).sort
         end
 
+        assert_equal [ "address2@foo.test", "brandnewuser@foo.test" ], result
+
         confirmation_code=get_confirmation_code("testuser",
                                               "brandnewuser@foo.test")
 
@@ -400,6 +490,28 @@ class TC_MailService_EmailAddresses < MailserviceUserLogin
     end 
 end
 
+class TC_AdminConfirmationCode < MailserviceDomainAdmin
+    def test_confirmation_code_confirmed
+        result = nil
+        assert_nothing_raised do
+            result = invoke(:admin_get_confirmation_code, "testuser", 
+                            "address1@foo.test")
+        end
+        assert_equal @loaded_fixtures["confirmationcodes"]\
+            ["confirmationcode_testuser_address1"]["code"], result
+    end
+
+    def test_confirmation_code_not_confirmed
+        result = nil
+        assert_nothing_raised do
+            result = invoke(:admin_get_confirmation_code, "testuser", 
+                            "address2@foo.test")
+        end
+        assert_equal @loaded_fixtures["confirmationcodes"]\
+            ["confirmationcode_testuser_address2"]["code"], result
+    end
+end
+
 class TC_Mailservice_MailinglistClasses < MailserviceUserLogin
 
     def setup
@@ -412,7 +524,7 @@ class TC_Mailservice_MailinglistClasses < MailserviceUserLogin
 
     def test_get_mailinglist_classes
         assert_equal [ 'Distribution List', 'Mailing List', 
-                       'Proxifiable LTMA' ], 
+                       'Proxifiable forwarding mailing list' ], 
             invoke(:mailinglist_classes).sort
     end
 
@@ -442,7 +554,7 @@ end
 class TC_Mailservice_UserMailingLists < MailserviceUserLogin
     def test_mailinglists
         user_mailinglists=invoke(:user_mailinglists)
-        assert_equal [ 3 ],
+        assert_equal [ Mailinglist.find(3) ],
             invoke(:user_mailinglists)
         assert_equal "testml", invoke(:mailinglist_name,3)
     end
@@ -450,7 +562,39 @@ end
 
 class TC_Mailservice_CreateMailinglist < MailserviceUserLogin
     def test_create_mailinglist
-        assert_equal "testmailinglist@test.domain",
+        assert_equal true,
+            invoke(:mailinglist_create, "testmailinglist", "Mailing List")
+        assert id = invoke(:mailinglist_find_by_name, "testmailinglist")
+        assert invoke(:mailinglist_delete, id)
+        assert_equal nil, invoke(:mailinglist_find_by_name, "testmailinglist")
+    end
+
+    def test_create_mailinglist_nonexistent_class
+        assert_raises RuntimeError, 
+            "Class does not exist (check MailinglistClasses for list)" do
+            invoke(:mailinglist_create, "testmailinglist", "nonexistent")
+        end
+    end
+end
+
+class TC_Mailservice_GetMailinglistById < MailserviceUserLogin
+    def test_my_mailinglist
+        assert_equal "testml@test.domain", invoke(:mailinglist_address,3)
+    end
+
+    def test_not_my_mailinglist
+        assert_raises RuntimeError, "Permission denied" do
+            invoke(:mailinglist_address,4)
+        end
+    end
+
+end
+
+class TC_Mailservice_CreateMailinglist_after_changing_name < TC_Mailservice_UserTasks_RealName
+    def test_create_mailinglist
+        test_change
+
+        assert_equal true,
             invoke(:mailinglist_create, "testmailinglist", "Mailing List")
         assert id = invoke(:mailinglist_find_by_name, "testmailinglist")
         assert invoke(:mailinglist_delete, id)
@@ -458,6 +602,7 @@ class TC_Mailservice_CreateMailinglist < MailserviceUserLogin
     end
 end
 
+
 class MailserviceUserMailinglist < MailserviceUserLogin
     def setup
         super

data/test/functional/navigation_controller_test.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'navigation_controller'
+
+# Re-raise errors caught by the controller.
+class NavigationController; def rescue_action(e) raise e end; end
+
+class NavigationControllerTest < Test::Unit::TestCase
+  def setup
+    @controller = NavigationController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/functional/root_admin_controller_test.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'root_admin_controller'
+
+# Re-raise errors caught by the controller.
+class RootAdminController; def rescue_action(e) raise e end; end
+
+class RootAdminControllerTest < Test::Unit::TestCase
+  def setup
+    @controller = RootAdminController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/test/functional/sugoi_admin_controller_test.rb

@@ -1,9 +1,8 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'sugoi_admin_controller'
+require 'pp'
 
 class SugoiAdminController; 
-    # Re-raise errors caught by the controller.
-    def rescue_action(e) raise e end
 
     @@ask_responses = []
 
@@ -15,6 +14,10 @@ class SugoiAdminController;
         # chuck away the prompt
         return @@ask_responses.shift || "test_password"
     end
+
+    private
+    # Re-raise errors caught by the controller.
+    def rescue_action(e) raise e end
 end
 
 def stuff_ask(*responses)
@@ -42,6 +45,42 @@ class SugoiAdminControllerTest < Test::Unit::TestCase
         assert true
     end
 
+    def test_show_config_all_vars
+        assert_nothing_raised do
+            invoke "show_config"
+        end
+
+        assert_equal @loaded_fixtures["sys_configs"].length, 
+            assigns["config_vars"].length
+    end
+
+
+    def test_show_config_one_var
+        assert_nothing_raised do
+            invoke "show_config", "smtpserver"
+        end
+
+        assert_equal "localhost", assigns["config_vars"][0].value
+    end
+
+    def test_set_config_existent_value
+        assert_nothing_raised do
+            invoke "set_config", "smtpserver", "mail.google.com" # heh
+        end
+
+        assert_equal "mail.google.com", SysConfig.smtpserver
+        assert_equal assigns["config_var"].name, "smtpserver"
+    end
+
+    def test_set_config_nonexistent_value
+        assert_nothing_raised do
+            invoke "set_config", "scoobydoobyhoobiefloobiekerwhee", 42
+        end
+
+        assert_equal "scoobydoobyhoobiefloobiekerwhee", 
+            assigns["missing_config_name"]
+    end
+
     def test_list_domains
         assert_nothing_raised do
             invoke "list_domains"
@@ -272,7 +311,26 @@ class SugoiAdminControllerTest < Test::Unit::TestCase
         assert_equal ["address2@foo.test"], ml.addresses.map { |a| a.address }
     end
 
-    def test_unsubscribe_address_from_mailinglist_its_not_a_member_of
+    def test_unsubscribe_address_from_mailing_list_that_doesnt_exist
+        assert_nothing_raised do
+            invoke "unsubscribe", "nonexistent@test.domain", "address1@foo.test"
+        end
+
+        assert assigns["error"]
+        assert_equal "unsubscribe: Mailing list \"nonexistent@test.domain\" unknown.", assigns["error"]
+    end
+
+    def test_unsubscribe_address_not_actually_subscribed_to_a_mailing_list
+        assert_nothing_raised do
+            invoke "unsubscribe", "testuser@test.domain", "external@foo.test"
+        end
+
+        assert assigns["error"]
+        assert_equal "unsubscribe: Address \"external@foo.test\" not in mailing list \"testuser@test.domain\"", assigns["error"]
+        assert_nil assigns["removed_addresses"]
+    end
+
+    def test_unsubscribe_entirely_unknown_address_from_mailinglist
         assert_nothing_raised do
             invoke "unsubscribe", "testuser@test.domain", "nonexistent@foo.test"
         end
@@ -302,7 +360,7 @@ class SugoiAdminControllerTest < Test::Unit::TestCase
         assert assigns.grep(/MailinglistClass/).length == 0
 
         assert_equal @loaded_fixtures["mailinglist_classes"].length, 
-            MailinglistClass.find_all.length
+            MailinglistClass.find(:all).length
     end
 
     def test_init_sysconfigs
@@ -317,7 +375,7 @@ class SugoiAdminControllerTest < Test::Unit::TestCase
         assert assigns.grep(/SysConfig/).length == 0
         
         assert_equal @loaded_fixtures["sys_configs"].length, 
-            SysConfig.find_all.length
+            SysConfig.find(:all).length
     end
 
     def test_init_adminmessages
@@ -332,7 +390,7 @@ class SugoiAdminControllerTest < Test::Unit::TestCase
         assert assigns.grep(/AdminMessages/).length == 0
 
         assert_equal @loaded_fixtures["admin_messages"].length, 
-            AdminMessage.find_all.length
+            AdminMessage.find(:all).length
     end
 
     def test_init_all
@@ -348,13 +406,13 @@ class SugoiAdminControllerTest < Test::Unit::TestCase
         assert_equal 0, assigns["alreadythere"].length
 
         assert_equal @loaded_fixtures["mailinglist_classes"].length, 
-            MailinglistClass.find_all.length
+            MailinglistClass.find(:all).length
         assert_equal @loaded_fixtures["sys_configs"].length, 
-            SysConfig.find_all.length
+            SysConfig.find(:all).length
         assert_equal @loaded_fixtures["admin_messages"].length, 
-            AdminMessage.find_all.length
+            AdminMessage.find(:all).length
         assert_equal @loaded_fixtures["helps"].length, 
-            Help.find_all.length
+            Help.find(:all).length
     end
 
     def test_init_no_clobber_values

data/test/functionals.rb

@@ -1,4 +1,5 @@
 require File.dirname(__FILE__) + '/test_helper'
-Dir["functional/*.rb"].each do |file|
+
+Dir[File.join(File.dirname(__FILE__),"functional","*.rb")].each do |file|
     require file.sub(/.rb$/,'')
 end

data/test/integration/test_soap.rb

@@ -1,3 +1,6 @@
+require "rubygems"
+gem "soap4r"
+
 ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../../config/environment")
 require 'test_help'
@@ -7,7 +10,6 @@ require 'test_help'
 # Test SOAP client
 #------------------------------------------------------------------------
 
-require "rubygems"
 File.unlink *%w{Mailservice.rb 
                 MailserviceServiceClient.rb
                 MailserviceDriver.rb} rescue nil

data/test/unit/address_test.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class AddressTest < Test::Unit::TestCase
     fixtures :mailinglists, :users, :addresses_mailinglists, :addresses,
-        :domains, :sys_configs
+        :domains, :sys_configs, :proxy_links
 
     def test_parse_1
         assert_equal [ 'address1@foo.test', 'Address One'],
@@ -36,6 +36,21 @@ class AddressTest < Test::Unit::TestCase
             'an address it doesn\'t know about without a proxy address'
     end
 
+    def test_proxified_address
+        assert_equal "testuser-42@test.domain",
+            Address.find_by_address("addressmessage1@foo.test").
+            proxified(Mailinglist.find(1)), "proxy link already in fixture"
+        assert_equal "testuser-43@test.domain",
+            Address.find_or_create_by_address("testnonactive@foo.test").
+            proxified(Mailinglist.find(1)), "proxy link not in fixture"
+    end
+
+    def test_outside_address
+        assert_equal false, Address.find(1).outside?
+        assert_equal true, Address.find(3).outside?
+        assert_equal true, Address.find_or_create_by_address("definitely-outside@foo.test").outside?
+    end
+
     def test_string_conversion
         assert_equal 'address1@foo.test', Address.find(1).to_s
         assert_equal 'address2@foo.test', Address.find(2).to_s

data/test/unit/domain_test.rb

@@ -113,16 +113,9 @@ class DomainTest < Test::Unit::TestCase
         assert_equal '826005bc4b82d02a3e6097556a45083375fe556c', u.password    
     end
 
-#     def test_change_nothing
-#         d = Domain.find_by_name "test.domain"
-#         assert_equal 'e7ce1e2e20ec9f11ce8e86c9c47ab9911c1d221e', d.password
-#         d.password = d.password_confirmation = nil
-#         result = d.save
-#         unless result == true
-#             d.errors.each do |thing, string|
-#                 puts "#{thing}: #{string}"
-#             end
-#         end
-#         assert result
-#     end
+    def test_change_nothing
+        d = Domain.find_by_name "test.domain"
+        result = d.save
+        assert result
+    end
 end

data/test/unit/mailinglist_class_test.rb

@@ -21,8 +21,8 @@ class MailinglistClassTest < Test::Unit::TestCase
     end
 
     def test_ltma_parameters
-        assert_equal "LTMA",@ltma_class.name
-        assert_equal "Lifetime Mail Address", @ltma_class.description
+        assert_equal "Forwarding address",@ltma_class.name
+        assert_equal "Address for forwarding mail to", @ltma_class.description
         assert_equal false, @ltma_class.moderated
         assert_equal true,  @ltma_class.public
         assert_equal true,  @ltma_class.confirmation