Download as
Browse Code »

Commit 3165815cef3e07eda51226fed17d6803aca61dba

Authored by Daniela Feitosa
2 parents 114fd5d4 f205672c
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

Merge commit 'refs/merge-requests/148' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/148
Showing 2 changed files with 18 additions and 0 deletions   Show diff stats
app/views/manage_products/_edit_info.rhtml
  Diff comments   View file @3165815
@@ -21,6 +21,10 @@ @@ -21,6 +21,10 @@
21 <td class='formlabel'><%= _('Available') %></td> 21 <td class='formlabel'><%= _('Available') %></td>
22 <td class='formfield'><%= labelled_radio_button( _('Yes'), 'product[available]', true, @product.available, :id => 'product_available') + labelled_radio_button( _('No'), 'product[available]', false, !@product.available) %></td> 22 <td class='formfield'><%= labelled_radio_button( _('Yes'), 'product[available]', true, @product.available, :id => 'product_available') + labelled_radio_button( _('No'), 'product[available]', false, !@product.available) %></td>
23 </tr> 23 </tr>
  24 + <tr>
  25 + <td><%= f.label :highlighted, _('Highlight product') %></td>
  26 + <td class='formfield'><%= f.check_box(:highlighted) %></td>
  27 + </tr>
24 </table> 28 </table>
25 29
26 <% if !environment.qualifiers.empty? %> 30 <% if !environment.qualifiers.empty? %>
features/manage_products.feature
  Diff comments   View file @3165815
@@ -526,3 +526,17 @@ Feature: manage products @@ -526,3 +526,17 @@ Feature: manage products
526 And I follow "Delete qualifier" 526 And I follow "Delete qualifier"
527 And I press "Save" 527 And I press "Save"
528 Then I should not see "Organic (Self declared)" 528 Then I should not see "Organic (Self declared)"
  529 +
  530 + @selenium
  531 + Scenario: Show checkbox to mark product as highlight
  532 + Given the following product_category
  533 + | name |
  534 + | Bicycle |
  535 + And the following products
  536 + | owner | category | name |
  537 + | redemoinho | bicycle | Bike |
  538 + And I am logged in as "joaosilva"
  539 + When I go to Rede Moinho's page of product Bike
  540 + And I follow "Add price and other basic information"
  541 + Then I should see "Highlight product"
  542 + And I check "Highlight product"