rails4: fix profile tests

Braulio Bhavamitra
1 parent d1246cba
Showing 6 changed files with 12 additions and 11 deletions Show diff stats
lib/noosfero/core_ext/active_record.rb
test/factories.rb
test/unit/enterprise_test.rb
test/unit/environment_test.rb
test/unit/profile_test.rb
test/unit/uploaded_file_test.rb
@@ -9,10 +9,10 @@ class ActiveRecord::Base
   # an ActionView instance for rendering views on models
   def self.action_view
     @action_view ||= begin
-      view_paths = ActionController::Base.view_paths
-      action_view = ActionView::Base.new view_paths
+      view_paths = ::ActionController::Base.view_paths
+      action_view = ::ActionView::Base.new view_paths
       # for using Noosfero helpers inside render calls
-      action_view.extend ApplicationHelper
+      action_view.extend ::ApplicationHelper
       action_view
     end
   end
@@ -89,7 +89,7 @@ module Noosfero::Factory
       :password_confirmation => name.underscore
     }.merge(options)
     user = build(User, data)
-    user.person = build(Person, person_options)
+    user.person_data = person_options
     user.save!
     user
   end
@@ -38,7 +38,7 @@ class EnterpriseTest &lt; ActiveSupport::TestCase
   def test_has_domains
     p = Enterprise.new
-    assert_kind_of Array, p.domains
+    assert p.domains.empty?
   end
   def test_belongs_to_environment_and_has_default
@@ -173,7 +173,7 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
   should 'have regions' do
     env = fast_create(Environment)
-    assert_kind_of Array, env.regions
+    assert env.regions.empty?
     assert_raise ActiveRecord::AssociationTypeMismatch do
       env.regions << 1
     end
@@ -36,7 +36,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   def test_has_domains
     p = Profile.new
-    assert_kind_of Array, p.domains
+    assert p.domains.empty?
   end
   should 'be assigned to default environment if no environment is informed' do
@@ -771,7 +771,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'nickname be able to be nil' do
     p = Profile.new()
     p.valid?
-    assert_blank p.errors[:nickname]
+    assert p.errors[:nickname].blank?
   end
   should 'filter html from nickname' do
@@ -1382,13 +1382,13 @@ class ProfileTest &lt; ActiveSupport::TestCase
   should 'profile be valid when image is empty' do
     profile = build(Profile, :image_builder => {:uploaded_data => ""})
     profile.valid?
-    assert_blank profile.errors[:image]
+    assert profile.errors[:image].blank?
   end
   should 'profile be valid when has no image' do
     profile = Profile.new
     profile.valid?
-    assert_blank profile.errors[:image]
+    assert profile.errors[:image].blank?
   end
   should 'copy header and footer after create a person' do
@@ -1398,6 +1398,7 @@ class ProfileTest &lt; ActiveSupport::TestCase
     Environment.any_instance.stubs(:person_default_template).returns(template)
     person = create_user_full('mytestuser').person
+    assert_equal person.environment.person_default_template, person.template
     assert_equal "footer customized", person.custom_footer
     assert_equal "header customized", person.custom_header
   end
@@ -147,7 +147,7 @@ class UploadedFileTest &lt; ActiveSupport::TestCase
   should 'use name as title by default but cut down the title' do
     upload = build(UploadedFile, :uploaded_data => fixture_file_upload('/files/AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.txt'))
     upload.valid?
-    assert_blank upload.errors[:title]
+    assert upload.errors[:title].blank?
   end
   should 'create thumbnails after processing jobs' do
	@@ -89,7 +89,7 @@ module Noosfero::Factory		@@ -89,7 +89,7 @@ module Noosfero::Factory
89	:password_confirmation => name.underscore	89	:password_confirmation => name.underscore
90	}.merge(options)	90	}.merge(options)
91	user = build(User, data)	91	user = build(User, data)
92	- user.person = build(Person, person_options)	92	+ user.person_data = person_options
93	user.save!	93	user.save!
94	user	94	user
95	end	95	end
	@@ -38,7 +38,7 @@ class EnterpriseTest < ActiveSupport::TestCase		@@ -38,7 +38,7 @@ class EnterpriseTest < ActiveSupport::TestCase
38		38
39	def test_has_domains	39	def test_has_domains
40	p = Enterprise.new	40	p = Enterprise.new
41	- assert_kind_of Array, p.domains	41	+ assert p.domains.empty?
42	end	42	end
43		43
44	def test_belongs_to_environment_and_has_default	44	def test_belongs_to_environment_and_has_default
	@@ -173,7 +173,7 @@ class EnvironmentTest < ActiveSupport::TestCase		@@ -173,7 +173,7 @@ class EnvironmentTest < ActiveSupport::TestCase
173		173
174	should 'have regions' do	174	should 'have regions' do
175	env = fast_create(Environment)	175	env = fast_create(Environment)
176	- assert_kind_of Array, env.regions	176	+ assert env.regions.empty?
177	assert_raise ActiveRecord::AssociationTypeMismatch do	177	assert_raise ActiveRecord::AssociationTypeMismatch do
178	env.regions << 1	178	env.regions << 1
179	end	179	end
	@@ -147,7 +147,7 @@ class UploadedFileTest < ActiveSupport::TestCase		@@ -147,7 +147,7 @@ class UploadedFileTest < ActiveSupport::TestCase
147	should 'use name as title by default but cut down the title' do	147	should 'use name as title by default but cut down the title' do
148	upload = build(UploadedFile, :uploaded_data => fixture_file_upload('/files/AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.txt'))	148	upload = build(UploadedFile, :uploaded_data => fixture_file_upload('/files/AGENDA_CULTURA_-_FESTA_DE_VAQUEIROS_PONTO_DE_SERRA_PRETA_BAIXA.txt'))
149	upload.valid?	149	upload.valid?
150	- assert_blank upload.errors[:title]	150	+ assert upload.errors[:title].blank?
151	end	151	end
152		152
153	should 'create thumbnails after processing jobs' do	153	should 'create thumbnails after processing jobs' do