Remove use of wildcard cache expiry

[rails.git] / test / functional / user_controller_test.rb

diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb
index e9744e7bf116cc0702b7f63f3f4562541d681031..cbe66a0dbee43a1230abd579cdbe97e923419896 100644 (file)
--- a/test/functional/user_controller_test.rb
+++ b/test/functional/user_controller_test.rb
@@ -4,34 +4,68 @@ class UserControllerTest < ActionController::TestCase
   fixtures :users
   
   # The user creation page loads
-  def test_user_create
+  def test_user_create_view
     get :new
     assert_response :success
-    assert_template 'new'
     
     assert_select "html:root", :count => 1 do
       assert_select "head", :count => 1 do
-        assert_select "title", :text => /create account/, :count => 1
+        assert_select "title", :text => /Create account/, :count => 1
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
-          assert_select "form[action='/user/save'][method=post]", :count => 1 do
+          assert_select "form[action='/user/terms'][method=post]", :count => 1 do
             assert_select "input[id=user_email]", :count => 1
             assert_select "input[id=user_email_confirmation]", :count => 1
             assert_select "input[id=user_display_name]", :count => 1
             assert_select "input[id=user_pass_crypt][type=password]", :count => 1
             assert_select "input[id=user_pass_crypt_confirmation][type=password]", :count => 1
-            assert_select "input[type=submit][value=Signup]", :count => 1
+            assert_select "input[type=submit][value=Continue]", :count => 1
           end
         end
       end
     end
   end
   
+  def test_user_create_success
+    new_email = "newtester@osm.org"
+    display_name = "new_tester"
+    assert_difference('User.count') do
+      assert_difference('ActionMailer::Base.deliveries.size') do
+        post :save, {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}}
+      end
+    end
+      
+    # Check the e-mail
+    register_email = ActionMailer::Base.deliveries.first
+  
+    assert_equal register_email.to[0], new_email
+    assert_match /#{@url}/, register_email.body
+
+    # Check the page
+    assert_redirected_to :action => 'login'
+      
+    ActionMailer::Base.deliveries.clear
+  end
+  
+  def test_user_create_submit_duplicate_email
+    dup_email = users(:public_user).email
+    display_name = "new_tester"
+    assert_difference('User.count', 0) do
+      assert_difference('ActionMailer::Base.deliveries.size', 0) do
+        post :save, :user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}
+      end
+    end
+    assert_response :success                                                                       
+    assert_template 'new'
+    assert_select "div#errorExplanation"
+    assert_select "table#signupForm > tr > td > div[class=fieldWithErrors] > input#user_email"
+  end
+  
   # Check that the user account page will display and contains some relevant
   # information for the user
   def test_view_user_account
-    get :view
+    get :view, {:display_name => "unknown"}
     assert_response :not_found
     
     get :view, {:display_name => "test"}
@@ -42,45 +76,8 @@ class UserControllerTest < ActionController::TestCase
     get :api_details
     assert_response :unauthorized
     
-    # Private users can login and get the api details
-    usr = users(:normal_user)
-    basic_authorization(usr.email, "test")
+    basic_authorization(users(:normal_user).email, "test")
     get :api_details
     assert_response :success
-    # Now check the content of the XML returned
-    print @response.body
-    assert_select "osm:root[version=#{API_VERSION}][generator='#{GENERATOR}']", :count => 1 do
-      assert_select "user[display_name='#{usr.display_name}'][account_created='#{usr.creation_time.xmlschema}']", :count => 1 do
-      assert_select "home[lat='#{usr.home_lat}'][lon='#{usr.home_lon}'][zoom='#{usr.home_zoom}']", :count => 1
-      end
-    end
-    
-  end
-  
-  # Check that we can login through the web using the mixed case fixture,
-  # lower case and upper case
-  def test_user_login_web_case
-    login_web_case_ok users(:normal_user).email,  "test"
-    login_web_case_ok users(:normal_user).email.upcase, "test"
-    login_web_case_ok users(:normal_user).email.downcase, "test"
-  end
-
-  def login_web_case_ok(userstring, password)
-    post :login, :user => {:email => userstring, :password => password}
-    assert_redirected_to :controller => 'site', :action => 'index'
-  end
-
-  # Check that we can login to the api, and get the user details 
-  # using the mixed case fixture, lower case and upper case  
-  def test_user_login_api_case
-    login_api_case_ok users(:normal_user).email, "test"
-    login_api_case_ok users(:normal_user).email.upcase, "test"
-    login_api_case_ok users(:normal_user).email.downcase, "test"
-  end
-  
-  def login_api_case_ok(userstring, password)
-    basic_authorization(userstring, password)
-    get :api_details
-    assert :success
   end
 end