Make some links more rails like, thus easier to read. Test that partials are included...

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

diff --git a/test/functional/browse_controller_test.rb b/test/functional/browse_controller_test.rb
index 81dbede570928477d3bab41f73d944d927855165..2fa59429828e4f98e4bae8d94b79344d1d5dfb5c 100644 (file)
--- a/test/functional/browse_controller_test.rb
+++ b/test/functional/browse_controller_test.rb
@@ -1,77 +1,55 @@
 require File.dirname(__FILE__) + '/../test_helper'
 require 'browse_controller'
 
 require File.dirname(__FILE__) + '/../test_helper'
 require 'browse_controller'
 

-# Re-raise errors caught by the controller.
-class BrowseController; def rescue_action(e) raise e end; end
-
-  class BrowseControllerTest < Test::Unit::TestCase
+class BrowseControllerTest < ActionController::TestCase

   api_fixtures
   api_fixtures

-  
-
-
-  def setup
-    @controller = BrowseController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
-
-  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
-
-  # We need to load the home page, then activate the start rjs method
-  # and finally check that the new panel has loaded.

   def test_start
   def test_start

-  
-  end
-  
-  # This should display the last 20 nodes that were edited.
-  def test_index
-    @nodes = Node.find(:all, :order => "timestamp DESC", :limit => 20)
-    assert @nodes.size <= 20
-    get :index
+    get :start

     assert_response :success
     assert_response :success

-    assert_template "index"
-    # Now check that all 20 (or however many were returned) nodes are in the html
-    assert_select "h2", :text => "#{@nodes.size} Recently Changed Nodes", :count => 1
-    assert_select "ul[id='recently_changed'] li a", :count => @nodes.size
-    @nodes.each do |node|
-      name = node.tags_as_hash['name'].to_s
-      name = "(No name)" if name.length == 0
-      assert_select "ul[id='recently_changed'] li a[href=/browse/node/#{node.id}]", :text => "#{name} - #{node.id} (#{node.version})"
-    end

   end
   
   end
   

-  # Test reading a relation

   def test_read_relation
   def test_read_relation

-    
+    browse_check 'relation', relations(:visible_relation)

   end
   
   def test_read_relation_history
   end
   
   def test_read_relation_history

-    
+    browse_check 'relation_history', relations(:visible_relation)

   end
   
   def test_read_way
   end
   
   def test_read_way

-    
+    browse_check 'way', ways(:visible_way)

   end
   
   def test_read_way_history
   end
   
   def test_read_way_history

-    
+    browse_check 'way_history', ways(:visible_way)

   end
   
   def test_read_node
   end
   
   def test_read_node

-    
+    browse_check 'node', nodes(:visible_node)

   end
   
   def test_read_node_history
   end
   
   def test_read_node_history

-    
+    browse_check 'node_history', nodes(:visible_node)

   end
   
   def test_read_changeset
   end
   
   def test_read_changeset

-    
+    browse_check 'changeset', changesets(:normal_user_first_change)
+  end
+  
+  # This is a convenience method for most of the above checks
+  # First we check that when we don't have an id, it will correctly return a 404
+  # then we check that we get the correct 404 when a non-existant id is passed
+  # then we check that it will get a successful response, when we do pass an id
+  def browse_check(type, fixture) 
+    get type
+    assert_response :not_found
+    assert_template 'not_found'
+    get type, {:id => -10} # we won't have an id that's negative
+    assert_response :not_found
+    assert_template 'not_found'
+    get type, {:id => fixture.id}
+    assert_response :success
+    assert_template type

   end
 end
   end
 end