Merge branch 'pull/3472'

[rails.git] / test / controllers / site_controller_test.rb

diff --git a/test/controllers/site_controller_test.rb b/test/controllers/site_controller_test.rb
index 776e9448a6bd2f3bbfb6312586b47aa2e5f678a4..6f6e7dcfa886c9af85a713029d104a51437c6f60 100644 (file)
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -1,20 +1,18 @@
 require "test_helper"
 
 require "test_helper"
 

-class SiteControllerTest < ActionController::TestCase
-  api_fixtures
-
+class SiteControllerTest < ActionDispatch::IntegrationTest

   ##
   # setup oauth keys
   def setup
   ##
   # setup oauth keys
   def setup

-    Object.const_set("ID_KEY", client_applications(:oauth_web_app).key)
-    Object.const_set("POTLATCH2_KEY", client_applications(:oauth_web_app).key)
+    super
+
+    Settings.id_key = create(:client_application).key

   end
 
   ##
   # clear oauth keys
   def teardown
   end
 
   ##
   # clear oauth keys
   def teardown

-    Object.send("remove_const", "ID_KEY")
-    Object.send("remove_const", "POTLATCH2_KEY")
+    Settings.id_key = nil

   end
 
   ##
   end
 
   ##


@@ -52,6 +50,18 @@ class SiteControllerTest < ActionController::TestCase
       { :path => "/fixthemap", :method => :get },
       { :controller => "site", :action => "fixthemap" }
     )
       { :path => "/fixthemap", :method => :get },
       { :controller => "site", :action => "fixthemap" }
     )

+    assert_routing(
+      { :path => "/help", :method => :get },
+      { :controller => "site", :action => "help" }
+    )
+    assert_routing(
+      { :path => "/about", :method => :get },
+      { :controller => "site", :action => "about" }
+    )
+    assert_routing(
+      { :path => "/about/locale", :method => :get },
+      { :controller => "site", :action => "about", :about_locale => "locale" }
+    )

     assert_routing(
       { :path => "/export", :method => :get },
       { :controller => "site", :action => "export" }
     assert_routing(
       { :path => "/export", :method => :get },
       { :controller => "site", :action => "export" }


@@ -73,8 +83,8 @@ class SiteControllerTest < ActionController::TestCase
       { :controller => "site", :action => "permalink", :code => "shortcode" }
     )
     assert_routing(
       { :controller => "site", :action => "permalink", :code => "shortcode" }
     )
     assert_routing(

-      { :path => "/preview/formatname", :method => :post },
-      { :controller => "site", :action => "preview", :format => "formatname" }
+      { :path => "/preview/typename", :method => :post },
+      { :controller => "site", :action => "preview", :type => "typename" }

     )
     assert_routing(
       { :path => "/id", :method => :get },
     )
     assert_routing(
       { :path => "/id", :method => :get },


@@ -84,63 +94,80 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the index page
   def test_index
 
   # Test the index page
   def test_index

-    get :index
+    get root_path
+

     assert_response :success
     assert_template "index"
   end
 
   # Test the index page redirects
   def test_index_redirect
     assert_response :success
     assert_template "index"
   end
 
   # Test the index page redirects
   def test_index_redirect

-    get :index, :lat => 4, :lon => 5
+    get root_path(:node => 123)
+    assert_redirected_to :controller => :browse, :action => :node, :id => 123
+
+    get root_path(:way => 123)
+    assert_redirected_to :controller => :browse, :action => :way, :id => 123
+
+    get root_path(:relation => 123)
+    assert_redirected_to :controller => :browse, :action => :relation, :id => 123
+
+    get root_path(:note => 123)
+    assert_redirected_to :controller => :browse, :action => :note, :id => 123
+
+    get root_path(:query => "test")
+    assert_redirected_to :controller => :geocoder, :action => :search, :query => "test"
+
+    get root_path(:lat => 4, :lon => 5)

     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=5/4/5"
 
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=5/4/5"
 

-    get :index, :lat => 4, :lon => 5, :zoom => 3
+    get root_path(:lat => 4, :lon => 5, :zoom => 3)

     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4/5"
 
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4/5"
 

-    get :index, :layers => "T"
+    get root_path(:layers => "T")

     assert_redirected_to :controller => :site, :action => :index, :anchor => "layers=T"
 
     assert_redirected_to :controller => :site, :action => :index, :anchor => "layers=T"
 

-    get :index, :notes => "yes"
+    get root_path(:notes => "yes")

     assert_redirected_to :controller => :site, :action => :index, :anchor => "layers=N"
 
     assert_redirected_to :controller => :site, :action => :index, :anchor => "layers=N"
 

-    get :index, :lat => 4, :lon => 5, :zoom => 3, :layers => "T"
+    get root_path(:lat => 4, :lon => 5, :zoom => 3, :layers => "T")

     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4/5&layers=T"
   end
 
   # Test the permalink redirect
   def test_permalink
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4/5&layers=T"
   end
 
   # Test the permalink redirect
   def test_permalink

-    get :permalink, :code => "wBz3--"
+    get permalink_path(:code => "wBz3--")

     assert_response :redirect
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4.8779296875/3.955078125"
 
     assert_response :redirect
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4.8779296875/3.955078125"
 

-    get :permalink, :code => "wBz3--", :m => ""
+    get permalink_path(:code => "wBz3--", :m => "")

     assert_response :redirect
     assert_redirected_to :controller => :site, :action => :index, :mlat => "4.8779296875", :mlon => "3.955078125", :anchor => "map=3/4.8779296875/3.955078125"
 
     assert_response :redirect
     assert_redirected_to :controller => :site, :action => :index, :mlat => "4.8779296875", :mlon => "3.955078125", :anchor => "map=3/4.8779296875/3.955078125"
 

-    get :permalink, :code => "wBz3--", :layers => "T"
+    get permalink_path(:code => "wBz3--", :layers => "T")

     assert_response :redirect
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4.8779296875/3.955078125&layers=T"
 
     assert_response :redirect
     assert_redirected_to :controller => :site, :action => :index, :anchor => "map=3/4.8779296875/3.955078125&layers=T"
 

-    get :permalink, :code => "wBz3--", :node => 1
+    get permalink_path(:code => "wBz3--", :node => 1)

     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :node, :id => 1, :anchor => "map=3/4.8779296875/3.955078125"
 
     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :node, :id => 1, :anchor => "map=3/4.8779296875/3.955078125"
 

-    get :permalink, :code => "wBz3--", :way => 2
+    get permalink_path(:code => "wBz3--", :way => 2)

     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :way, :id => 2, :anchor => "map=3/4.8779296875/3.955078125"
 
     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :way, :id => 2, :anchor => "map=3/4.8779296875/3.955078125"
 

-    get :permalink, :code => "wBz3--", :relation => 3
+    get permalink_path(:code => "wBz3--", :relation => 3)

     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :relation, :id => 3, :anchor => "map=3/4.8779296875/3.955078125"
 
     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :relation, :id => 3, :anchor => "map=3/4.8779296875/3.955078125"
 

-    get :permalink, :code => "wBz3--", :changeset => 4
+    get permalink_path(:code => "wBz3--", :changeset => 4)

     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :changeset, :id => 4, :anchor => "map=3/4.8779296875/3.955078125"
   end
 
   # Test the key page
   def test_key
     assert_response :redirect
     assert_redirected_to :controller => :browse, :action => :changeset, :id => 4, :anchor => "map=3/4.8779296875/3.955078125"
   end
 
   # Test the key page
   def test_key

-    xhr :get, :key
+    get key_path, :xhr => true
+

     assert_response :success
     assert_template "key"
     assert_template :layout => false
     assert_response :success
     assert_template "key"
     assert_template :layout => false


@@ -148,217 +175,331 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the edit page redirects when you aren't logged in
   def test_edit
 
   # Test the edit page redirects when you aren't logged in
   def test_edit

-    get :edit
+    get edit_path
+

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => "/edit"
+    assert_redirected_to login_path(:referer => "/edit")
+  end
+
+  # Test the error when trying to edit without public edits
+  def test_edit_non_public
+    session_for(create(:user, :data_public => false))
+
+    get edit_path
+
+    assert_response :success
+    assert_template "edit"
+    assert_select "a[href='https://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits']"

   end
 
   # Test the right editor gets used when the user hasn't set a preference
   def test_edit_without_preference
   end
 
   # Test the right editor gets used when the user hasn't set a preference
   def test_edit_without_preference

-    get :edit, nil, :user => users(:public_user).id
+    session_for(create(:user))
+
+    get edit_path
+

     assert_response :success
     assert_template "edit"
     assert_response :success
     assert_template "edit"

-    assert_template :partial => "_#{DEFAULT_EDITOR}", :count => 1
+    assert_template :partial => "_#{Settings.default_editor}", :count => 1

   end
 
   # Test the right editor gets used when the user has set a preference
   def test_edit_with_preference
   end
 
   # Test the right editor gets used when the user has set a preference
   def test_edit_with_preference

-    user = users(:public_user)
+    user = create(:user)

     user.preferred_editor = "id"
     user.save!
     user.preferred_editor = "id"
     user.save!

+    session_for(user)

 
 

-    get :edit, nil, :user => user.id
+    get edit_path

     assert_response :success
     assert_template "edit"
     assert_template :partial => "_id", :count => 1
 
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_id", :count => 1
 

-    user = users(:public_user)

     user.preferred_editor = "potlatch2"
     user.save!
 
     user.preferred_editor = "potlatch2"
     user.save!
 

-    get :edit, nil, :user => user.id
+    get edit_path

     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch2", :count => 1
 
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch2", :count => 1
 

-    user = users(:public_user)

     user.preferred_editor = "potlatch"
     user.save!
 
     user.preferred_editor = "potlatch"
     user.save!
 

-    get :edit, nil, :user => user.id
+    get edit_path

     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch", :count => 1
 
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch", :count => 1
 

-    user = users(:public_user)

     user.preferred_editor = "remote"
     user.save!
 
     user.preferred_editor = "remote"
     user.save!
 

-    get :edit, nil, :user => user.id
+    get edit_path

     assert_response :success
     assert_template "index"
   end
 
   # Test the right editor gets used when the URL has an override
   def test_edit_with_override
     assert_response :success
     assert_template "index"
   end
 
   # Test the right editor gets used when the URL has an override
   def test_edit_with_override

-    get :edit, { :editor => "id" }, { :user => users(:public_user).id }
+    session_for(create(:user))
+
+    get edit_path(:editor => "id")

     assert_response :success
     assert_template "edit"
     assert_template :partial => "_id", :count => 1
 
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_id", :count => 1
 

-    get :edit, { :editor => "potlatch2" }, { :user => users(:public_user).id }
+    get edit_path(:editor => "potlatch2")

     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch2", :count => 1
 
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch2", :count => 1
 

-    get :edit, { :editor => "potlatch" }, { :user => users(:public_user).id }
+    get edit_path(:editor => "potlatch")

     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch", :count => 1
 
     assert_response :success
     assert_template "edit"
     assert_template :partial => "_potlatch", :count => 1
 

-    get :edit, { :editor => "remote" }, { :user => users(:public_user).id }
+    get edit_path(:editor => "remote")

     assert_response :success
     assert_template "index"
   end
 
     assert_response :success
     assert_template "index"
   end
 

-  # Test the right editor gets used when the browser is IE
-  def test_edit_with_ie
-    @request.env["HTTP_USER_AGENT"] = "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.1; Trident/7.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; .NET4.0C; .NET4.0E)"
+  # Test editing a specific node
+  def test_edit_with_node
+    user = create(:user)
+    node = create(:node, :lat => 1.0, :lon => 1.0)
+    session_for(user)

 
 

-    get :edit, {}, { :user => users(:public_user).id }
-    assert_response :success
-    assert_template "edit"
-    assert_template :partial => "_potlatch2", :count => 1
+    get edit_path(:node => node.id)

 
 

-    get :edit, { :editor => "id" }, { :user => users(:public_user).id }

     assert_response :success
     assert_template "edit"
     assert_response :success
     assert_template "edit"

-    assert_template :partial => "_potlatch2", :count => 1
+    assert_in_delta(1.0, assigns(:lat))
+    assert_in_delta(1.0, assigns(:lon))
+    assert_equal 18, assigns(:zoom)
+  end

 
 

-    @request.env["HTTP_USER_AGENT"] = "Mozilla/5.0 (Windows NT 6.3; WOW64; Trident/7.0; rv:11.0) like Gecko"
+  # Test editing inaccessible nodes
+  def test_edit_with_inaccessible_nodes
+    user = create(:user)
+    deleted_node = create(:node, :lat => 1.0, :lon => 1.0, :visible => false)
+    session_for(user)

 
 

-    get :edit, {}, { :user => users(:public_user).id }
+    get edit_path(:node => 99999)

     assert_response :success
     assert_template "edit"
     assert_response :success
     assert_template "edit"

-    assert_template :partial => "_potlatch2", :count => 1
+    assert_nil assigns(:lat)
+    assert_nil assigns(:lon)
+    assert_nil assigns(:zoom)

 
 

-    get :edit, { :editor => "id" }, { :user => users(:public_user).id }
+    get edit_path(:node => deleted_node.id)

     assert_response :success
     assert_template "edit"
     assert_response :success
     assert_template "edit"

-    assert_template :partial => "_potlatch2", :count => 1
+    assert_nil assigns(:lat)
+    assert_nil assigns(:lon)
+    assert_nil assigns(:zoom)

   end
 
   end
 

-  # Test editing a specific node
-  def test_edit_with_node
-    user = users(:public_user)
-    node = current_nodes(:visible_node)
+  # Test editing a specific way
+  def test_edit_with_way
+    user = create(:user)
+    node = create(:node, :lat => 3, :lon => 3)
+    way = create(:way)
+    create(:way_node, :node => node, :way => way)
+    session_for(user)

 
 

-    get :edit, { :node => node.id }, { :user => user.id }
+    get edit_path(:way => way.id)

     assert_response :success
     assert_template "edit"
     assert_response :success
     assert_template "edit"

-    assert_equal 1.0, assigns(:lat)
-    assert_equal 1.0, assigns(:lon)
-    assert_equal 18, assigns(:zoom)
+    assert_in_delta(3.0, assigns(:lat))
+    assert_in_delta(3.0, assigns(:lon))
+    assert_equal 17, assigns(:zoom)

   end
 
   end
 

-  # Test editing a specific way
-  def test_edit_with_way
-    user = users(:public_user)
-    way  = current_ways(:visible_way)
+  # Test editing inaccessible ways
+  def test_edit_with_inaccessible_ways
+    user = create(:user)
+    deleted_way = create(:way, :visible => false)
+    session_for(user)

 
 

-    get :edit, { :way => way.id }, { :user => user.id }
+    get edit_path(:way => 99999)

     assert_response :success
     assert_template "edit"
     assert_response :success
     assert_template "edit"

-    assert_equal 3.0, assigns(:lat)
-    assert_equal 3.0, assigns(:lon)
-    assert_equal 17, assigns(:zoom)
+    assert_nil assigns(:lat)
+    assert_nil assigns(:lon)
+    assert_nil assigns(:zoom)
+
+    get edit_path(:way => deleted_way.id)
+    assert_response :success
+    assert_template "edit"
+    assert_nil assigns(:lat)
+    assert_nil assigns(:lon)
+    assert_nil assigns(:zoom)

   end
 
   # Test editing a specific note
   def test_edit_with_note
   end
 
   # Test editing a specific note
   def test_edit_with_note

-    user = users(:public_user)
-    note  = notes(:open_note)
+    user = create(:user)
+    note = create(:note) do |n|
+      n.comments.create(:author_id => user.id)
+    end
+    session_for(user)

 
 

-    get :edit, { :note => note.id }, { :user => user.id }
+    get edit_path(:note => note.id)

     assert_response :success
     assert_template "edit"
     assert_response :success
     assert_template "edit"

-    assert_equal 1.0, assigns(:lat)
-    assert_equal 1.0, assigns(:lon)
+    assert_in_delta(1.0, assigns(:lat))
+    assert_in_delta(1.0, assigns(:lon))

     assert_equal 17, assigns(:zoom)
   end
 
     assert_equal 17, assigns(:zoom)
   end
 

+  # Test editing inaccessible notes
+  def test_edit_with_inaccessible_notes
+    user = create(:user)
+    deleted_note = create(:note, :status => "hidden") do |n|
+      n.comments.create(:author_id => user.id)
+    end
+    session_for(user)
+
+    get edit_path(:note => 99999)
+    assert_response :success
+    assert_template "edit"
+    assert_nil assigns(:lat)
+    assert_nil assigns(:lon)
+    assert_nil assigns(:zoom)
+
+    get edit_path(:note => deleted_note.id)
+    assert_response :success
+    assert_template "edit"
+    assert_nil assigns(:lat)
+    assert_nil assigns(:lon)
+    assert_nil assigns(:zoom)
+  end
+

   # Test editing a specific GPX trace
   def test_edit_with_gpx
   # Test editing a specific GPX trace
   def test_edit_with_gpx

-    user = users(:public_user)
-    gpx  = gpx_files(:public_trace_file)
+    user = create(:user)
+    gpx = create(:trace, :latitude => 1, :longitude => 1)
+    session_for(user)

 
 

-    get :edit, { :gpx => gpx.id }, { :user => user.id }
+    get edit_path(:gpx => gpx.id)

     assert_response :success
     assert_template "edit"
     assert_response :success
     assert_template "edit"

-    assert_equal 1.0, assigns(:lat)
-    assert_equal 1.0, assigns(:lon)
+    assert_in_delta(1.0, assigns(:lat))
+    assert_in_delta(1.0, assigns(:lon))

     assert_equal 16, assigns(:zoom)
   end
 
     assert_equal 16, assigns(:zoom)
   end
 

+  # Test editing inaccessible GPX traces
+  def test_edit_with_inaccessible_gpxes
+    user = create(:user)
+    deleted_gpx = create(:trace, :deleted, :latitude => 1, :longitude => 1)
+    private_gpx = create(:trace, :latitude => 1, :longitude => 1, :visibility => "private")
+    session_for(user)
+
+    get edit_path(:gpx => 99999)
+    assert_response :success
+    assert_template "edit"
+    assert_nil assigns(:lat)
+    assert_nil assigns(:lon)
+    assert_nil assigns(:zoom)
+
+    get edit_path(:gpx => deleted_gpx.id)
+    assert_response :success
+    assert_template "edit"
+    assert_nil assigns(:lat)
+    assert_nil assigns(:lon)
+    assert_nil assigns(:zoom)
+
+    get edit_path(:gpx => private_gpx.id)
+    assert_response :success
+    assert_template "edit"
+    assert_nil assigns(:lat)
+    assert_nil assigns(:lon)
+    assert_nil assigns(:zoom)
+  end
+

   # Test the edit page redirects
   def test_edit_redirect
   # Test the edit page redirects
   def test_edit_redirect

-    get :edit, :lat => 4, :lon => 5
+    get edit_path(:lat => 4, :lon => 5)

     assert_redirected_to :controller => :site, :action => :edit, :anchor => "map=5/4/5"
 
     assert_redirected_to :controller => :site, :action => :edit, :anchor => "map=5/4/5"
 

-    get :edit, :lat => 4, :lon => 5, :zoom => 3
+    get edit_path(:lat => 4, :lon => 5, :zoom => 3)

     assert_redirected_to :controller => :site, :action => :edit, :anchor => "map=3/4/5"
 
     assert_redirected_to :controller => :site, :action => :edit, :anchor => "map=3/4/5"
 

-    get :edit, :lat => 4, :lon => 5, :zoom => 3, :editor => "id"
+    get edit_path(:lat => 4, :lon => 5, :zoom => 3, :editor => "id")

     assert_redirected_to :controller => :site, :action => :edit, :editor => "id", :anchor => "map=3/4/5"
   end
 
   # Test the copyright page
   def test_copyright
     assert_redirected_to :controller => :site, :action => :edit, :editor => "id", :anchor => "map=3/4/5"
   end
 
   # Test the copyright page
   def test_copyright

-    get :copyright
+    get copyright_path
+    assert_response :success
+    assert_template "copyright"
+    assert_select "div[lang='en'][dir='ltr']"
+
+    get copyright_path(:copyright_locale => "fr")
+    assert_response :success
+    assert_template "copyright"
+    assert_select "div[lang='fr'][dir='ltr']"
+
+    get copyright_path(:copyright_locale => "ar")

     assert_response :success
     assert_template "copyright"
     assert_response :success
     assert_template "copyright"

+    assert_select "div[lang='ar'][dir='rtl']"

   end
 
   # Test the welcome page
   def test_welcome
   end
 
   # Test the welcome page
   def test_welcome

-    get :welcome
+    get welcome_path

     assert_response :redirect
     assert_response :redirect

-    assert_redirected_to :controller => :user, :action => :login, :referer => "/welcome"
+    assert_redirected_to login_path(:referer => "/welcome")

 
 

-    get :welcome, nil, :user => users(:public_user).id
+    session_for(create(:user))
+    get welcome_path

     assert_response :success
     assert_template "welcome"
   end
 
   # Test the fixthemap page
   def test_fixthemap
     assert_response :success
     assert_template "welcome"
   end
 
   # Test the fixthemap page
   def test_fixthemap

-    get :fixthemap
+    get fixthemap_path

     assert_response :success
     assert_template "fixthemap"
   end
 
   # Test the help page
   def test_help
     assert_response :success
     assert_template "fixthemap"
   end
 
   # Test the help page
   def test_help

-    get :help
+    get help_path

     assert_response :success
     assert_template "help"
   end
 
   # Test the about page
   def test_about
     assert_response :success
     assert_template "help"
   end
 
   # Test the about page
   def test_about

-    get :about
+    get about_path
+    assert_response :success
+    assert_template "about"
+    assert_select "div[lang='en'][dir='ltr']"
+
+    get about_path(:about_locale => "fr")

     assert_response :success
     assert_template "about"
     assert_response :success
     assert_template "about"

+    assert_select "div[lang='fr'][dir='ltr']"
+
+    get about_path(:about_locale => "ar")
+    assert_response :success
+    assert_template "about"
+    assert_select "div[lang='ar'][dir='rtl']"

   end
 
   # Test the export page
   def test_export
   end
 
   # Test the export page
   def test_export

-    get :export
+    get export_path

     assert_response :success
     assert_template "export"
     assert_template :layout => "map"
 
     assert_response :success
     assert_template "export"
     assert_template :layout => "map"
 

-    xhr :get, :export
+    get export_path, :xhr => true

     assert_response :success
     assert_template "export"
     assert_template :layout => "xhr"
     assert_response :success
     assert_template "export"
     assert_template :layout => "xhr"


@@ -366,26 +507,29 @@ class SiteControllerTest < ActionController::TestCase
 
   # Test the offline page
   def test_offline
 
   # Test the offline page
   def test_offline

-    get :offline
+    get offline_path

     assert_response :success
     assert_template "offline"
   end
 
   # Test the rich text preview
   def test_preview
     assert_response :success
     assert_template "offline"
   end
 
   # Test the rich text preview
   def test_preview

-    xhr :post, :preview, :format => "html"
+    post preview_path(:type => "html"), :xhr => true

     assert_response :success
 
     assert_response :success
 

-    xhr :post, :preview, :format => "markdown"
+    post preview_path(:type => "markdown"), :xhr => true

     assert_response :success
 
     assert_response :success
 

-    xhr :post, :preview, :format => "text"
+    post preview_path(:type => "text"), :xhr => true

     assert_response :success
   end
 
   # Test the id frame
   def test_id
     assert_response :success
   end
 
   # Test the id frame
   def test_id

-    get :id, nil, :user => users(:public_user).id
+    session_for(create(:user))
+
+    get id_path
+

     assert_response :success
     assert_template "id"
     assert_template :layout => false
     assert_response :success
     assert_template "id"
     assert_template :layout => false