More adaptations for the new SearchControllerTest

* Changed 'find_in' for the corresponding search action * Updated google maps urls

More adaptations for the new SearchControllerTest
* Changed 'find_in' for the corresponding search action * Updated google maps urls
Rafael Martins
1 parent f265ef22
Showing 1 changed file with 38 additions and 38 deletions Show diff stats
test/functional/search_controller_test.rb
@@ -70,7 +70,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     person = fast_create(Person)
     art = create_article_with_optional_category('an article to be found', person)
  
-    get 'index', :query => 'article found', :find_in => [ 'articles' ]
+    get 'articles', :query => 'article found'
     assert_includes assigns(:results)[:articles], art
   end
  
@@ -89,7 +89,7 @@ class SearchControllerTest &lt; ActionController::TestCase
  
   should 'find enterprises' do
     ent = create_profile_with_optional_category(Enterprise, 'teste')
-    get 'index', :query => 'teste', :find_in => [ 'enterprises' ]
+    get 'enterprises', :query => 'teste'
     assert_includes assigns(:results)[:enterprises], ent
   end
  
@@ -104,7 +104,7 @@ class SearchControllerTest &lt; ActionController::TestCase
  
   should 'find people' do
     p1 = create_user('people_1').person; p1.name = 'a beautiful person'; p1.save!
-    get :index, :query => 'beautiful', :find_in => [ 'people' ]
+    get :people, :query => 'beautiful'
     assert_includes assigns(:results)[:people], p1
   end
  
@@ -122,7 +122,7 @@ class SearchControllerTest &lt; ActionController::TestCase
  
   should 'find communities' do
     c1 = create_profile_with_optional_category(Community, 'a beautiful community')
-    get :index, :query => 'beautiful', :find_in => [ 'communities' ]
+    get :communities, :query => 'beautiful'
     assert_includes assigns(:results)[:communities], c1
   end
  
@@ -138,7 +138,7 @@ class SearchControllerTest &lt; ActionController::TestCase
   should 'find products' do
     ent = create_profile_with_optional_category(Enterprise, 'teste')
     prod = ent.products.create!(:name => 'a beautiful product', :product_category => @product_category)
-    get 'index', :query => 'beautiful', :find_in => ['products']
+    get :products, :query => 'beautiful'
     assert_includes assigns(:results)[:products], prod
   end
  
@@ -169,13 +169,13 @@ class SearchControllerTest &lt; ActionController::TestCase
     end
  
     enterprise = fast_create(Enterprise)
-    product = fast_create(Product, :enterprise_id => enterprise.id, :name => "produto1")
+    product = fast_create(Product, {:enterprise_id => enterprise.id, :name => "produto1"}, :search => true)
  
     e = Environment.default
     e.enable_plugin(Plugin1.name)
     e.enable_plugin(Plugin2.name)
  
-    get :assets, {:asset => 'products', :query => 'produto1'}
+    get :products, :query => 'produto1'
  
     assert_tag :tag => 'span', :content => 'This is Plugin1 speaking!', :attributes => {:id => 'plugin1'}
     assert_tag :tag => 'span', :content => 'This is Plugin2 speaking!', :attributes => {:id => 'plugin2'}
@@ -193,7 +193,7 @@ class SearchControllerTest &lt; ActionController::TestCase
       end
     end
     enterprise = fast_create(Enterprise)
-    product = fast_create(Product, :enterprise_id => enterprise.id, :name => "produto1")
+    product = fast_create(Product, {:enterprise_id => enterprise.id, :name => "produto1"}, :search => true)
  
     environment = Environment.default
     environment.enable_plugin(Plugin1.name)
@@ -201,8 +201,8 @@ class SearchControllerTest &lt; ActionController::TestCase
  
     get :products, :query => "produto1"
  
-    assert_tag :tag => 'li', :content => /Property1/, :child => {:tag => 'a', :attributes => {:href => '/plugin1'}, :content => product.name}
-    assert_tag :tag => 'li', :content => /Property2/, :child => {:tag => 'a', :attributes => {:href => '/plugin2'}, :content => product.name}
+    assert_tag :tag => 'div', :content => /Property1/, :child => {:tag => 'a', :attributes => {:href => '/plugin1'}, :content => product.name}
+    assert_tag :tag => 'div', :content => /Property2/, :child => {:tag => 'a', :attributes => {:href => '/plugin2'}, :content => product.name}
   end
  
   should 'paginate enterprise listing' do
@@ -252,7 +252,7 @@ class SearchControllerTest &lt; ActionController::TestCase
  
     p = create_profile_with_optional_category(Person, 'test_profile', child)
  
-    get :category_index, :category_path => ['parent-category'], :query => 'test_profile', :find_in => ['people']
+    get :category_index, :category_path => ['parent-category'], :query => 'test_profile'
  
     assert_includes assigns(:results)[:people], p
   end
@@ -285,7 +285,7 @@ class SearchControllerTest &lt; ActionController::TestCase
     person = create_user('teste').person
     ev = create_event(person, :name => 'an event to be found')
  
-    get 'index', :query => 'event found', :find_in => [ 'events' ]
+    get :events, :query => 'event found'
  
     assert_includes assigns(:results)[:events], ev
   end
@@ -314,7 +314,7 @@ class SearchControllerTest &lt; ActionController::TestCase
  
     p = prod_cat.products.create!(:name => 'prod test 1', :enterprise => ent)
  
-    get :index, :find_in => 'products', :product_category => prod_cat.id
+    get :products, :product_category => prod_cat.id
  
     assert_includes assigns(:results)[:products], p
   end
@@ -328,13 +328,13 @@ class SearchControllerTest &lt; ActionController::TestCase
  
     product = prod_cat2.products.create!(:name => 'prod test 1', :enterprise_id => ent.id)
  
-    get :products, {:category_path => cat.path.split('/'), :product_category => prod_cat1.id}
+    get :products, :category_path => cat.path.split('/'), :product_category => prod_cat1.id
  
     assert_includes assigns(:results)[:products], product
   end
  
   should 'provide calendar for events' do
-    get :index, :find_in => [ 'events' ]
+    get :events
     assert_equal 0, assigns(:calendar).size % 7
   end
  
@@ -349,14 +349,14 @@ class SearchControllerTest &lt; ActionController::TestCase
     person = create_user('teste').person
     art = TextileArticle.create!(:name => 'an text_article article to be found', :profile => person)
  
-    get 'index', :query => 'article found', :find_in => [ 'articles' ]
+    get 'articles', :query => 'article found'
  
     assert_includes assigns(:results)[:articles], art
   end
  
   should 'show link to article asset in the see all foot link of the articles block in the category page' do
     a = create_user('test1').person.articles.create!(:name => 'an article to be found')
-    a.add_category @category
+    a.categories << @category
  
     get :category_index, :category_path => [ 'my-category' ]
     assert_tag :tag => 'div', :attributes => {:class => /search-results-articles/} , :descendant => {:tag => 'a', :attributes => { :href => '/search/articles/my-category'}}
@@ -382,40 +382,40 @@ class SearchControllerTest &lt; ActionController::TestCase
     ent = create_profile_with_optional_category(Enterprise, 'teste')
     ent.domains << Domain.new(:name => 'testent.com'); ent.save!
     prod = ent.products.create!(:name => 'a beautiful product', :product_category => @product_category)
-    get 'index', :query => 'beautiful', :find_in => ['products']
+    get 'products', :query => 'beautiful'
     assert_includes assigns(:results)[:products], prod
   end
  
   should 'add script tag for google maps if searching products' do
-    get 'index', :query => 'product', :display => 'map', :find_in => ['products']
+    get 'products', :query => 'product', :display => 'map'
  
-    assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=ENVIRONMENT_KEY'}
+    assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
   end
  
   should 'add script tag for google maps if searching enterprises' do
     ent = create_profile_with_optional_category(Enterprise, 'teste')
-    get 'index', :query => 'enterprise', :display => 'map', :find_in => ['enterprises']
+    get 'enterprises', :query => 'enterprise', :display => 'map'
  
-    assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=ENVIRONMENT_KEY'}
+    assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
   end
  
   should 'not add script tag for google maps if searching articles' do
     ent = create_profile_with_optional_category(Enterprise, 'teste')
-    get 'index', :query => 'article', :display => 'map', :find_in => ['articles']
+    get 'articles', :query => 'article', :display => 'map'
  
-    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=ENVIRONMENT_KEY'}
+    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
   end
  
   should 'not add script tag for google maps if searching people' do
-    get 'index', :query => 'person', :display => 'map', :find_in => ['people']
+    get 'people', :query => 'person', :display => 'map'
  
-    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=ENVIRONMENT_KEY'}
+    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
   end
  
   should 'not add script tag for google maps if searching communities' do
-    get 'index', :query => 'community', :display => 'map', :find_in => ['communities']
+    get 'communities', :query => 'community', :display => 'map'
  
-    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&amp;v=2&amp;key=ENVIRONMENT_KEY'}
+    assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
   end
  
   should 'show events of specific day' do
@@ -440,16 +440,16 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'a', :content => /Maria Birthday/
   end
  
-  should 'paginate search of people in groups of 27' do
+  should "paginate search of people in groups of #{SearchController::BLOCKS_SEARCH_LIMIT}" do
     Person.delete_all
  
-    1.upto(30).map do |n|
-      create(User)    
+    1.upto(SearchController::BLOCKS_SEARCH_LIMIT+3).map do |n|
+      fast_create Person, {:name => 'Testing person'}
     end
  
     get :people
-    assert_equal 30, Person.count
-    assert_equal 27, assigns(:results).count
+    assert_equal SearchController::BLOCKS_SEARCH_LIMIT+3, Person.count
+    assert_equal SearchController::BLOCKS_SEARCH_LIMIT, assigns(:results)[:people].count
     assert_tag :a, '', :attributes => {:class => 'next_page'}
   end
  
@@ -462,14 +462,14 @@ class SearchControllerTest &lt; ActionController::TestCase
     assert_equal [c3,c2,c1] , assigns(:results)[:communities]
   end
  
-  should 'paginate search of communities in groups of 27' do
-    1.upto(30).map do |n|
-      create(Community, :name => 'Testing community')
+  should "paginate search of communities in groups of #{SearchController::BLOCKS_SEARCH_LIMIT}" do
+    1.upto(SearchController::BLOCKS_SEARCH_LIMIT+3).map do |n|
+      fast_create Community, {:name => 'Testing community'}
     end
  
     get :communities
-    assert_equal 30 , Community.count
-    assert_equal 27 , assigns(:results).count
+    assert_equal SearchController::BLOCKS_SEARCH_LIMIT+3, Community.count
+    assert_equal SearchController::BLOCKS_SEARCH_LIMIT, assigns(:results)[:communities].count
     assert_tag :a, '', :attributes => {:class => 'next_page'}
   end
...	...	@@ -70,7 +70,7 @@ class SearchControllerTest < ActionController::TestCase
70	70	person = fast_create(Person)
71	71	art = create_article_with_optional_category('an article to be found', person)
72	72
73		- get 'index', :query => 'article found', :find_in => [ 'articles' ]
	73	+ get 'articles', :query => 'article found'
74	74	assert_includes assigns(:results)[:articles], art
75	75	end
76	76
...	...	@@ -89,7 +89,7 @@ class SearchControllerTest < ActionController::TestCase
89	89
90	90	should 'find enterprises' do
91	91	ent = create_profile_with_optional_category(Enterprise, 'teste')
92		- get 'index', :query => 'teste', :find_in => [ 'enterprises' ]
	92	+ get 'enterprises', :query => 'teste'
93	93	assert_includes assigns(:results)[:enterprises], ent
94	94	end
95	95
...	...	@@ -104,7 +104,7 @@ class SearchControllerTest < ActionController::TestCase
104	104
105	105	should 'find people' do
106	106	p1 = create_user('people_1').person; p1.name = 'a beautiful person'; p1.save!
107		- get :index, :query => 'beautiful', :find_in => [ 'people' ]
	107	+ get :people, :query => 'beautiful'
108	108	assert_includes assigns(:results)[:people], p1
109	109	end
110	110
...	...	@@ -122,7 +122,7 @@ class SearchControllerTest < ActionController::TestCase
122	122
123	123	should 'find communities' do
124	124	c1 = create_profile_with_optional_category(Community, 'a beautiful community')
125		- get :index, :query => 'beautiful', :find_in => [ 'communities' ]
	125	+ get :communities, :query => 'beautiful'
126	126	assert_includes assigns(:results)[:communities], c1
127	127	end
128	128
...	...	@@ -138,7 +138,7 @@ class SearchControllerTest < ActionController::TestCase
138	138	should 'find products' do
139	139	ent = create_profile_with_optional_category(Enterprise, 'teste')
140	140	prod = ent.products.create!(:name => 'a beautiful product', :product_category => @product_category)
141		- get 'index', :query => 'beautiful', :find_in => ['products']
	141	+ get :products, :query => 'beautiful'
142	142	assert_includes assigns(:results)[:products], prod
143	143	end
144	144
...	...	@@ -169,13 +169,13 @@ class SearchControllerTest < ActionController::TestCase
169	169	end
170	170
171	171	enterprise = fast_create(Enterprise)
172		- product = fast_create(Product, :enterprise_id => enterprise.id, :name => "produto1")
	172	+ product = fast_create(Product, {:enterprise_id => enterprise.id, :name => "produto1"}, :search => true)
173	173
174	174	e = Environment.default
175	175	e.enable_plugin(Plugin1.name)
176	176	e.enable_plugin(Plugin2.name)
177	177
178		- get :assets, {:asset => 'products', :query => 'produto1'}
	178	+ get :products, :query => 'produto1'
179	179
180	180	assert_tag :tag => 'span', :content => 'This is Plugin1 speaking!', :attributes => {:id => 'plugin1'}
181	181	assert_tag :tag => 'span', :content => 'This is Plugin2 speaking!', :attributes => {:id => 'plugin2'}
...	...	@@ -193,7 +193,7 @@ class SearchControllerTest < ActionController::TestCase
193	193	end
194	194	end
195	195	enterprise = fast_create(Enterprise)
196		- product = fast_create(Product, :enterprise_id => enterprise.id, :name => "produto1")
	196	+ product = fast_create(Product, {:enterprise_id => enterprise.id, :name => "produto1"}, :search => true)
197	197
198	198	environment = Environment.default
199	199	environment.enable_plugin(Plugin1.name)
...	...	@@ -201,8 +201,8 @@ class SearchControllerTest < ActionController::TestCase
201	201
202	202	get :products, :query => "produto1"
203	203
204		- assert_tag :tag => 'li', :content => /Property1/, :child => {:tag => 'a', :attributes => {:href => '/plugin1'}, :content => product.name}
205		- assert_tag :tag => 'li', :content => /Property2/, :child => {:tag => 'a', :attributes => {:href => '/plugin2'}, :content => product.name}
	204	+ assert_tag :tag => 'div', :content => /Property1/, :child => {:tag => 'a', :attributes => {:href => '/plugin1'}, :content => product.name}
	205	+ assert_tag :tag => 'div', :content => /Property2/, :child => {:tag => 'a', :attributes => {:href => '/plugin2'}, :content => product.name}
206	206	end
207	207
208	208	should 'paginate enterprise listing' do
...	...	@@ -252,7 +252,7 @@ class SearchControllerTest < ActionController::TestCase
252	252
253	253	p = create_profile_with_optional_category(Person, 'test_profile', child)
254	254
255		- get :category_index, :category_path => ['parent-category'], :query => 'test_profile', :find_in => ['people']
	255	+ get :category_index, :category_path => ['parent-category'], :query => 'test_profile'
256	256
257	257	assert_includes assigns(:results)[:people], p
258	258	end
...	...	@@ -285,7 +285,7 @@ class SearchControllerTest < ActionController::TestCase
285	285	person = create_user('teste').person
286	286	ev = create_event(person, :name => 'an event to be found')
287	287
288		- get 'index', :query => 'event found', :find_in => [ 'events' ]
	288	+ get :events, :query => 'event found'
289	289
290	290	assert_includes assigns(:results)[:events], ev
291	291	end
...	...	@@ -314,7 +314,7 @@ class SearchControllerTest < ActionController::TestCase
314	314
315	315	p = prod_cat.products.create!(:name => 'prod test 1', :enterprise => ent)
316	316
317		- get :index, :find_in => 'products', :product_category => prod_cat.id
	317	+ get :products, :product_category => prod_cat.id
318	318
319	319	assert_includes assigns(:results)[:products], p
320	320	end
...	...	@@ -328,13 +328,13 @@ class SearchControllerTest < ActionController::TestCase
328	328
329	329	product = prod_cat2.products.create!(:name => 'prod test 1', :enterprise_id => ent.id)
330	330
331		- get :products, {:category_path => cat.path.split('/'), :product_category => prod_cat1.id}
	331	+ get :products, :category_path => cat.path.split('/'), :product_category => prod_cat1.id
332	332
333	333	assert_includes assigns(:results)[:products], product
334	334	end
335	335
336	336	should 'provide calendar for events' do
337		- get :index, :find_in => [ 'events' ]
	337	+ get :events
338	338	assert_equal 0, assigns(:calendar).size % 7
339	339	end
340	340
...	...	@@ -349,14 +349,14 @@ class SearchControllerTest < ActionController::TestCase
349	349	person = create_user('teste').person
350	350	art = TextileArticle.create!(:name => 'an text_article article to be found', :profile => person)
351	351
352		- get 'index', :query => 'article found', :find_in => [ 'articles' ]
	352	+ get 'articles', :query => 'article found'
353	353
354	354	assert_includes assigns(:results)[:articles], art
355	355	end
356	356
357	357	should 'show link to article asset in the see all foot link of the articles block in the category page' do
358	358	a = create_user('test1').person.articles.create!(:name => 'an article to be found')
359		- a.add_category @category
	359	+ a.categories << @category
360	360
361	361	get :category_index, :category_path => [ 'my-category' ]
362	362	assert_tag :tag => 'div', :attributes => {:class => /search-results-articles/} , :descendant => {:tag => 'a', :attributes => { :href => '/search/articles/my-category'}}
...	...	@@ -382,40 +382,40 @@ class SearchControllerTest < ActionController::TestCase
382	382	ent = create_profile_with_optional_category(Enterprise, 'teste')
383	383	ent.domains << Domain.new(:name => 'testent.com'); ent.save!
384	384	prod = ent.products.create!(:name => 'a beautiful product', :product_category => @product_category)
385		- get 'index', :query => 'beautiful', :find_in => ['products']
	385	+ get 'products', :query => 'beautiful'
386	386	assert_includes assigns(:results)[:products], prod
387	387	end
388	388
389	389	should 'add script tag for google maps if searching products' do
390		- get 'index', :query => 'product', :display => 'map', :find_in => ['products']
	390	+ get 'products', :query => 'product', :display => 'map'
391	391
392		- assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&v=2&key=ENVIRONMENT_KEY'}
	392	+ assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
393	393	end
394	394
395	395	should 'add script tag for google maps if searching enterprises' do
396	396	ent = create_profile_with_optional_category(Enterprise, 'teste')
397		- get 'index', :query => 'enterprise', :display => 'map', :find_in => ['enterprises']
	397	+ get 'enterprises', :query => 'enterprise', :display => 'map'
398	398
399		- assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&v=2&key=ENVIRONMENT_KEY'}
	399	+ assert_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
400	400	end
401	401
402	402	should 'not add script tag for google maps if searching articles' do
403	403	ent = create_profile_with_optional_category(Enterprise, 'teste')
404		- get 'index', :query => 'article', :display => 'map', :find_in => ['articles']
	404	+ get 'articles', :query => 'article', :display => 'map'
405	405
406		- assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&v=2&key=ENVIRONMENT_KEY'}
	406	+ assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
407	407	end
408	408
409	409	should 'not add script tag for google maps if searching people' do
410		- get 'index', :query => 'person', :display => 'map', :find_in => ['people']
	410	+ get 'people', :query => 'person', :display => 'map'
411	411
412		- assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&v=2&key=ENVIRONMENT_KEY'}
	412	+ assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
413	413	end
414	414
415	415	should 'not add script tag for google maps if searching communities' do
416		- get 'index', :query => 'community', :display => 'map', :find_in => ['communities']
	416	+ get 'communities', :query => 'community', :display => 'map'
417	417
418		- assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps?file=api&v=2&key=ENVIRONMENT_KEY'}
	418	+ assert_no_tag :tag => 'script', :attributes => { :src => 'http://maps.google.com/maps/api/js?sensor=true'}
419	419	end
420	420
421	421	should 'show events of specific day' do
...	...	@@ -440,16 +440,16 @@ class SearchControllerTest < ActionController::TestCase
440	440	assert_tag :tag => 'a', :content => /Maria Birthday/
441	441	end
442	442
443		- should 'paginate search of people in groups of 27' do
	443	+ should "paginate search of people in groups of #{SearchController::BLOCKS_SEARCH_LIMIT}" do
444	444	Person.delete_all
445	445
446		- 1.upto(30).map do \|n\|
447		- create(User)
	446	+ 1.upto(SearchController::BLOCKS_SEARCH_LIMIT+3).map do \|n\|
	447	+ fast_create Person, {:name => 'Testing person'}
448	448	end
449	449
450	450	get :people
451		- assert_equal 30, Person.count
452		- assert_equal 27, assigns(:results).count
	451	+ assert_equal SearchController::BLOCKS_SEARCH_LIMIT+3, Person.count
	452	+ assert_equal SearchController::BLOCKS_SEARCH_LIMIT, assigns(:results)[:people].count
453	453	assert_tag :a, '', :attributes => {:class => 'next_page'}
454	454	end
455	455
...	...	@@ -462,14 +462,14 @@ class SearchControllerTest < ActionController::TestCase
462	462	assert_equal [c3,c2,c1] , assigns(:results)[:communities]
463	463	end
464	464
465		- should 'paginate search of communities in groups of 27' do
466		- 1.upto(30).map do \|n\|
467		- create(Community, :name => 'Testing community')
	465	+ should "paginate search of communities in groups of #{SearchController::BLOCKS_SEARCH_LIMIT}" do
	466	+ 1.upto(SearchController::BLOCKS_SEARCH_LIMIT+3).map do \|n\|
	467	+ fast_create Community, {:name => 'Testing community'}
468	468	end
469	469
470	470	get :communities
471		- assert_equal 30 , Community.count
472		- assert_equal 27 , assigns(:results).count
	471	+ assert_equal SearchController::BLOCKS_SEARCH_LIMIT+3, Community.count
	472	+ assert_equal SearchController::BLOCKS_SEARCH_LIMIT, assigns(:results)[:communities].count
473	473	assert_tag :a, '', :attributes => {:class => 'next_page'}
474	474	end
475	475
...	...