Download as
Browse Code »

Commit ea0db8bdfd21cf8b0da3498262511d48e1268ab8

Authored by Daniel Alves + Guilherme Rojas
Committed by Paulo Meireles
1 parent 8a887de7
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

[Mezuro] Solving conflicts on mezuro_steps.rb and project.feature.

Showing 2 changed files with 23 additions and 14 deletions   Show diff stats
features/step_definitions/mezuro_steps.rb
  Diff comments   View file @ea0db8b
... ... @@ -60,17 +60,26 @@ When /^I have a Mezuro (project|reading group) with the following data$/ do |typ
60 60 result.save!
61 61 end
62 62  
63   -When /^I update this Mezuro (project|reading group) with the following data$/ do |type, fields|
64   - find_field("article_name").set fields.rows_hash[:Title]
65   - find_field("article_description").set fields.rows_hash[:Description]
  63 +When /^I have a configuration with the following data$/ do |fields|
  64 + attributes = {}
  65 + fields.rows_hash.each do |name, value|
  66 + attributes.merge!(name => value)
  67 + end
  68 + Kalibro::Configuration.create(attributes)
66 69 end
67 70  
68 71 When /^I erase the "([^"]*)" field$/ do |field_name|
69 72 find_field(field_name).set ""
70 73 end
71 74  
72   -When /^I fill the fields with the following data$/ do |fields|
73   - fields.rows_hash.each do |name, value|
74   - find_field(name.to_s).set value
  75 +When /^I fill the fields with the new following data$/ do |fields|
  76 + fields.rows_hash.each do |key, value|
  77 + name = key.to_s
  78 + element = find_field(name)
  79 + if element.tag_name.to_s == "select"
  80 + select(value, :from => name)
  81 + else
  82 + element.set value
  83 + end
75 84 end
76 85 end
... ...
plugins/mezuro/features/project.feature
  Diff comments   View file @ea0db8b
... ... @@ -68,9 +68,9 @@ Feature: Project
68 68 And I am on article "Sample Project"
69 69 And I should be on /mycommunity/sample-project
70 70 And I follow "Edit"
71   - When I update this Mezuro project with the following data
72   - | Title | Another Project |
73   - | Description | Another Description|
  71 + When I fill the fields with the new following data
  72 + | article_name | Another Project |
  73 + | article_description | Another Description|
74 74 And I press "Save"
75 75 Then I should see "Another Project"
76 76 And I should see "Another Description"
... ... @@ -102,9 +102,9 @@ Feature: Project
102 102 And I am on article "Sample Project"
103 103 And I should be on /mycommunity/sample-project
104 104 And I follow "Edit"
105   - When I update this Mezuro project with the following data
106   - | Title | Another Project |
107   - | Description | Another Description|
  105 + When I fill the fields with the new following data
  106 + | article_name | Another Project |
  107 + | article_description | Another Description|
108 108 And I press "Save"
109 109 Then I should see "Slug The title (article name) is already being used by another article, please use another title."
110 110  
... ... @@ -129,9 +129,9 @@ Feature: Project
129 129 | community | mycommunity |
130 130 And the following users
131 131 | login | name |
132   - | adminuser | Admin |
133   - And I am logged in as "adminuser"
  132 + | user | User |
134 133 When I am on article "Sample Project"
  134 + And I am logged in as "user"
135 135 And I should be on /mycommunity/sample-project
136 136 Then I should not see "Delete"
137 137 And I should not see "Edit"
... ...