Commit 4108362588b691e63af2281040faf33ad3d380bf

Authored by Gustavo Coelho
1 parent 1756f2aa

Fixing functional tests of Software Info

Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com>
src/noosfero-spb/software_communities/test/functional/search_controller_test.rb
@@ -166,8 +166,6 @@ class SearchControllerTest &lt; ActionController::TestCase @@ -166,8 +166,6 @@ class SearchControllerTest &lt; ActionController::TestCase
166 end 166 end
167 167
168 should "software_infos search only public_software" do 168 should "software_infos search only public_software" do
169 - software_info_one = create_software_info("Software One", :acronym => "SFO", :finality => "Help")  
170 - software_info_two = create_software_info("Java", :acronym => "SFT", :finality => "Task")  
171 software_info_three = create_software_info("Software Three", :acronym => "SFW", :finality => "Java") 169 software_info_three = create_software_info("Software Three", :acronym => "SFW", :finality => "Java")
172 software_info_three.public_software = false 170 software_info_three.public_software = false
173 software_info_three.save! 171 software_info_three.save!
@@ -177,14 +175,12 @@ class SearchControllerTest &lt; ActionController::TestCase @@ -177,14 +175,12 @@ class SearchControllerTest &lt; ActionController::TestCase
177 :software_type => "public_software" 175 :software_type => "public_software"
178 ) 176 )
179 177
180 - assert_includes assigns(:searches)[:software_infos][:results], software_info_one.software  
181 - assert_includes assigns(:searches)[:software_infos][:results], software_info_two.software 178 + assert_includes assigns(:searches)[:software_infos][:results], @software_infos[0].software
  179 + assert_includes assigns(:searches)[:software_infos][:results], @software_infos[1].software
182 assert_not_includes assigns(:searches)[:software_infos][:results], software_info_three.software 180 assert_not_includes assigns(:searches)[:software_infos][:results], software_info_three.software
183 end 181 end
184 182
185 should "software_infos search public_software and other all" do 183 should "software_infos search public_software and other all" do
186 - software_info_one = create_software_info("Software One", :acronym => "SFO", :finality => "Help")  
187 - software_info_two = create_software_info("Java", :acronym => "SFT", :finality => "Task")  
188 software_info_three = create_software_info("Software Three", :acronym => "SFW", :finality => "Java") 184 software_info_three = create_software_info("Software Three", :acronym => "SFW", :finality => "Java")
189 software_info_three.public_software = false 185 software_info_three.public_software = false
190 software_info_three.save! 186 software_info_three.save!
@@ -194,8 +190,8 @@ class SearchControllerTest &lt; ActionController::TestCase @@ -194,8 +190,8 @@ class SearchControllerTest &lt; ActionController::TestCase
194 :software_type => "all" 190 :software_type => "all"
195 ) 191 )
196 192
197 - assert_includes assigns(:searches)[:software_infos][:results], software_info_one.software  
198 - assert_includes assigns(:searches)[:software_infos][:results], software_info_two.software 193 + assert_includes assigns(:searches)[:software_infos][:results], @software_infos[0].software
  194 + assert_includes assigns(:searches)[:software_infos][:results], @software_infos[1].software
199 assert_includes assigns(:searches)[:software_infos][:results], software_info_three.software 195 assert_includes assigns(:searches)[:software_infos][:results], software_info_three.software
200 end 196 end
201 197