Fix some incorrect tests that relied on the default routes

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 54b4cdf7e713e8ecf5b836e3fde25aec04270b28..7981edd958a15b82222b869ca45f08c1a4835d0b 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -122,31 +122,28 @@ class DiaryEntryControllerTest < ActionController::TestCase
   
   def test_editing_diary_entry
     @request.cookies["_osm_username"] = users(:normal_user).display_name
+    entry = diary_entries(:normal_user_entry_1)
 
     # Make sure that you are redirected to the login page when you are 
     # not logged in, without and with the id of the entry you want to edit
-    get :edit
+    get :edit, :display_name => entry.user.display_name, :id => entry.id
     assert_response :redirect
-    assert_redirected_to :controller => :user, :action => "login", :referer => "/diary_entry/edit"
+    assert_redirected_to :controller => :user, :action => "login", :referer => "/user/#{entry.user.display_name}/diary/#{entry.id}/edit"
     
-    get :edit, :id => diary_entries(:normal_user_entry_1).id
-    assert_response :redirect
-    assert_redirected_to :controller => :user, :action => "login", :referer => "/diary_entry/edit"
-    
-    # Verify that you get a not found error, when you don't pass an id
-    get(:edit, nil, {'user' => users(:normal_user).id})
+    # Verify that you get a not found error, when you pass a bogus id
+    get(:edit, {:display_name => entry.user.display_name, :id => 9999}, {'user' => entry.user.id})
     assert_response :not_found
     assert_select "html", :count => 1 do
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
-          assert_select "h2", :text => "No entry with the id:", :count => 1 
+          assert_select "h2", :text => "No entry with the id: 9999", :count => 1 
         end
       end
     end
     
     # Now pass the id, and check that you can edit it, when using the same 
     # user as the person who created the entry
-    get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
+    get(:edit, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id})
     assert_response :success
     assert_select "html", :count => 1 do
       assert_select "head", :count => 1 do
@@ -155,9 +152,9 @@ class DiaryEntryControllerTest < ActionController::TestCase
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do 
           assert_select "h1", :text => /Edit diary entry/, :count => 1
-          assert_select "form[action='/diary_entry/#{diary_entries(:normal_user_entry_1).id}/edit'][method=post]", :count => 1 do
-            assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{diary_entries(:normal_user_entry_1).title}']", :count => 1
-            assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => diary_entries(:normal_user_entry_1).body, :count => 1
+          assert_select "form[action='/user/#{entry.user.display_name}/diary/#{entry.id}/edit'][method=post]", :count => 1 do
+            assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1
+            assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1
             assert_select "select#diary_entry_language_code", :count => 1
             assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1
             assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
@@ -174,15 +171,15 @@ class DiaryEntryControllerTest < ActionController::TestCase
     new_latitude = "1.1"
     new_longitude = "2.2"
     new_language_code = "en"
-    post(:edit, {:id => diary_entries(:normal_user_entry_1).id, 'commit' => 'save', 
+    post(:edit, {:display_name => entry.user.display_name, :id => entry.id, 'commit' => 'save', 
       'diary_entry'=>{'title' => new_title, 'body' => new_body, 'latitude' => new_latitude,
       'longitude' => new_longitude, 'language_code' => new_language_code} },
-         {'user' => users(:normal_user).id})
+         {'user' => entry.user.id})
     assert_response :redirect
-    assert_redirected_to :action => :view, :id => diary_entries(:normal_user_entry_1).id
+    assert_redirected_to :action => :view, :display_name => entry.user.display_name, :id => entry.id
     
     # Now check that the new data is rendered, when logged in
-    get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:normal_user).id}
+    get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}
     assert_response :success
     assert_template 'diary_entry/view'
     assert_select "html", :count => 1 do
@@ -191,7 +188,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
-          assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1
+          assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1
           assert_select "b", :text => /#{new_title}/, :count => 1
           # This next line won't work if the text has been run through the htmlize function
           # due to formatting that could be introduced
@@ -199,7 +196,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
           assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1
           # As we're not logged in, check that you cannot edit
           #print @response.body
-          assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 1
+          assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
         end
       end
     end
@@ -207,7 +204,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     @request.cookies["_osm_username"] = users(:public_user).display_name
 
     # and when not logged in as the user who wrote the entry
-    get :view, {:id => diary_entries(:normal_user_entry_1).id, :display_name => 'test'}, {'user' => users(:public_user).id}
+    get :view, {:display_name => entry.user.display_name, :id => entry.id}, {'user' => entry.user.id}
     assert_response :success
     assert_template 'diary_entry/view'
     assert_select "html", :count => 1 do
@@ -223,8 +220,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
           assert_select "p", :text => /#{new_body}/, :count => 1
           assert_select "abbr[class=geo][title=#{number_with_precision(new_latitude, :precision => 4)}; #{number_with_precision(new_longitude, :precision => 4)}]", :count => 1
           # As we're not logged in, check that you cannot edit
-          assert_select "span[class=hidden show_if_user_#{users(:normal_user).id}]", :count => 1 do
-            assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 1
+          assert_select "span[class=hidden show_if_user_#{entry.user.id}]", :count => 1 do
+            assert_select "a[href='/user/#{entry.user.display_name}/diary/#{entry.id}/edit']", :text => "Edit this entry", :count => 1
           end
         end
       end

diff --git a/test/integration/user_roles_test.rb b/test/integration/user_roles_test.rb
index 8bf06374fc41601ed914b0197d2d51712cc26dd4..17531ef3fb8b6354f5d9c683760c9be6fe76c49a 100644 (file)
--- a/test/integration/user_roles_test.rb
+++ b/test/integration/user_roles_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
-class UserRolesControllerTest < ActionController::IntegrationTest
+class UserRolesTest < ActionController::IntegrationTest
   fixtures :users, :user_roles
 
   test "grant" do

diff --git a/test/integration/user_terms_seen_test.rb b/test/integration/user_terms_seen_test.rb
index eac5daf2410511e62ea7a49d89df34b9a7bac8ea..64a101024738c3642bc8d5ebe07efe3accd425d7 100644 (file)
--- a/test/integration/user_terms_seen_test.rb
+++ b/test/integration/user_terms_seen_test.rb
@@ -39,7 +39,7 @@ class UserTermsSeenTest < ActionController::IntegrationTest
       assert_response :success
 
       # don't agree to the terms, but hit decline
-      post "/user/#{user.display_name}/save", {'decline' => 'decline', 'referer' => '/'}
+      post "/user/save", {'decline' => 'decline', 'referer' => '/'}
       assert_redirected_to "/"
       follow_redirect!