Download as
Browse Code »

Commit 64b33a5dca4bc9f11934a7f091b479aa5112a015

Authored by Victor Costa
1 parent da1ac64a
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

rails3: fix cucumber tests

Showing 4 changed files with 14 additions and 24 deletions   Show diff stats
features/step_definitions/create_community_steps.rb
  Diff comments   View file @64b33a5
1 1 include DatesHelper
2 2  
3 3 Given /^I create community "(.+)"$/ do |community|
4   - step %{I go to admin_user's control panel}
  4 + Given %{I go to admin_user's control panel}
5 5 click_link('Manage my groups')
6 6 click_link('Create a new community')
7 7 fill_in("Name", :with => community)
... ... @@ -10,7 +10,7 @@ end
10 10  
11 11 Given /^I approve community "(.+)"$/ do |community|
12 12 task = CreateCommunity.all.select {|c| c.name == community}.first
13   - step %{I go to admin_user's control panel}
  13 + Given %{I go to admin_user's control panel}
14 14 click_link('Process requests')
15 15 choose("decision-finish-#{task.id}")
16 16 first(:button, 'Apply!').click
... ... @@ -18,7 +18,7 @@ end
18 18  
19 19 Given /^I reject community "(.+)"$/ do |community|
20 20 task = CreateCommunity.all.select {|c| c.name == community}.first
21   - step %{I go to admin_user's control panel}
  21 + Given %{I go to admin_user's control panel}
22 22 click_link('Process requests')
23 23 choose("decision-cancel-#{task.id}")
24 24 first(:button, 'Apply!').click
... ...
features/step_definitions/noosfero_steps.rb
  Diff comments   View file @64b33a5
... ... @@ -285,18 +285,13 @@ Given /^the following price details?$/ do |table|
285 285 end
286 286  
287 287 Given /^I am logged in as "(.+)"$/ do |username|
288   - step %{I go to logout page}
289   - step %{I go to login page}
290   - step %{I fill in "main_user_login" with "#{username}"}
291   - step %{I fill in "user_password" with "123456"}
292   - step %{I press "Log in"}
293   - # FIXME:
294   - # deveria apenas verificar que esta no myprofile do usuario
295   - # nao conseguir fazer funcionar sem essa reduntancia no capybara
296   - # acho que e algum problema com o http_referer
297   - # olhar account_controller#store_location
298   - step %{I go to #{username}'s control panel}
299   - step %{I should be on #{username}'s control panel}
  288 + Given %{I go to logout page}
  289 + And %{I go to login page}
  290 + And %{I fill in "main_user_login" with "#{username}"}
  291 + And %{I fill in "user_password" with "123456"}
  292 + When %{I press "Log in"}
  293 + And %{I go to #{username}'s control panel}
  294 + Then %{I should be on #{username}'s control panel}
300 295 end
301 296  
302 297 Given /^"([^"]*)" is environment admin$/ do |person|
... ... @@ -640,9 +635,9 @@ Given /^the following tags$/ do |table|
640 635 end
641 636  
642 637 When /^I search ([^\"]*) for "([^\"]*)"$/ do |asset, query|
643   - step %{I go to the search #{asset} page}
644   - step %{I fill in "search-input" with "#{query}"}
645   - step %{I press "Search"}
  638 + When %{I go to the search #{asset} page}
  639 + And %{I fill in "search-input" with "#{query}"}
  640 + And %{I press "Search"}
646 641 end
647 642  
648 643 Then /^I should see ([^\"]*)'s product image$/ do |product_name|
... ...
features/step_definitions/web_steps.rb
  Diff comments   View file @64b33a5
... ... @@ -63,7 +63,7 @@ end
63 63 When /^(?:|I )fill in the following(?: within "([^"]*)")?:$/ do |selector, fields|
64 64 with_scope(selector) do
65 65 fields.rows_hash.each do |name, value|
66   - step %{I fill in "#{name}" with "#{value}"}
  66 + When %{I fill in "#{name}" with "#{value}"}
67 67 end
68 68 end
69 69 end
... ...
features/support/env.rb
  Diff comments   View file @64b33a5
... ... @@ -55,11 +55,6 @@ end
55 55 # end
56 56 #
57 57  
58   -# Possible values are :truncation and :transaction
59   -# The :transaction strategy is faster, but might give you threading problems.
60   -# See https://github.com/cucumber/cucumber-rails/blob/master/features/choose_javascript_database_strategy.feature
61   -Cucumber::Rails::Database.javascript_strategy = :truncation
62   -
63 58 Cucumber::Rails::World.use_transactional_fixtures = true
64 59 # How to clean your database when transactions are turned off. See
65 60 # http://github.com/bmabey/database_cleaner for more info.
... ...