uptodate with en.yml 15663

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

diff --git a/test/functional/diary_entry_controller_test.rb b/test/functional/diary_entry_controller_test.rb
index 41db4436f5c2e9916bdc8b35b149defa0310fd3b..709404045dbb1cb516d9444d40183557a69f31b2 100644 (file)
--- a/test/functional/diary_entry_controller_test.rb
+++ b/test/functional/diary_entry_controller_test.rb
@@ -16,11 +16,11 @@ class DiaryEntryControllerTest < ActionController::TestCase
     #print @response.to_yaml
     assert_select "html:root", :count => 1 do
       assert_select "head", :count => 1 do
     #print @response.to_yaml
     assert_select "html:root", :count => 1 do
       assert_select "head", :count => 1 do

-        assert_select "title", :text => /New diary entry/, :count => 1
+        assert_select "title", :text => /New Diary Entry/, :count => 1

       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do

-          assert_select "h1", "New diary entry", :count => 1
+          assert_select "h1", "New Diary Entry", :count => 1

           # We don't care about the layout, we just care about the form fields
           # that are available
           assert_select "form[action='/diary_entry/new']", :count => 1 do
           # We don't care about the layout, we just care about the form fields
           # that are available
           assert_select "form[action='/diary_entry/new']", :count => 1 do


@@ -72,7 +72,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
           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='/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 "select#diary_entry_language", :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
             assert_select "input[name=commit][type=submit][value=Save]", :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


@@ -87,10 +87,10 @@ class DiaryEntryControllerTest < ActionController::TestCase
     new_body = "This is a new body for the diary entry"
     new_latitude = "1.1"
     new_longitude = "2.2"
     new_body = "This is a new body for the diary entry"
     new_latitude = "1.1"
     new_longitude = "2.2"

-    new_language = "en"
+    new_language_code = "en"

     post(:edit, {:id => diary_entries(:normal_user_entry_1).id, 'commit' => 'save', 
       'diary_entry'=>{'title' => new_title, 'body' => new_body, 'latitude' => new_latitude,
     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, 'language' => new_language} },
+      'longitude' => new_longitude, 'language_code' => new_language_code} },

          {'user' => users(:normal_user).id})
     assert_response :redirect
     assert_redirected_to :action => :view, :id => diary_entries(:normal_user_entry_1).id
          {'user' => users(:normal_user).id})
     assert_response :redirect
     assert_redirected_to :action => :view, :id => diary_entries(:normal_user_entry_1).id