Download as
Browse Code »

Commit 096b293299a41d7ca5a60406d5cab83fa553f463

Authored by Rafael Martins
1 parent 476f551f
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Fixed some search features

Showing 3 changed files with 5 additions and 5 deletions   Show diff stats
features/search_contents.feature
  Diff comments   View file @096b293
@@ -86,7 +86,7 @@ Feature: search contents @@ -86,7 +86,7 @@ Feature: search contents
86 Given the following uploaded files 86 Given the following uploaded files
87 | owner | name | filename | 87 | owner | name | filename |
88 | joaosilva | Uploaded Executable | rails | 88 | joaosilva | Uploaded Executable | rails |
89 - | joaosilva | Uploaded Spreadsheet | rails | 89 + | joaosilva | Uploaded Spreadsheet | shoes |
90 When I search contents for "Executable" 90 When I search contents for "Executable"
91 Then I should see "Uploaded Executable" within ".search-uploaded-file-item" 91 Then I should see "Uploaded Executable" within ".search-uploaded-file-item"
92 And I should not see "Uploaded Spreadsheet" 92 And I should not see "Uploaded Spreadsheet"
@@ -315,7 +315,7 @@ Feature: search contents @@ -315,7 +315,7 @@ Feature: search contents
315 When I go to the search articles page 315 When I go to the search articles page
316 And I fill in "query" with "this is an article" 316 And I fill in "query" with "this is an article"
317 And I press "Search" 317 And I press "Search"
318 - Then show me the page 318 + # Then show me the page
319 And I follow "Software Livre" within "#facets-menu" 319 And I follow "Software Livre" within "#facets-menu"
320 Then I should see "noosfero and debian" within "#search-results" 320 Then I should see "noosfero and debian" within "#search-results"
321 And I should not see "facebook and 1984" 321 And I should not see "facebook and 1984"
features/search_enterprises.feature
  Diff comments   View file @096b293
@@ -36,7 +36,7 @@ Feature: search enterprises @@ -36,7 +36,7 @@ Feature: search enterprises
36 Scenario: link to enterprise homepage on search results 36 Scenario: link to enterprise homepage on search results
37 Given I search enterprises for "shoes" 37 Given I search enterprises for "shoes"
38 When I follow "Shoes shop" 38 When I follow "Shoes shop"
39 - Then I should be on "Shoes shop" homepage 39 + Then I should be on Shoes shop's profile
40 40
41 Scenario: show clean enterprise description on search results 41 Scenario: show clean enterprise description on search results
42 Given the following articles 42 Given the following articles
@@ -110,7 +110,7 @@ Feature: search enterprises @@ -110,7 +110,7 @@ Feature: search enterprises
110 | Rails | software-livre | 110 | Rails | software-livre |
111 And the following enterprises 111 And the following enterprises
112 | identifier | name | category | 112 | identifier | name | category |
113 - | noosfero | Noosfero | Rails | 113 + | noosfero | Noosfero | rails |
114 When I search enterprises for "Rails" 114 When I search enterprises for "Rails"
115 Then I should see "Software Livre" within ".search-enterprise-category" 115 Then I should see "Software Livre" within ".search-enterprise-category"
116 And I should see "Rails" within ".search-enterprise-category" 116 And I should see "Rails" within ".search-enterprise-category"
features/step_definitions/noosfero_steps.rb
  Diff comments   View file @096b293
@@ -247,7 +247,7 @@ Given /^the following (product_categories|product_category|category|categories|r @@ -247,7 +247,7 @@ Given /^the following (product_categories|product_category|category|categories|r
247 klass = kind.singularize.camelize.constantize 247 klass = kind.singularize.camelize.constantize
248 table.hashes.each do |row| 248 table.hashes.each do |row|
249 parent = row.delete("parent") 249 parent = row.delete("parent")
250 - if parent 250 + if !parent.blank?
251 parent = Category.find_by_slug(parent.to_slug) 251 parent = Category.find_by_slug(parent.to_slug)
252 row.merge!({:parent_id => parent.id}) 252 row.merge!({:parent_id => parent.id})
253 end 253 end