Fixing person unit tests

- Improves code style Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>

Fixing person unit tests
- Improves code style Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
David Silva
1 parent 97e25590
Showing 2 changed files with 35 additions and 11 deletions Show diff stats
lib/person_data_export.rb
test/unit/person_test.rb
@@ -30,8 +30,9 @@ module PersonDataExport
   end
   def person_commuinities_attrs(attrs, person)
+    communities_count = person.communities.count - person.softwares.count
     attrs['communities-count'] = person.respond_to?("softwares") ?
-                                 person.communities.count - person.softwares.count :
+                                 communities_count :
                                  person.communities.count
     attrs['communities'] = []
     person.communities.each do |community|
@@ -43,7 +44,8 @@ module PersonDataExport
   end
   def person_softwares_attrs(attrs, person)
-    attrs['softwares-count'] = person.respond_to?("softwares") ? person.softwares.count : 0
+    attrs['softwares-count'] = person.respond_to?("softwares") ?
+                               person.softwares.count : 0
     attrs['softwares'] = []
     if person.respond_to?("softwares")
       person.softwares.each do |software|
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 class PersonTest < ActiveSupport::TestCase
+  include PersonDataExport
+
   def setup
     @john = fast_create(Person, :name => "John Snow")
     @arya = fast_create(Person, :name => "Arya Stark")
@@ -23,9 +25,9 @@ class PersonTest &lt; ActiveSupport::TestCase
   end
   should 'get the attributes of Joffrey Lannister' do
-    attributes = @joffrey.attr_to_hash
+    attributes = person_attr_to_hash @joffrey
-    assert_equal attributes["type"], "Person"
+    assert_equal attributes["data"]["type"], "Person"
     assert_equal attributes["data"]["name"], "Joffrey Lannister"
     assert_equal attributes["articles-count"], 0
@@ -36,8 +38,8 @@ class PersonTest &lt; ActiveSupport::TestCase
   end
   should 'get friendship information' do
-    attributes_joffrey = @joffrey.attr_to_hash
-    attributes_arya = @arya.attr_to_hash
+    attributes_joffrey = person_attr_to_hash @joffrey
+    attributes_arya = person_attr_to_hash @arya
     assert_equal attributes_joffrey["friends-count"], 0
     assert_equal attributes_arya["friends-count"], 1
@@ -50,11 +52,31 @@ class PersonTest &lt; ActiveSupport::TestCase
     @environment.add_admin(@arya)
     @environment.save
-    @thrones_the_game = SoftwareInfo.new
-    @thrones_the_game.community_id = @game_of_thrones.id
-    @thrones_the_game.save
-
-    attributes = @john.attr_to_hash
+    thrones_the_game = SoftwareInfo.new
+    thrones_the_game.community_id = @game_of_thrones.id
+    thrones_the_game.public_software = true
+
+    license_gpl = LicenseInfo.create(
+      :version=>"CC-GPL-V2",
+      :link=>"http://creativecommons.org/licenses/GPL/2.0/legalcode.pt"
+    )
+    thrones_the_game.license_info = license_gpl
+
+    software = Category.create(:name => _("Software"),
+                               :environment => @environment)
+    categories = []
+    categories << Category.create(:name => "TBS",
+                                  :environment => @environment,
+                                  :parent => software)
+    categories << Category.create(:name => "War",
+                                  :environment => @environment,
+                                  :parent => software)
+    thrones_the_game.community.categories << categories
+
+    thrones_the_game.finality = "teste"
+    thrones_the_game.save
+
+    attributes = person_attr_to_hash @arya
     assert_equal attributes["softwares-count"], 1
     assert_equal attributes["softwares"][0]["name"], "Game of Thrones"