Download as
Browse Code »

Commit 7d06a37de719e9ebd0e6afb63a981944ff3c5a8b

Authored by Joenio Costa
1 parent 30c66afb
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

Putting back the list of tags in editing articles 

(ActionItem1589)
Showing 4 changed files with 48 additions and 9 deletions   Show diff stats
app/views/cms/edit.rhtml
  Diff comments   View file @7d06a37
@@ -28,6 +28,9 @@ @@ -28,6 +28,9 @@
28 28
29 <%= select_categories(:article, _('Categorize your article')) %> 29 <%= select_categories(:article, _('Categorize your article')) %>
30 30
  31 + <%= f.text_field('tag_list', :size => 64) %>
  32 + <%= content_tag( 'small', _('Separate tags with commas') ) %>
  33 +
31 <div id='edit-article-options'> 34 <div id='edit-article-options'>
32 <%= options_for_article(@article) %> 35 <%= options_for_article(@article) %>
33 </div> 36 </div>
features/blog.feature
  Diff comments   View file @7d06a37
@@ -87,3 +87,9 @@ Feature: blog @@ -87,3 +87,9 @@ Feature: blog
87 And I press "Save" 87 And I press "Save"
88 When I am on /joaosilva/blog-two 88 When I am on /joaosilva/blog-two
89 Then I should see "Blog One" 89 Then I should see "Blog One"
  90 +
  91 + Scenario: display tag list field when creating new blog
  92 + Given I follow "Control panel"
  93 + And I follow "Manage Content"
  94 + When I follow "New blog"
  95 + Then I should see "Tag list"
features/create_article.feature
  Diff comments   View file @7d06a37
@@ -33,3 +33,29 @@ Feature: create article @@ -33,3 +33,29 @@ Feature: create article
33 And I follow "New Folder" 33 And I follow "New Folder"
34 When I follow "Cancel" 34 When I follow "Cancel"
35 Then I should be on Joao Silva's cms 35 Then I should be on Joao Silva's cms
  36 +
  37 + Scenario: display tag list field when creating event
  38 + Given I follow "Control panel"
  39 + And I follow "Manage Content"
  40 + And I follow "New article"
  41 + When I follow "Event"
  42 + Then I should see "Tag list"
  43 +
  44 + Scenario: display tag list field when creating folder
  45 + Given I follow "Control panel"
  46 + And I follow "Manage Content"
  47 + When I follow "New folder"
  48 + Then I should see "Tag list"
  49 +
  50 + Scenario: create new article with tags
  51 + Given I follow "Control panel"
  52 + And I follow "Manage Content"
  53 + And I follow "New article"
  54 + When I follow "Text article with Textile markup language"
  55 + Then I should see "Tag list"
  56 + When I fill in "Title" with "Article with tags"
  57 + And I fill in "Tag list" with "aurium, bug"
  58 + And I press "Save"
  59 + And I go to /joaosilva/article-with-tags
  60 + Then I should see "aurium" within "#article-tags a:first"
  61 + And I should see "bug" within "#article-tags a:last"
features/edit_image.feature
  Diff comments   View file @7d06a37
@@ -2,26 +2,30 @@ Feature: edit_image @@ -2,26 +2,30 @@ Feature: edit_image
2 As a noosfero user 2 As a noosfero user
3 I want to upload images and assigns a link to each image 3 I want to upload images and assigns a link to each image
4 4
5 - Scenario: edit external link when edit image 5 + Background:
6 Given I am on the homepage 6 Given I am on the homepage
7 And the following users 7 And the following users
8 | login | name | 8 | login | name |
9 | morgoth | Melkor | 9 | morgoth | Melkor |
10 - And the following files 10 + And I am logged in as "morgoth"
  11 +
  12 + Scenario: edit external link when edit image
  13 + Given the following files
11 | owner | file | mime | 14 | owner | file | mime |
12 | morgoth | rails.png | image/png | 15 | morgoth | rails.png | image/png |
13 - And I am logged in as "morgoth"  
14 When I go to edit "rails.png" by morgoth 16 When I go to edit "rails.png" by morgoth
15 Then I should see "External link" 17 Then I should see "External link"
16 18
17 Scenario: dont offer to edit external link if no image 19 Scenario: dont offer to edit external link if no image
18 - Given I am on the homepage  
19 - And the following users  
20 - | login | name |  
21 - | morgoth | Melkor |  
22 - And the following files 20 + Given the following files
23 | owner | file | mime | 21 | owner | file | mime |
24 | morgoth | test.txt | text/plain | 22 | morgoth | test.txt | text/plain |
25 - And I am logged in as "morgoth"  
26 When I go to edit "test.txt" by morgoth 23 When I go to edit "test.txt" by morgoth
27 Then I should not see "External link" 24 Then I should not see "External link"
  25 +
  26 + Scenario: display tag list field when editing file
  27 + Given the following files
  28 + | owner | file | mime |
  29 + | morgoth | rails.png | image/png |
  30 + When I go to edit "rails.png" by morgoth
  31 + Then I should see "Tag list"