Merge remote-tracking branch 'upstream/pull/2509'

[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 e18cc04f9f8e6ba12670b5f134b3f9cf452ee3ca..4dc07f9960a8613b43248d16d541ec28ac4f7aa0 100644 (file)
--- a/test/controllers/site_controller_test.rb
+++ b/test/controllers/site_controller_test.rb
@@ -8,8 +8,6 @@ class SiteControllerTest < ActionController::TestCase
 
     Settings.id_key = create(:client_application).key
     Settings.potlatch2_key = create(:client_application).key
 
     Settings.id_key = create(:client_application).key
     Settings.potlatch2_key = create(:client_application).key

-
-    stub_hostip_requests

   end
 
   ##
   end
 
   ##


@@ -421,6 +419,17 @@ class SiteControllerTest < ActionController::TestCase
     get :copyright
     assert_response :success
     assert_template "copyright"
     get :copyright
     assert_response :success
     assert_template "copyright"

+    assert_select "div[lang='en'][dir='ltr']"
+
+    get :copyright, :params => { :copyright_locale => "fr" }
+    assert_response :success
+    assert_template "copyright"
+    assert_select "div[lang='fr'][dir='ltr']"
+
+    get :copyright, :params => { :copyright_locale => "ar" }
+    assert_response :success
+    assert_template "copyright"
+    assert_select "div[lang='ar'][dir='rtl']"

   end
 
   # Test the welcome page
   end
 
   # Test the welcome page


@@ -453,6 +462,17 @@ class SiteControllerTest < ActionController::TestCase
     get :about
     assert_response :success
     assert_template "about"
     get :about
     assert_response :success
     assert_template "about"

+    assert_select "div[lang='en'][dir='ltr']"
+
+    get :about, :params => { :about_locale => "fr" }
+    assert_response :success
+    assert_template "about"
+    assert_select "div[lang='fr'][dir='ltr']"
+
+    get :about, :params => { :about_locale => "ar" }
+    assert_response :success
+    assert_template "about"
+    assert_select "div[lang='ar'][dir='rtl']"

   end
 
   # Test the export page
   end
 
   # Test the export page