Download as
Browse Code »

Commit eea240ad3ccae6f0dbf742ee037674897f05c0fd

Authored by Rafael Martins
1 parent 6e33a8f4
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Small fixes for functional and cucumber tests

Showing 3 changed files with 15 additions and 20 deletions   Show diff stats
features/search.feature
  Diff comments   View file @eea240a
@@ -88,7 +88,7 @@ Feature: search @@ -88,7 +88,7 @@ Feature: search
88 Scenario: search different types of entities with the same query 88 Scenario: search different types of entities with the same query
89 Given the following enterprises 89 Given the following enterprises
90 | identifier | name | 90 | identifier | name |
91 - | colivre | Colivre - Noosfero dev. | 91 + | colivre_dev | Colivre - Noosfero dev. |
92 And the following communities 92 And the following communities
93 | identifier | name | 93 | identifier | name |
94 | noosfero-users | Noosfero users | 94 | noosfero-users | Noosfero users |
@@ -96,8 +96,8 @@ Feature: search @@ -96,8 +96,8 @@ Feature: search
96 | name | 96 | name |
97 | Development | 97 | Development |
98 And the following products 98 And the following products
99 - | owner | name | category |  
100 - | colivre | Noosfero platform | Development | 99 + | owner | name | category |
  100 + | colivre_dev | Noosfero platform | Development |
101 When I go to the search page 101 When I go to the search page
102 And I fill in "query" with "noosfero" 102 And I fill in "query" with "noosfero"
103 And I press "Search" 103 And I press "Search"
features/search_products.feature
  Diff comments   View file @eea240a
@@ -143,15 +143,12 @@ Feature: search products @@ -143,15 +143,12 @@ Feature: search products
143 Then I should see "Arte em Madeira" within "#search-results" 143 Then I should see "Arte em Madeira" within "#search-results"
144 144
145 Scenario: find products without exact query 145 Scenario: find products without exact query
146 - Given the following enterprise  
147 - | identifier | name |  
148 - | colivre | Colivre |  
149 - And the following product_category 146 + Given the following product_category
150 | name | 147 | name |
151 | Software Livre | 148 | Software Livre |
152 And the following products 149 And the following products
153 - | owner | name | category |  
154 - | colivre | Noosfero Social Network Platform | software-livre | 150 + | owner | name | category |
  151 + | colivre-ent | Noosfero Social Network Platform | software-livre |
155 When I go to the search products page 152 When I go to the search products page
156 And I fill in "query" with "Noosfero Network" 153 And I fill in "query" with "Noosfero Network"
157 And I press "Search" 154 And I press "Search"
@@ -160,7 +157,6 @@ Feature: search products @@ -160,7 +157,6 @@ Feature: search products
160 Scenario: filter products by facet 157 Scenario: filter products by facet
161 Given the following enterprises 158 Given the following enterprises
162 | identifier | name | 159 | identifier | name |
163 - | colivre | Colivre |  
164 | fb | FB inc. | 160 | fb | FB inc. |
165 And the following categories as facets 161 And the following categories as facets
166 | name | 162 | name |
@@ -170,9 +166,9 @@ Feature: search products @@ -170,9 +166,9 @@ Feature: search products
170 | Software Livre | tematicas | 166 | Software Livre | tematicas |
171 | Big Brother | tematicas | 167 | Big Brother | tematicas |
172 And the following products 168 And the following products
173 - | owner | name | category |  
174 - | colivre | Noosfero Network | software-livre |  
175 - | fb | Facebook Network | big-brother | 169 + | owner | name | category |
  170 + | colivre-ent | Noosfero Network | software-livre |
  171 + | fb | Facebook Network | big-brother |
176 When I go to the search products page 172 When I go to the search products page
177 And I fill in "query" with "Network" 173 And I fill in "query" with "Network"
178 And I press "Search" 174 And I press "Search"
@@ -183,7 +179,6 @@ Feature: search products @@ -183,7 +179,6 @@ Feature: search products
183 Scenario: remember facet filter when searching new query 179 Scenario: remember facet filter when searching new query
184 Given the following enterprises 180 Given the following enterprises
185 | identifier | name | 181 | identifier | name |
186 - | colivre | Colivre |  
187 | fb | FB inc. | 182 | fb | FB inc. |
188 | other | Other | 183 | other | Other |
189 And the following categories as facets 184 And the following categories as facets
@@ -195,11 +190,11 @@ Feature: search products @@ -195,11 +190,11 @@ Feature: search products
195 | Big Brother | tematicas | 190 | Big Brother | tematicas |
196 | Other | tematicas | 191 | Other | tematicas |
197 And the following products 192 And the following products
198 - | owner | name | category |  
199 - | colivre | Noosfero Network | software-livre |  
200 - | fb | Facebook Network | big-brother |  
201 - | other | Other open | software-livre |  
202 - | other | Other closed | big-brother | 193 + | owner | name | category |
  194 + | colivre-ent | Noosfero Network | software-livre |
  195 + | fb | Facebook Network | big-brother |
  196 + | other | Other open | software-livre |
  197 + | other | Other closed | big-brother |
203 When I go to the search products page 198 When I go to the search products page
204 And I fill in "query" with "Network" 199 And I fill in "query" with "Network"
205 And I press "Search" 200 And I press "Search"
test/functional/enterprise_registration_controller_test.rb
  Diff comments   View file @eea240a
@@ -39,7 +39,7 @@ all_fixtures @@ -39,7 +39,7 @@ all_fixtures
39 env = Environment.default 39 env = Environment.default
40 env.organization_approval_method = :admin 40 env.organization_approval_method = :admin
41 env.save 41 env.save
42 - region = fast_create(Region) 42 + region = fast_create(Region, {}, :search => true)
43 43
44 data = { :name => 'My new enterprise', :identifier => 'mynew', :region => region } 44 data = { :name => 'My new enterprise', :identifier => 'mynew', :region => region }
45 create_enterprise = CreateEnterprise.new(data) 45 create_enterprise = CreateEnterprise.new(data)