Fix rubocop lint issues

[rails.git] / test / integration / user_creation_test.rb

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 3c716e99ec17f33df31608736966ab69ce976853..3b79c433ddceece982648397da2e1801ea340f7d 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'

 
 

-class UserCreationTest < ActionController::IntegrationTest
+class UserCreationTest < ActionDispatch::IntegrationTest

   fixtures :users
 
   def setup
   fixtures :users
 
   def setup


@@ -9,28 +9,27 @@ class UserCreationTest < ActionController::IntegrationTest
 
   def test_create_user_form
     I18n.available_locales.each do |locale|
 
   def test_create_user_form
     I18n.available_locales.each do |locale|

-      get '/user/new', {}, {"HTTP_ACCEPT_LANGUAGE" => locale.to_s}
+      get_via_redirect '/user/new', {}, { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }

       assert_response :success
       assert_template 'user/new'
     end
   end
 
   def test_user_create_submit_duplicate_email
       assert_response :success
       assert_template 'user/new'
     end
   end
 
   def test_user_create_submit_duplicate_email

-    I18n.available_locales.each do |localer|
+    I18n.available_locales.each do |locale|

       dup_email = users(:public_user).email
       dup_email = users(:public_user).email

-      display_name = "#{localer.to_s}_new_tester"
+      display_name = "#{locale}_new_tester"

       assert_difference('User.count', 0) do
         assert_difference('ActionMailer::Base.deliveries.size', 0) do
       assert_difference('User.count', 0) do
         assert_difference('ActionMailer::Base.deliveries.size', 0) do

-          post '/user/save',
-            {:user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
-            {"HTTP_ACCEPT_LANGUAGE" => localer.to_s}
+          post '/user/new',
+               { :user => { :email => dup_email, :email_confirmation => dup_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } },
+               { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }

         end
       end
       assert_response :success
       assert_template 'user/new'
         end
       end
       assert_response :success
       assert_template 'user/new'

-      assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root
-      assert_select "div#errorExplanation"
-      assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_email"
+      assert_equal response.headers['Content-Language'][0..1], locale.to_s[0..1] unless locale == :root
+      assert_select "form > fieldset > div.form-row > input.field_with_errors#user_email"

       assert_no_missing_translations
     end
   end
       assert_no_missing_translations
     end
   end


@@ -38,31 +37,39 @@ class UserCreationTest < ActionController::IntegrationTest
   def test_user_create_submit_duplicate_username
     I18n.available_locales.each do |locale|
       dup_display_name = users(:public_user).display_name
   def test_user_create_submit_duplicate_username
     I18n.available_locales.each do |locale|
       dup_display_name = users(:public_user).display_name

-      email = "#{locale.to_s}_new_tester"
+      email = "#{locale}_new_tester"

       assert_difference('User.count', 0) do
         assert_difference('ActionMailer::Base.deliveries.size', 0) do
       assert_difference('User.count', 0) do
         assert_difference('ActionMailer::Base.deliveries.size', 0) do

-          post '/user/save',
-          {:user => {:email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
-          {"HTTP_ACCEPT_LANGUAGE" => locale.to_s}
+          post '/user/new',
+               { :user => { :email => email, :email_confirmation => email, :display_name => dup_display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" } },
+               { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }

         end
       end
       assert_response :success
       assert_template 'user/new'
         end
       end
       assert_response :success
       assert_template 'user/new'

-      assert_select "div#errorExplanation"
-      assert_select "table#signupForm > tr > td > div[class=field_with_errors] > input#user_display_name"
+      assert_select "form > fieldset > div.form-row > input.field_with_errors#user_display_name"

       assert_no_missing_translations
     end
   end
 
   def test_user_create_success
     I18n.available_locales.each do |locale|
       assert_no_missing_translations
     end
   end
 
   def test_user_create_success
     I18n.available_locales.each do |locale|

-      new_email = "#{locale.to_s}newtester@osm.org"
-      display_name = "#{locale.to_s}_new_tester"
+      new_email = "#{locale}newtester@osm.org"
+      display_name = "#{locale}_new_tester"
+
+      assert_difference('User.count', 0) do
+        assert_difference('ActionMailer::Base.deliveries.size', 0) do
+          post "/user/new",
+               :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }
+        end
+      end
+
+      assert_redirected_to "/user/terms"
+

       assert_difference('User.count') do
         assert_difference('ActionMailer::Base.deliveries.size', 1) do
       assert_difference('User.count') do
         assert_difference('ActionMailer::Base.deliveries.size', 1) do

-          post_via_redirect "/user/save",
-            {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"}},
-            {"HTTP_ACCEPT_LANGUAGE" => "#{locale.to_s}"}
+          post_via_redirect "/user/save", {},
+                            { "HTTP_ACCEPT_LANGUAGE" => "#{locale}" }

         end
       end
 
         end
       end
 


@@ -71,11 +78,11 @@ class UserCreationTest < ActionController::IntegrationTest
 
       assert_equal register_email.to[0], new_email
       # Check that the confirm account url is correct
 
       assert_equal register_email.to[0], new_email
       # Check that the confirm account url is correct

-      assert_match /#{@url}/, register_email.body
+      assert_match /#{@url}/, register_email.body.to_s

 
       # Check the page
       assert_response :success
 
       # Check the page
       assert_response :success

-      assert_template 'login'
+      assert_template 'user/confirm'

 
       ActionMailer::Base.deliveries.clear
     end
 
       ActionMailer::Base.deliveries.clear
     end


@@ -98,12 +105,11 @@ class UserCreationTest < ActionController::IntegrationTest
     referer = "/traces/mine"
     assert_difference('User.count') do
       assert_difference('ActionMailer::Base.deliveries.size', 1) do
     referer = "/traces/mine"
     assert_difference('User.count') do
       assert_difference('ActionMailer::Base.deliveries.size', 1) do

-        post "/user/terms",
-        {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password}, :referer => referer }
-        assert_response :success
-        assert_template 'terms'
+        post "/user/new",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }, :referer => referer
+        assert_redirected_to "/user/terms"

         post_via_redirect "/user/save",
         post_via_redirect "/user/save",

-        {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password} }
+                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :pass_crypt => password, :pass_crypt_confirmation => password }

       end
     end
 
       end
     end
 


@@ -114,28 +120,26 @@ class UserCreationTest < ActionController::IntegrationTest
     # Check that the confirm account url is correct
     confirm_regex = Regexp.new("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9]*)")
     register_email.parts.each do |part|
     # Check that the confirm account url is correct
     confirm_regex = Regexp.new("/user/redirect_tester/confirm\\?confirm_string=([a-zA-Z0-9]*)")
     register_email.parts.each do |part|

-      assert_match(confirm_regex, part.body)
+      assert_match confirm_regex, part.body.to_s

     end
     confirm_string = register_email.parts[0].body.match(confirm_regex)[1]
 
     # Check the page
     assert_response :success
     end
     confirm_string = register_email.parts[0].body.match(confirm_regex)[1]
 
     # Check the page
     assert_response :success

-    assert_template 'login'
+    assert_template 'user/confirm'

 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page

-    get 'user/confirm', { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", :confirm_string => confirm_string

     assert_response :success
     assert_template 'user/confirm'
 
     assert_response :success
     assert_template 'user/confirm'
 

-    post 'user/confirm', { :confirm_string => confirm_string, :confirm_action => 'submit' }
-    assert_response :redirect # to trace/mine in original referrer
-    follow_redirect!
-    assert_response :redirect # but it not redirects to /user/<display_name>/traces
+    post "/user/#{display_name}/confirm", :confirm_string => confirm_string
+    assert_response :redirect

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template 'trace/list'
+    assert_template 'site/welcome'

   end
 
   def test_user_create_openid_success
   end
 
   def test_user_create_openid_success


@@ -144,15 +148,14 @@ class UserCreationTest < ActionController::IntegrationTest
     password = "testtest"
     assert_difference('User.count') do
       assert_difference('ActionMailer::Base.deliveries.size', 1) do
     password = "testtest"
     assert_difference('User.count') do
       assert_difference('ActionMailer::Base.deliveries.size', 1) do

-        post "/user/terms",
-          {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}}
+        post "/user/new",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "", :pass_crypt_confirmation => "" }

         assert_response :redirect
         res = openid_request(@response.redirect_url)
         assert_response :redirect
         res = openid_request(@response.redirect_url)

-        post '/user/terms', res
-        assert_response :success
-        assert_template 'terms'
+        get "/user/new", res
+        assert_redirected_to "/user/terms"

         post '/user/save',
         post '/user/save',

-          {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => password, :pass_crypt_confirmation => password}}
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => password, :pass_crypt_confirmation => password }

         assert_response :redirect
         follow_redirect!
       end
         assert_response :redirect
         follow_redirect!
       end


@@ -160,7 +163,7 @@ class UserCreationTest < ActionController::IntegrationTest
 
     # Check the page
     assert_response :success
 
     # Check the page
     assert_response :success

-    assert_template 'login'
+    assert_template 'user/confirm'

 
     ActionMailer::Base.deliveries.clear
   end
 
     ActionMailer::Base.deliveries.clear
   end


@@ -168,14 +171,13 @@ class UserCreationTest < ActionController::IntegrationTest
   def test_user_create_openid_failure
     new_email = "newtester-openid2@osm.org"
     display_name = "new_tester-openid2"
   def test_user_create_openid_failure
     new_email = "newtester-openid2@osm.org"
     display_name = "new_tester-openid2"

-    password = "testtest2"
-    assert_difference('User.count',0) do
-      assert_difference('ActionMailer::Base.deliveries.size',0) do
-        post "/user/terms",
-          {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.failure=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}}
+    assert_difference('User.count', 0) do
+      assert_difference('ActionMailer::Base.deliveries.size', 0) do
+        post "/user/new",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.failure=newuser", :pass_crypt => "", :pass_crypt_confirmation => "" }

         assert_response :redirect
         res = openid_request(@response.redirect_url)
         assert_response :redirect
         res = openid_request(@response.redirect_url)

-        post '/user/terms', res
+        get '/user/new', res

         assert_response :success
         assert_template 'user/new'
       end
         assert_response :success
         assert_template 'user/new'
       end


@@ -187,20 +189,18 @@ class UserCreationTest < ActionController::IntegrationTest
   def test_user_create_openid_redirect
     new_email = "redirect_tester_openid@osm.org"
     display_name = "redirect_tester_openid"
   def test_user_create_openid_redirect
     new_email = "redirect_tester_openid@osm.org"
     display_name = "redirect_tester_openid"

-    password = ""

     # nothing special about this page, just need a protected page to redirect back to.
     referer = "/traces/mine"
     assert_difference('User.count') do
       assert_difference('ActionMailer::Base.deliveries.size', 1) do
     # nothing special about this page, just need a protected page to redirect back to.
     referer = "/traces/mine"
     assert_difference('User.count') do
       assert_difference('ActionMailer::Base.deliveries.size', 1) do

-       post "/user/terms",
-          {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "", :pass_crypt_confirmation => ""}, :referer => referer }
-       assert_response :redirect
+        post "/user/new",
+             :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "", :pass_crypt_confirmation => "" }, :referer => referer
+        assert_response :redirect

         res = openid_request(@response.location)
         res = openid_request(@response.location)

-        post '/user/terms', res
-        assert_response :success
-        assert_template 'terms'
+        get "/user/new", res
+        assert_redirected_to "/user/terms"

         post_via_redirect "/user/save",
         post_via_redirect "/user/save",

-          {:user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"} }
+                          :user => { :email => new_email, :email_confirmation => new_email, :display_name => display_name, :openid_url => "http://localhost:1123/john.doe?openid.success=newuser", :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest" }

       end
     end
 
       end
     end
 


@@ -211,27 +211,25 @@ class UserCreationTest < ActionController::IntegrationTest
     # Check that the confirm account url is correct
     confirm_regex = Regexp.new("/user/redirect_tester_openid/confirm\\?confirm_string=([a-zA-Z0-9]*)")
     register_email.parts.each do |part|
     # Check that the confirm account url is correct
     confirm_regex = Regexp.new("/user/redirect_tester_openid/confirm\\?confirm_string=([a-zA-Z0-9]*)")
     register_email.parts.each do |part|

-      assert_match(confirm_regex, part.body)
+      assert_match confirm_regex, part.body.to_s

     end
     confirm_string = register_email.parts[0].body.match(confirm_regex)[1]
 
     # Check the page
     assert_response :success
     end
     confirm_string = register_email.parts[0].body.match(confirm_regex)[1]
 
     # Check the page
     assert_response :success

-    assert_template 'login'
+    assert_template 'user/confirm'

 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page

-    get 'user/confirm', { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", :confirm_string => confirm_string

     assert_response :success
     assert_template 'user/confirm'
 
     assert_response :success
     assert_template 'user/confirm'
 

-    post 'user/confirm', { :confirm_string => confirm_string, :confirm_action => 'submit' }
-    assert_response :redirect # to trace/mine in original referrer
-    follow_redirect!
-    assert_response :redirect # but it not redirects to /user/<display_name>/traces
+    post "/user/#{display_name}/confirm", :confirm_string => confirm_string
+    assert_response :redirect

     follow_redirect!
     assert_response :success
     follow_redirect!
     assert_response :success

-    assert_template "trace/list"
+    assert_template 'site/welcome'

   end
 end
   end
 end