Changed display_posts_in_current_language to false by default

Daniela Feitosa
1 parent ee4938d9
Showing 4 changed files with 18 additions and 9 deletions Show diff stats
app/models/blog.rb
test/functional/cms_controller_test.rb
test/functional/content_viewer_controller_test.rb
test/unit/blog_test.rb
@@ -68,7 +68,7 @@ class Blog &lt; Folder
   settings_items :visualization_format, :type => :string, :default => 'full'
   validates_inclusion_of :visualization_format, :in => [ 'full', 'short' ], :if => :visualization_format
-  settings_items :display_posts_in_current_language, :type => :boolean, :default => true
+  settings_items :display_posts_in_current_language, :type => :boolean, :default => false
   alias :display_posts_in_current_language? :display_posts_in_current_language
@@ -1323,11 +1323,17 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_no_tag :select, :attributes => { :id => 'article_language'}
   end
-  should 'display display posts in current language input checked on edit blog' do
-    get :new, :profile => profile.identifier, :type => 'Blog'
+  should 'display display posts in current language input checked when editing blog' do
+    profile.articles << Blog.new(:name => 'Blog for test', :profile => profile, :display_posts_in_current_language => true)
+    get :edit, :profile => profile.identifier, :id => profile.blog.id
     assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[display_posts_in_current_language]', :checked => 'checked' }
   end
+  should 'display display posts in current language input not checked on new blog' do
+    get :new, :profile => profile.identifier, :type => 'Blog'
+    assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[display_posts_in_current_language]', :checked => 'checked' }
+  end
+
   should 'update to false blog display posts in current language setting' do
     profile.articles << Blog.new(:name => 'Blog for test', :profile => profile, :display_posts_in_current_language => true)
     post :edit, :profile => profile.identifier, :id => profile.blog.id, :article => { :display_posts_in_current_language => false }
@@ -1135,7 +1135,8 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'replace article for his translation at blog listing if blog option is enabled' do
     FastGettext.stubs(:locale).returns('es')
     blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
-    blog.stubs(:display_posts_in_current_language).returns(true)
+    blog.display_posts_in_current_language = true
+    blog.save
     en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
     es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
@@ -1147,7 +1148,8 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'not display article at blog listing if blog option is enabled and there is no translation for the language' do
     FastGettext.stubs(:locale).returns('pt')
     blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
-    blog.stubs(:display_posts_in_current_language).returns(true)
+    blog.display_posts_in_current_language = true
+    blog.save
     en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
     es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
     pt_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'pt', :parent_id => blog.id, :translation_of_id => en_article)
@@ -1175,7 +1177,8 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
   should 'display only native translations at blog listing if blog option is enabled' do
     FastGettext.stubs(:locale).returns('es')
     blog = fast_create(Blog, :profile_id => profile.id, :path => 'blog')
-    blog.stubs(:display_posts_in_current_language).returns(true)
+    blog.display_posts_in_current_language = true
+    blog.save!
     en_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'en_article', :language => 'en', :parent_id => blog.id)
     es_article = fast_create(TextileArticle, :profile_id => @profile.id, :path => 'es_article', :language => 'es', :parent_id => blog.id, :translation_of_id => en_article)
     blog.posts = [en_article, es_article]
@@ -179,10 +179,10 @@ class BlogTest &lt; ActiveSupport::TestCase
     assert Blog.new.has_posts?
   end
-  should 'display posts in current language by default' do
+  should 'not display posts in current language by default' do
     blog = Blog.new
-    assert blog.display_posts_in_current_language
-    assert blog.display_posts_in_current_language?
+    assert !blog.display_posts_in_current_language
+    assert !blog.display_posts_in_current_language?
   end
   should 'update display posts in current language setting' do
	@@ -68,7 +68,7 @@ class Blog < Folder		@@ -68,7 +68,7 @@ class Blog < Folder
68	settings_items :visualization_format, :type => :string, :default => 'full'	68	settings_items :visualization_format, :type => :string, :default => 'full'
69	validates_inclusion_of :visualization_format, :in => [ 'full', 'short' ], :if => :visualization_format	69	validates_inclusion_of :visualization_format, :in => [ 'full', 'short' ], :if => :visualization_format
70		70
71	- settings_items :display_posts_in_current_language, :type => :boolean, :default => true	71	+ settings_items :display_posts_in_current_language, :type => :boolean, :default => false
72		72
73	alias :display_posts_in_current_language? :display_posts_in_current_language	73	alias :display_posts_in_current_language? :display_posts_in_current_language
74		74