Adding some more diary entry tests. Making the RSS feed links more portable, by using...

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index bd08bcd9795797d6e411d9a1c2ebd9016fc24236..3592ccb4fb683ce50558ca14dd76580ac9e98fde 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -86,7 +86,7 @@ class DiaryEntryController < ApplicationController
         @entries = DiaryEntry.find(:all, :conditions => ['user_id = ?', user.id], :order => 'created_at DESC', :limit => 20)
         @title = "OpenStreetMap diary entries for #{user.display_name}"
         @description = "Recent OpenStreetmap diary entries from #{user.display_name}"
         @entries = DiaryEntry.find(:all, :conditions => ['user_id = ?', user.id], :order => 'created_at DESC', :limit => 20)
         @title = "OpenStreetMap diary entries for #{user.display_name}"
         @description = "Recent OpenStreetmap diary entries from #{user.display_name}"

-        @link = "http://www.openstreetmap.org/user/#{user.display_name}/diary"
+        @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"

 
         render :content_type => Mime::RSS
       else
 
         render :content_type => Mime::RSS
       else


@@ -98,7 +98,7 @@ class DiaryEntryController < ApplicationController
                                  :order => 'created_at DESC', :limit => 20)
       @title = "OpenStreetMap diary entries"
       @description = "Recent diary entries from users of OpenStreetMap"
                                  :order => 'created_at DESC', :limit => 20)
       @title = "OpenStreetMap diary entries"
       @description = "Recent diary entries from users of OpenStreetMap"

-      @link = "http://www.openstreetmap.org/diary"
+      @link = "http://#{SERVER_URL}/diary"

 
       render :content_type => Mime::RSS
     end
 
       render :content_type => Mime::RSS
     end


@@ -109,6 +109,7 @@ class DiaryEntryController < ApplicationController
 
     if user
       @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]])
 
     if user
       @entry = DiaryEntry.find(:first, :conditions => ['user_id = ? AND id = ?', user.id, params[:id]])

+      @title = "Users' diaries | #{params[:display_name]}"

     else
       @not_found_user = params[:display_name]
 
     else
       @not_found_user = params[:display_name]
 

diff --git a/app/models/diary_entry.rb b/app/models/diary_entry.rb
index c20788fbbe7858b6056d5773ae2183a5941b0d2e..4b2058b9d9b7b684426b5c82d223596b4e371288 100644 (file)
--- a/app/models/diary_entry.rb
+++ b/app/models/diary_entry.rb
@@ -6,7 +6,7 @@ class DiaryEntry < ActiveRecord::Base
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255
 
   validates_presence_of :title, :body
   validates_length_of :title, :within => 1..255

-  validates_length_of :language, :within => 2..3
+  validates_length_of :language, :within => 2..3, :allow_nil => true

   validates_numericality_of :latitude, :allow_nil => true
   validates_numericality_of :longitude, :allow_nil => true
   validates_associated :user
   validates_numericality_of :latitude, :allow_nil => true
   validates_numericality_of :longitude, :allow_nil => true
   validates_associated :user

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index cb78773365186042b1c99a8b6d3ef90cadf27a1b..c0bd4b9ff144fb8034a72aa312024b77f791dda4 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -2,14 +2,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class DiaryEntryControllerTest < ActionController::TestCase
   fixtures :users, :diary_entries, :diary_comments
 
 class DiaryEntryControllerTest < ActionController::TestCase
   fixtures :users, :diary_entries, :diary_comments

-  def basic_authorization(user, pass)
-    @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
-  end

 
 

-  def content(c)
-    @request.env["RAW_POST_DATA"] = c.to_s
-  end
-  

   def test_showing_new_diary_entry
     get :new
     assert_response :redirect
   def test_showing_new_diary_entry
     get :new
     assert_response :redirect


@@ -65,7 +58,8 @@ class DiaryEntryControllerTest < ActionController::TestCase
       end
     end
     
       end
     end
     

-    # Now pass the id, and check that you can edit it
+    # 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})
     assert_response :success
     assert_select "html:root", :count => 1 do
     get(:edit, {:id => diary_entries(:normal_user_entry_1).id}, {'user' => users(:normal_user).id})
     assert_response :success
     assert_select "html:root", :count => 1 do


@@ -75,12 +69,77 @@ 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 "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
+          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 "input#latitude[name='diary_entry[latitude]']", :count => 1
+            assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
+            assert_select "input[name=commit][type=submit][value=Save]", :count => 1
+            assert_select "input", :count => 4
+          end
+        end
+      end
+    end
+    
+    # Now lets see if you can edit the diary entry
+    new_title = "New Title"
+    new_body = "This is a new body for the diary entry"
+    new_latitude = "1.1"
+    new_longitude = "2.2"
+    post(:edit, {:id => diary_entries(:normal_user_entry_1).id, 'commit' => 'save', 
+      'diary_entry'=>{'title' => new_title, 'body' => new_body, 'latitude' => new_latitude, 'longitude' => new_longitude} },
+         {'user' => users(:normal_user).id})
+    assert_response :redirect
+    assert_redirected_to :action => :view, :id => diary_entries(:normal_user_entry_1).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}
+    assert_response :success
+    assert_template 'diary_entry/view'
+    assert_select "html:root", :count => 1 do
+      assert_select "head", :count => 1 do
+        assert_select "title", :text => /Users' diaries | /, :count => 1
+      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 "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
+          assert_select "p", :text => /#{new_body}/, :count => 1
+          assert_select "span.latitude", :text => new_latitude, :count => 1
+          assert_select "span.longitude", :text => new_longitude, :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
+        end
+      end
+    end
+    
+    # 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(:second_user).id}
+    assert_response :success
+    assert_template 'diary_entry/view'
+    assert_select "html:root", :count => 1 do
+      assert_select "head", :count => 1 do
+        assert_select "title", :text => /Users' diaries | /, :count => 1
+      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 "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
+          assert_select "p", :text => /#{new_body}/, :count => 1
+          assert_select "span.latitude", :text => new_latitude, :count => 1
+          assert_select "span.longitude", :text => new_longitude, :count => 1
+          # As we're not logged in, check that you cannot edit
+          assert_select "a[href='/user/#{users(:normal_user).display_name}/diary/#{diary_entries(:normal_user_entry_1).id}/edit']", :text => "Edit this entry", :count => 0

         end
       end
     end
         end
       end
     end

-        

     #print @response.body
     #print @response.body

+    

   end
   
   def test_editing_creating_diary_comment
   end
   
   def test_editing_creating_diary_comment