Fix functionals tests for new software

Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Gustavo Jaruga <darksshades@gmail.com> Signed-off-by: Luiz Matos <luizff.matos@gmail.com>

Fix functionals tests for new software
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Gustavo Jaruga <darksshades@gmail.com> Signed-off-by: Luiz Matos <luizff.matos@gmail.com>
Gabriela Navarro
1 parent 31d8c781
Showing 3 changed files with 42 additions and 6 deletions Show diff stats
test/functional/account_controller_test.rb
test/functional/mpog_software_plugin_myprofile_controller_test.rb
test/functional/software_test_helper.rb
@@ -45,7 +45,6 @@ class AccountControllerTest &lt; ActionController::TestCase
     @second_profile_data_info = {
       :name=>"Um outro usuario",
-      :area_interest=>"uma area ai"
     }
     disable_signup_bot_check
   end
@@ -129,7 +128,8 @@ class AccountControllerTest &lt; ActionController::TestCase
     post :signup, :user => @user_info, :profile_data => @profile_data_info
     assert !assigns(:user).save, "This should not have been saved."
-  
+  end
+
   should "user can register without secondary_email" do
     @user_info[:secondary_email] = ""
@@ -65,9 +65,8 @@ class MpogSoftwarePluginMyprofileControllerTest &lt; ActionController::TestCase
     fields = software_fields
     post :new_software, :profile => person.identifier, :community => fields[6], :license_info => fields[5],
                         :software_info => fields[0], :library => fields[1], :database => fields[3],
-                        :language => fields[2], :operating_system=> fields[4]
-
-    assert_equal SoftwareInfo.last.name, "Debian"
+                        :language => fields[2], :operating_system=> fields[4],:software_categories => fields[7]
+    assert_equal SoftwareInfo.last.community.name, "Debian"
   end
@@ -52,6 +52,16 @@ module SoftwareTestHelper
     license_info
   end
+  def create_categories categories_hash
+    software_categories = SoftwareCategories.new
+
+    categories_hash.each do |k,v|
+      software_categories[k] = v
+    end
+    software_categories.save
+    software_categories
+  end
+
   def create_software fields
     software = SoftwareInfo.new
@@ -63,6 +73,7 @@ module SoftwareTestHelper
     operating_system_hash  = fields[4]
     license_system_hash = fields[5]
     community_hash = fields[6]
+    categories_hash = fields[7]
     software_hash.each do |k,v|
       software[k] = v
@@ -79,6 +90,7 @@ module SoftwareTestHelper
     software.operating_systems << create_operating_system(operating_system_hash)
     software.license_info_id = license_system_hash
     software.libraries << create_library(library_hash)
+    software.software_categories = create_categories(categories_hash)
     software
   end
@@ -132,6 +144,30 @@ module SoftwareTestHelper
     fields['operating_platform'] = 'operating_plataform_test'
     fields['demonstration_url'] = 'test'
+    fields_categories = {}
+    fields_categories["administration"] = true
+    fields_categories["agriculture"] = "1"
+    fields_categories["business_and_services"] = "1"
+    fields_categories["communication"] = "1"
+    fields_categories["culture"] = "1"
+    fields_categories["national_defense"] = "1"
+    fields_categories["economy_and_finances"] = "1"
+    fields_categories["education"] = "1"
+    fields_categories["energy"] = "1"
+    fields_categories["sports"] = "1"
+    fields_categories["habitation"] = "1"
+    fields_categories["industry"] = "1"
+    fields_categories["environment"] = "1"
+    fields_categories["research_and_development"] = "1"
+    fields_categories["social_security"] = "1"
+    fields_categories["social_protection"] = "1"
+    fields_categories["sanitation"] = "1"
+    fields_categories["health"] = "1"
+    fields_categories["security_public_order"] = "1"
+    fields_categories["work"] = "1"
+    fields_categories["transportation"] = "1"
+    fields_categories["urbanism"] = "1"
+
     hash_list = []
     hash_list << fields
     hash_list << list_library
@@ -140,6 +176,7 @@ module SoftwareTestHelper
     hash_list << list_operating_system
     hash_list << fields_license
     hash_list << fields_community
+    hash_list << fields_categories
     hash_list
   end
-end
 \ No newline at end of file
+end
	@@ -52,6 +52,16 @@ module SoftwareTestHelper		@@ -52,6 +52,16 @@ module SoftwareTestHelper
52	license_info	52	license_info
53	end	53	end
54		54
		55	+ def create_categories categories_hash
		56	+ software_categories = SoftwareCategories.new
		57	+
		58	+ categories_hash.each do \|k,v\|
		59	+ software_categories[k] = v
		60	+ end
		61	+ software_categories.save
		62	+ software_categories
		63	+ end
		64	+
55	def create_software fields	65	def create_software fields
56		66
57	software = SoftwareInfo.new	67	software = SoftwareInfo.new
	@@ -63,6 +73,7 @@ module SoftwareTestHelper		@@ -63,6 +73,7 @@ module SoftwareTestHelper
63	operating_system_hash = fields[4]	73	operating_system_hash = fields[4]
64	license_system_hash = fields[5]	74	license_system_hash = fields[5]
65	community_hash = fields[6]	75	community_hash = fields[6]
		76	+ categories_hash = fields[7]
66		77
67	software_hash.each do \|k,v\|	78	software_hash.each do \|k,v\|
68	software[k] = v	79	software[k] = v
	@@ -79,6 +90,7 @@ module SoftwareTestHelper		@@ -79,6 +90,7 @@ module SoftwareTestHelper
79	software.operating_systems << create_operating_system(operating_system_hash)	90	software.operating_systems << create_operating_system(operating_system_hash)
80	software.license_info_id = license_system_hash	91	software.license_info_id = license_system_hash
81	software.libraries << create_library(library_hash)	92	software.libraries << create_library(library_hash)
		93	+ software.software_categories = create_categories(categories_hash)
82		94
83	software	95	software
84	end	96	end
	@@ -132,6 +144,30 @@ module SoftwareTestHelper		@@ -132,6 +144,30 @@ module SoftwareTestHelper
132	fields['operating_platform'] = 'operating_plataform_test'	144	fields['operating_platform'] = 'operating_plataform_test'
133	fields['demonstration_url'] = 'test'	145	fields['demonstration_url'] = 'test'
134		146
		147	+ fields_categories = {}
		148	+ fields_categories["administration"] = true
		149	+ fields_categories["agriculture"] = "1"
		150	+ fields_categories["business_and_services"] = "1"
		151	+ fields_categories["communication"] = "1"
		152	+ fields_categories["culture"] = "1"
		153	+ fields_categories["national_defense"] = "1"
		154	+ fields_categories["economy_and_finances"] = "1"
		155	+ fields_categories["education"] = "1"
		156	+ fields_categories["energy"] = "1"
		157	+ fields_categories["sports"] = "1"
		158	+ fields_categories["habitation"] = "1"
		159	+ fields_categories["industry"] = "1"
		160	+ fields_categories["environment"] = "1"
		161	+ fields_categories["research_and_development"] = "1"
		162	+ fields_categories["social_security"] = "1"
		163	+ fields_categories["social_protection"] = "1"
		164	+ fields_categories["sanitation"] = "1"
		165	+ fields_categories["health"] = "1"
		166	+ fields_categories["security_public_order"] = "1"
		167	+ fields_categories["work"] = "1"
		168	+ fields_categories["transportation"] = "1"
		169	+ fields_categories["urbanism"] = "1"
		170	+
135	hash_list = []	171	hash_list = []
136	hash_list << fields	172	hash_list << fields
137	hash_list << list_library	173	hash_list << list_library
	@@ -140,6 +176,7 @@ module SoftwareTestHelper		@@ -140,6 +176,7 @@ module SoftwareTestHelper
140	hash_list << list_operating_system	176	hash_list << list_operating_system
141	hash_list << fields_license	177	hash_list << fields_license
142	hash_list << fields_community	178	hash_list << fields_community
		179	+ hash_list << fields_categories
143	hash_list	180	hash_list
144	end	181	end
145	-end
146	\ No newline at end of file	182	\ No newline at end of file
		183	+end