Merge branch 'master' into solr-commits

Rodrigo Souto
2 parents f1ba1f6f fa0dbbec
Showing 98 changed files with 1411 additions and 1446 deletions Show diff stats
Gemfile
Gemfile.lock
app/models/environment.rb
app/views/admin_panel/site_info.rhtml
app/views/catalog/index.rhtml
app/views/content_viewer/_comment_form.rhtml
app/views/content_viewer/view_page.rhtml
app/views/users/send_mail.rhtml
config/cucumber.yml
config/database.yml.sqlite3
config/environments/cucumber.rb
features/accept_member.feature
features/activate_enterprise.feature
features/admin_categories.feature
features/approve_article.feature
features/balloon.feature
features/blog.feature
features/browse.feature
features/browse_catalogs.feature
features/browse_enterprises.feature
 source :rubygems
-gem 'cucumber', '0.4.0'
-gem 'webrat', '0.5.1'
-gem 'rspec', '1.2.9'
-gem 'rspec-rails', '1.2.9'
-gem 'Selenium', '>= 1.1.14'
-gem 'selenium-client', '>= 1.2.17'
-gem 'database_cleaner'
+
 gem 'exception_notification', '1.0.20090728'
 gem 'system_timer'
  
+group :test do
+  gem 'rspec', '1.2.9'
+  gem 'rspec-rails', '1.2.9'
+end
+
+group :cucumber do
+  gem 'rake', '0.8.7'
+  gem 'cucumber-rails', '0.3.2'
+  gem 'capybara', '1.1.1'
+  gem 'cucumber', '1.1.0'
+  gem 'database_cleaner'
+end
+
 def program(name)
   unless system("which #{name} > /dev/null")
     puts "W: Program #{name} is needed, but was not found in your PATH"
 GEM
   remote: http://rubygems.org/
   specs:
-    Selenium (1.1.14)
-    builder (3.0.0)
-    cucumber (0.4.0)
+    builder (3.1.4)
+    capybara (1.1.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.6)
+      ffi (~> 1.0, >= 1.0.6)
+    cucumber (1.1.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      polyglot (>= 0.2.9)
-      term-ansicolor (>= 1.0.3)
-      treetop (>= 1.4.2)
-    database_cleaner (0.7.0)
+      gherkin (~> 2.5.0)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    database_cleaner (0.9.1)
     diff-lcs (1.1.3)
     exception_notification (1.0.20090728)
-    nokogiri (1.5.0)
-    polyglot (0.3.3)
-    rack (1.3.5)
+    ffi (1.2.0)
+    gherkin (2.5.4)
+      json (>= 1.4.6)
+    json (1.7.5)
+    libwebsocket (0.1.6.1)
+      websocket
+    mime-types (1.19)
+    multi_json (1.3.7)
+    nokogiri (1.5.5)
+    rack (1.1.0)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (0.8.7)
     rspec (1.2.9)
     rspec-rails (1.2.9)
       rack (>= 1.0.0)
       rspec (>= 1.2.9)
-    selenium-client (1.2.18)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.26.0)
+      childprocess (>= 0.2.5)
+      libwebsocket (~> 0.1.3)
+      multi_json (~> 1.0)
+      rubyzip
     system_timer (1.2.4)
     term-ansicolor (1.0.7)
-    treetop (1.4.10)
-      polyglot
-      polyglot (>= 0.3.1)
-    webrat (0.5.1)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
+    websocket (1.0.4)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
  
 PLATFORMS
   ruby
  
 DEPENDENCIES
-  Selenium (>= 1.1.14)
-  cucumber (= 0.4.0)
+  capybara (= 1.1.1)
+  cucumber (= 1.1.0)
+  cucumber-rails (= 0.3.2)
   database_cleaner
   exception_notification (= 1.0.20090728)
+  rake (= 0.8.7)
   rspec (= 1.2.9)
   rspec-rails (= 1.2.9)
-  selenium-client (>= 1.2.17)
   system_timer
-  webrat (= 0.5.1)
@@ -616,12 +616,10 @@ class Environment &lt; ActiveRecord::Base
   end
  
   def top_url
-    protocol = 'http'
-    result = "#{protocol}://#{default_hostname}"
-    if Noosfero.url_options.has_key?(:port)
-      result << ':' << Noosfero.url_options[:port].to_s
-    end
-    result
+    url = 'http://'
+    url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
+    url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port)
+    url
   end
  
   def to_s
@@ -4,7 +4,7 @@
  
 <%= render :file => 'shared/tiny_mce' %>
  
-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do |f| %>
+<% labelled_form_for :environment, @environment do |f| %>
   <% tabs = [] %>
   <% tabs << {:title => _('Site info'), :id => 'site-info',
     :content => (render :partial => 'site_info', :locals => {:f => f})} %>
@@ -7,6 +7,7 @@
  
 <div class='l-sidebar-left-bar'>
   <ul>
+    <%= content_tag('li', link_to(_('Enterprise homepage'), profile.public_profile_url), :id => 'catalog-categories-homepage-link') %>
     <% if @categories.present? %>
       <% @categories.each do |category| %>
         <%= category_link(category) %>
@@ -21,8 +21,6 @@ function submit_comment_form(button) {
 }
 </script>
  
-<% focus_on = logged_in? ? 'title' : 'name' %>
-
 <% if @comment && @comment.errors.any? && @comment.reply_of_id.blank? %>
   <%= error_messages_for :comment %>
   <script type="text/javascript">jQuery(function() { document.location.href = '#page-comment-form'; });</script>
@@ -32,17 +30,7 @@ function submit_comment_form(button) {
  
 <div class="post_comment_box <%= @form_div %>">
  
-<% if display_link %>
-  <h4 onclick="var d = jQuery(this).parent('.post_comment_box');
-               if (d.hasClass('closed')) {
-                 d.removeClass('closed');
-                 d.addClass('opened');
-                 d.find('input[name=comment[title]], textarea').val('');
-                 d.find('.comment_form input[name=comment[<%= focus_on %>]]').focus();
-               }">
-    <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %>
-  </h4>
-<% end %>
+  <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') if display_link %>
  
 <% unless pass_without_comment_captcha? %>
   <div id="recaptcha-container" style="display: none">
@@ -62,8 +50,6 @@ function submit_comment_form(button) {
 <% end %>
  
 <% form_tag( url, { :class => 'comment_form' } ) do %>
-  <%= hidden_field_tag(:confirm, 'false') %>
-
   <%= required_fields_message %>
  
   <% unless logged_in? %>
@@ -84,10 +70,13 @@ function submit_comment_form(button) {
   <%= labelled_form_field(_('Title'), text_field(:comment, :title)) %>
   <%= required labelled_form_field(_('Enter your comment'), text_area(:comment, :body, :rows => 5)) %>
  
+  <%= hidden_field_tag(:confirm, 'false') %>
+  <%= hidden_field_tag(:view, params[:view])%>
+
   <% button_bar do %>
     <%= submit_button('add', _('Post comment'), :onclick => "submit_comment_form(this); return false") %>
     <% if cancel_triggers_hide %>
-      <%= button_to_function :cancel, _('Cancel'), "f=jQuery(this).parents('.post_comment_box'); f.removeClass('opened'); f.addClass('closed'); return false" %>
+      <%= button :cancel, _('Cancel'), '', :id => 'cancel-comment' %>
     <% else %>
       <%= button('cancel', _('Cancel'), {:action => 'view_page', :profile => profile.identifier, :page => @comment.article.explode_path})%>
     <% end %>
@@ -95,3 +84,5 @@ function submit_comment_form(button) {
 <% end %>
  
 </div><!-- end class="post_comment_box" -->
+
+<%= javascript_include_tag 'comment_form'%>
@@ -90,7 +90,7 @@
   <% end %>
  
   <% if @page.accept_comments? && @comments_count > 1 %>
-    <p class="post-comment-button"><a href="#comment_form" onclick="jQuery('#page-comment-form h4').first().trigger('click')"><%= _('Post a comment') %></a></p>
+    <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') %>
   <% end %>
  
   <ul class="article-comments-list">
@@ -4,7 +4,7 @@
  
 <%= render :file => 'shared/tiny_mce' %>
  
-<% form_for :mailing, :url => {:action => 'send_mail', :host => @environment.default_hostname} do |f| %>
+<% form_for :mailing do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
   <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
   <%= submit_button(:send, _('Send')) %>
-default: --tags ~@selenium,~@wip --exclude features/support/selenium.rb --exclude features/step_definitions/selenium_steps.rb -r features/support -r features/step_definitions
-selenium: --tags @selenium,~@wip -r features/support -r features/step_definitions
+default: --color --format progress --strict --tags ~@selenium --tags ~@selenium-fixme --tags ~@fixme --exclude features/support/selenium.rb -r features/support -r features/step_definitions
+selenium: --strict --tags @selenium -r features/support -r features/step_definitions
@@ -6,6 +6,7 @@ development:
 test: &TEST
   adapter: sqlite3
   database: db/test.db
+  timeout: 2000
  
 production:
   adapter: sqlite3
-# IMPORTANT: This file was generated by Cucumber 0.4.0
 # Edit at your own peril - it's recommended to regenerate this file
 # in the future when you upgrade to a newer version of Cucumber.
  
-config.cache_classes = true # This must be true for Cucumber to operate correctly!
+# IMPORTANT: Setting config.cache_classes to false is known to
+# break Cucumber's use_transactional_fixtures method.
+# For more information see https://rspec.lighthouseapp.com/projects/16211/tickets/165
+config.cache_classes = true
  
 # Log error messages when you accidentally call methods on nil.
 config.whiny_nils = true
@@ -18,3 +20,8 @@ config.action_controller.allow_forgery_protection    = false
 # The :test delivery method accumulates sent emails in the
 # ActionMailer::Base.deliveries array.
 config.action_mailer.delivery_method = :test
+
+config.gem 'cucumber-rails',   :lib => false, :version => '>=0.3.2' unless File.directory?(File.join(Rails.root, 'vendor/plugins/cucumber-rails'))
+config.gem 'database_cleaner', :lib => false, :version => '>=0.5.0' unless File.directory?(File.join(Rails.root, 'vendor/plugins/database_cleaner'))
+config.gem 'capybara',         :lib => false, :version => '>=0.3.5' unless File.directory?(File.join(Rails.root, 'vendor/plugins/capybara'))
+
@@ -14,10 +14,11 @@ Feature: accept member
     And the community "My Community" is closed
     And "Mario Souto" is admin of "My Community"
  
+  @selenium
   Scenario: approve a task to accept a member as admin in a closed community
     Given "Marie Curie" asked to join "My Community"
     And I am logged in as "mario"
-    And I go to My Community's control panel
+    And I go to mycommunity's control panel
     And I follow "Process requests"
     And I should see "Marie Curie wants to be a member"
     When I choose "Accept"
@@ -25,10 +26,11 @@ Feature: accept member
     And I press "Apply!"
     Then "Marie Curie" should be admin of "My Community"
  
+  @selenium
   Scenario: approve a task to accept a member as member in a closed community
     Given "Marie Curie" asked to join "My Community"
     And I am logged in as "mario"
-    And I go to My Community's control panel
+    And I go to mycommunity's control panel
     And I follow "Process requests"
     And I should see "Marie Curie wants to be a member"
     When I choose "Accept"
@@ -36,10 +38,11 @@ Feature: accept member
     And I press "Apply!"
     Then "Marie Curie" should be a member of "My Community"
  
+  @selenium
   Scenario: approve a task to accept a member as moderator in a closed community
     Given "Marie Curie" asked to join "My Community"
     And I am logged in as "mario"
-    And I go to My Community's control panel
+    And I go to mycommunity's control panel
     And I follow "Process requests"
     And I should see "Marie Curie wants to be a member"
     When I choose "Accept"
@@ -11,7 +11,7 @@ Feature: activate enterprise
  
   Scenario: added an unexistent code
     Given feature "enterprise_activation" is enabled on environment
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I fill in "Enterprise activation code" with "abcde"
     When I press "Activate"
     Then I should see "Invalid enterprise code"
@@ -21,7 +21,7 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled |
       | products-factory | Products Factory | false |
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And enterprise "Products Factory" is enabled
     And I fill in "Enterprise activation code" with code of "Products Factory"
     When I press "Activate"
@@ -32,7 +32,7 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled |
       | products-factory | Products Factory | false |
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Products Factory"
     When I press "Activate"
     Then I should see "We don't have enough information about your enterprise to identify you."
@@ -43,7 +43,7 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled | foundation_year |
       | services-provider | Services Provider | false | 2000 |
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider"
     And I press "Activate"
     And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "1999"
@@ -56,7 +56,7 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled | cnpj |
       | services-provider | Services Provider | false | 94.132.024/0001-48 |
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider"
     And I press "Activate"
     And I fill in "What is the CNPJ of your enterprise?" with "12345678912345"
@@ -70,9 +70,9 @@ Feature: activate enterprise
     And the following enterprises
       | identifier | name | enabled | foundation_year |
       | services-provider | Services Provider | false | 2000 |
-    And I visit "Joao Silva's control panel" and wait
+    And I go to joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider"
-    And I press "Activate" and wait
+    And I press "Activate"
     And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "2000"
     And I press "Continue"
     And I check "I read the terms of use and accepted them"
@@ -91,9 +91,9 @@ Feature: activate enterprise
       | active-template | Active Template | false | 2000 |
     And "Active Template" is the active enterprise template
     And "Services Provider 2" doesnt have "Active Template" as template
-    And I visit "Joao Silva's control panel" and wait
+    And I go to joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider 2"
-    And I press "Activate" and wait
+    And I press "Activate"
     And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "2000"
     And I press "Continue"
     And I check "I read the terms of use and accepted them"
@@ -113,9 +113,9 @@ Feature: activate enterprise
       | active-template | Active Template | false | 2000 |
     And "Active Template" is the active enterprise template
     And "Services Provider 3" doesnt have "Active Template" as template
-    When I visit "Joao Silva's control panel" and wait
+    When I go to joaosilva's control panel
     And I fill in "Enterprise activation code" with code of "Services Provider 3"
-    And I press "Activate" and wait
+    And I press "Activate"
     And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "2000"
     And I press "Continue"
     And I check "I read the terms of use and accepted them"
@@ -16,22 +16,22 @@ Feature: manage categories
   @selenium
   Scenario: admin user could access new category
     Given I follow "Administration"
-    When I follow "Manage Categories"
-    And I follow "New category" and wait
+    When I follow "Categories"
+    And I follow "New category"
     Then I should be on /admin/categories/new
  
   @selenium
   Scenario: admin user could create a category
-    Given I visit "/admin/categories/new" and wait
-    When I fill in "Name" with "Category 1"
-    And I press "Save"
-    Then I should see "Categories"
-    And I should see "Category 1"
+    Given I go to /admin/categories/new
+      And I fill in "Name" with "Category 1"
+     When I press "Save"
+     Then I should see "Categories"
+      And I should see "Category 1"
  
   @selenium
   Scenario: admin user could see all the category tree
     Given I follow "Administration"
-    And I follow "Manage Categories"
+    And I follow "Categories"
     When I follow "Show"
     Then I should see "Vegetarian"
     And I should see "Steak"
@@ -39,13 +39,13 @@ Feature: manage categories
   @selenium
   Scenario: admin user could hide the category tree
     Given I follow "Administration"
-    And I follow "Manage Categories"
-    When I follow "Show"
+    And I follow "Categories"
+    When I follow "Show" and wait while it hides
     Then I should see "Vegetarian"
     And I should see "Steak"
-    When I follow "Hide" and sleep 1 second
-    Then I should not see "Vegetarian"
-    And I should not see "Steak"
+    When I follow "Hide" and wait while it hides
+    Then "Vegetarian" should not be visible within "div"
+    And "Steak" should not be visible within "div"
  
   @selenium
   Scenario: the show link is available just for categories with category tree
@@ -54,7 +54,7 @@ Feature: manage categories
       | Steak   | Pig      | true            |
     And I am on the homepage
     When I follow "Administration"
-    And I follow "Manage Categories"
+    And I follow "Categories"
     Then I should see "Food Show"
     When I follow "Show"
     Then I should see "Vegetarian"
@@ -19,52 +19,52 @@ Feature: approve article
     And "Maria Silva" is a member of "Sample Community"
     And "Joao Silva" is admin of "Sample Community"
  
-  @selenium
+  @selenium-fixme
   Scenario: edit an article before approval
     Given I am logged in as "mariasilva"
-    And I am on Maria Silva's homepage
-    When I follow "Spread" and wait
+    And I am on mariasilva's homepage
+    When I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And I am logged in as "joaosilva"
-    And I go to Sample Community's control panel
-    And I follow "Process requests" and wait
+    And I go to sample-community's control panel
+    And I follow "Process requests"
     And I fill in "Text" with "This is an article edited"
     And I choose "Accept"
     And I press "Apply!"
-    And I go to Sample Community's sitemap
+    And I go to sample-community's sitemap
     And I follow "Sample Article"
     Then I should see "This is an article edited"
  
   @selenium
   Scenario: reject an article with explanation
     Given I am logged in as "mariasilva"
-    And I go to Maria Silva's cms
+    And I go to mariasilva's cms
     And I follow "Sample Article"
-    And I follow "Spread" and wait
+    And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And I am logged in as "joaosilva"
-    And I go to Sample Community's control panel
-    And I follow "Process requests" and wait
+    And I go to sample-community's control panel
+    And I follow "Process requests"
     And I choose "Reject"
     And I fill in "Rejection explanation" with "This is not an appropriate article for this community."
     And I press "Apply!"
-    When I go to Sample Community's sitemap
+    When I go to sample-community's sitemap
     Then I should not see "Sample Article"
  
   @selenium
   Scenario: reject an article that was removed
     Given I am logged in as "mariasilva"
     And I follow "Dub Wars"
-    And I follow "Spread" and wait
+    And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And I follow "Delete"
-    And I press "Yes, I want."
+    And I confirm the browser dialog
     When I am logged in as "joaosilva"
-    And I go to Sample Community's control panel
-    And I follow "Process requests" and wait
+    And I go to sample-community's control panel
+    And I follow "Process requests"
     And I choose "Reject"
     And I fill in "Rejection explanation" with "Article was removed."
     And I press "Apply!"
@@ -12,33 +12,29 @@ Feature: balloon
   @selenium
   Scenario: I should not see trigger if not enabled
     Given feature "show_balloon_with_profile_links_when_clicked" is disabled on environment
-    When I go to /browse/people
+    When I go to /search/people
     Then I should not see "Profile links"
  
   @selenium
   Scenario: I should not see trigger by default
-    Given the following blocks
-      | owner       | type        |
-      | environment | PeopleBlock |
-    And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    When I go to the homepage
+    Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
+    When I go to /search/people
     Then I should not see "Friends"
  
   @selenium
   Scenario: I should see balloon when clicked on people block trigger
-    Given the following blocks
-      | owner       | type        |
-      | environment | PeopleBlock |
-    And feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    When I go to the homepage
-    And I follow "Profile links"
+    Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
+    And I go to /search/people
+    And display ".person-trigger"
+    When I follow "Profile links"
     Then I should see "Friends"
  
   @selenium
   Scenario: I should see balloon when clicked on community block trigger
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    When I go to /browse/communities
-    And I follow "Profile links"
+    And I go to /search/communities
+    And display ".community-trigger"
+    When I follow "Profile links"
     Then I should see "Members"
  
   @selenium
@@ -56,7 +52,8 @@ Feature: balloon
   @selenium
   Scenario: I should see balloon when clicked on page trigger
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    When I go to /assets/communities
-    And I follow "Profile links"
+    And I go to /assets/communities
+    And display ".community-trigger"
+    When I follow "Profile links"
     Then I should see "Members"
     And I should see "Agenda"
@@ -11,16 +11,16 @@ Feature: blog
     And I am logged in as "joaosilva"
  
   Scenario: create a blog
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Create blog"
     Then I should see "My Blog"
     When I fill in "Title" with "My Blog"
     And I press "Save"
-    And I go to Joao Silva's control panel
+    And I go to joaosilva's control panel
     Then I should see "Configure blog"
  
   Scenario: redirect to blog after create blog from control panel
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Create blog"
     Then I should see "My Blog"
     When I fill in "Title" with "My Blog"
@@ -28,7 +28,7 @@ Feature: blog
     Then I should be on /joaosilva/my-blog
  
   Scenario: redirect to blog after create blog from cms
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Blog"
@@ -37,13 +37,13 @@ Feature: blog
     Then I should be on /joaosilva/blog-from-cms
  
   Scenario: create multiple blogs
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Blog"
     And I fill in "Title" with "Blog One"
     And I press "Save"
-    Then I go to the Control panel
+    Then I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Blog"
@@ -53,7 +53,7 @@ Feature: blog
     And I should be on /joaosilva/blog-two
  
   Scenario: cancel button back to cms
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Blog"
@@ -61,7 +61,7 @@ Feature: blog
     Then I should be on /myprofile/joaosilva/cms
  
   Scenario: cancel button back to myprofile
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Create blog"
     When I follow "Cancel" within ".main-block"
     Then I should be on /myprofile/joaosilva
@@ -71,7 +71,7 @@ Feature: blog
       | owner     | name     |
       | joaosilva | Blog One |
       | joaosilva | Blog Two |
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     When I follow "Configure blog"
     Then I should be on /myprofile/joaosilva/cms
  
@@ -79,7 +79,7 @@ Feature: blog
     Given the following blogs
        | owner     | name     |
        | joaosilva | Blog One |
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     When I follow "Configure blog"
     Then I should be on edit "Blog One" by joaosilva
  
@@ -89,14 +89,14 @@ Feature: blog
        | owner     | name     |
        | joaosilva | Blog One |
     And I go to /joaosilva/blog-one
-    When I follow "Configure blog" and wait
+    When I follow "Configure blog"
     Then I should be on edit "Blog One" by joaosilva
  
   Scenario: change address of blog
     Given the following blogs
       | owner     | name     |
       | joaosilva | Blog One |
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     And I follow "Configure blog"
     And I fill in "Address" with "blog-two"
     And I press "Save"
@@ -104,7 +104,7 @@ Feature: blog
     Then I should see "Blog One"
  
   Scenario: display tag list field when creating new blog
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Blog"
@@ -17,32 +17,34 @@ Feature: browse
  
   @selenium
   Scenario: Show people browse menu
-    Given I should not see "More Recent"
-    And I should not see "More Active"
-    And I should not see "More Popular"
-    When I click "#submenu-people-trigger"
-    Then I should see "More Recent"
-    And I should see "More Active"
-    And I should see "More Popular"
+    Given I should not see "More recent"
+    And I should not see "More active"
+    And I should not see "More popular"
+    And display "#submenu-people-trigger"
+    When I follow "submenu-people-trigger"
+    Then I should see "More recent"
+    And I should see "More active"
+    And I should see "More popular"
  
   @selenium
   Scenario: People browse menu should add logged information
     Given I am logged in as "joaosilva"
-    And I should not see "More Recent"
-    And I should not see "More Active"
-    And I should not see "More Popular"
+    And I should not see "More recent"
+    And I should not see "More active"
+    And I should not see "More popular"
     And I should not see "Invite friends"
     And I should not see "My friends"
-    When I click "#submenu-people-trigger"
-    Then I should see "More Recent"
-    And I should see "More Active"
-    And I should see "More Popular"
+    And display "#submenu-people-trigger"
+    When I follow "submenu-people-trigger"
+    Then I should see "More recent"
+    And I should see "More active"
+    And I should see "More popular"
     And I should see "Invite friends"
     And I should see "My friends"
  
   Scenario: Browse people by query
     Given I go to /search/people
-    When I fill in "Silva" for "query"
+    When I fill in "Silva" for "search-input"
     And I press "Search"
     Then I should see "Joao Silva"
     And I should see "Pedro Silva"
@@ -54,31 +56,33 @@ Feature: browse
   Scenario: Communities browse menu should add logged information
     Given I am logged in as "joaosilva"
     When I go to /joaosilva
-    Then I should not see "More Recent"
-    And I should not see "More Active"
-    And I should not see "More Popular"
+    Then I should not see "More recent"
+    And I should not see "More active"
+    And I should not see "More popular"
     And I should not see "My communities"
     And I should not see "New community"
-    When I click "#submenu-communities-trigger"
-    Then I should see "More Recent"
-    And I should see "More Active"
-    And I should see "More Popular"
+    And display "#submenu-communities-trigger"
+    When I follow "submenu-communities-trigger"
+    Then I should see "More recent"
+    And I should see "More active"
+    And I should see "More popular"
     And I should see "My communities"
     And I should see "New community"
  
   @selenium
   Scenario: Show communities browse menu
-    Given I should not see "More Recent"
-    And I should not see "More Active"
-    And I should not see "More Popular"
-    When I click "#submenu-communities-trigger"
-    Then I should see "More Recent"
-    And I should see "More Active"
-    And I should see "More Popular"
+    Given I should not see "More recent"
+    And I should not see "More active"
+    And I should not see "More popular"
+    And display "#submenu-communities-trigger"
+    When I follow "submenu-communities-trigger"
+    Then I should see "More recent"
+    And I should see "More active"
+    And I should see "More popular"
  
   Scenario: Browse communities by query
     When I go to /search/communities
-    And I fill in "Neto" for "query"
+    And I fill in "Neto" for "search-input"
     And I press "Search"
     Then I should see "Community Neto"
     And I should not see "Joao Silva"
@@ -88,13 +92,14 @@ Feature: browse
  
   @selenium
   Scenario: Show contents browse menu
-    Given I should not see "More Comments"
-    And I should not see "More Views"
-    And I should not see "More Recent"
-    When I click "#submenu-contents-trigger"
-    Then I should see "More Comments"
-    And I should see "More Views"
-    And I should see "More Recent"
+    Given I should not see "Most commented"
+    And I should not see "More viewed"
+    And I should not see "More recent"
+    And display "#submenu-contents-trigger"
+    When I follow "submenu-contents-trigger"
+    Then I should see "Most commented"
+    And I should see "More viewed"
+    And I should see "More recent"
  
   Scenario: Browse contents by query
     Given the following articles
@@ -103,7 +108,7 @@ Feature: browse
       | joaosilva | Bees and ants are insects | this is another article |
       | joaosilva | Ants are small            | this is another article |
     When I go to /search/contents
-    And I fill in "bees" for "query"
+    And I fill in "bees" for "search-input"
     And I press "Search"
     Then I should see "Bees can fly"
     And I should see "Bees and ants are insects"
@@ -132,7 +132,7 @@ Feature: browse catalogs
     And I should not see "qualifiers"
     And I should not see "price composition"
  
-  @selenium
+  @selenium-fixme
   Scenario: display description button when needed (but not the description)
     Given the following products
       | owner      | category | name     | price | description                                           |
@@ -142,22 +142,22 @@ Feature: browse catalogs
     Then I should see "Produto2" within "li.product-link"
     And I should see "12.34" within "span.product-price"
     And I should see "description" within "#product-description-button"
-    And the "product-description-button" should be visible
+    And "description" should not be visible within "product-description-button"
     And I should see "A small description" within "#product-description"
-    And the "product-description" should not be visible
+    And "A small description for a product that doesn't exist" should not be visible within "product-description"
  
-  @selenium
+  @selenium-fixme
   Scenario: display description when button is clicked
     Given the following products
       | owner      | category | name     | price | description                                           |
       | artebonito | categ1   | Produto3 | 12.34 | A small description for a product that doesn't exist. |
     And I am on /catalog/artebonito
     And I reload and wait for the page
-    When I click "product-description-button"
+    When I follow "product-description-button"
     Then I should see "A small description" within "#product-description"
-    And the "product-description" should be visible
+    And "A small description for a product that doesn't exist" should not be visible within "product-description"
  
-  @selenium
+  @selenium-fixme
   Scenario: hide description
     Given the following products
       | owner      | category | name     | price | description                                           |
@@ -198,7 +198,7 @@ Feature: browse catalogs
     And I should see "Organic" within "span.search-product-qualifier"
     And I should not see "price composition"
  
-  @selenium
+  @selenium-fixme
   Scenario: not display price composition button if price is not described
     Given the following product
       | owner      | category | name     | price |
@@ -212,7 +212,7 @@ Feature: browse catalogs
     And I should see "10.00" within "span.product-price"
     And the "#product-price-composition-button" should not be visible
  
-  @selenium
+  @selenium-fixme
   Scenario: display price composition button (but not inputs)
     Given the following product
       | owner      | category | name     | price |
@@ -229,7 +229,7 @@ Feature: browse catalogs
     And I should see "food" within "#product-price-composition"
     And I should see "10.00" within "#product-price-composition"
  
-  @selenium
+  @selenium-fixme
   Scenario: display price composition when button is clicked
     Given the following product
       | owner      | category | name     | price |
@@ -244,7 +244,7 @@ Feature: browse catalogs
     And I should see "food" within "#product-price-composition"
     And I should see "10.88" within "#product-price-composition"
  
-  @selenium
+  @selenium-fixme
   Scenario: display inputs and raw materials button when not completely filled
     Given the following product
       | owner      | category | name     | price |
@@ -260,7 +260,7 @@ Feature: browse catalogs
     Then the "#inputs-button" should be visible
     And I should see "inputs and raw materials" within "#inputs-button"
  
-  @selenium
+  @selenium-fixme
   Scenario: display inputs and raw materials button
     Given the following product
       | owner      | category | name     | price |
@@ -280,7 +280,7 @@ Feature: browse catalogs
     And the "#inputs-description" should not be visible
     And I should see "7.0 Liter of food" within "#inputs-description"
  
-  @selenium
+  @selenium-fixme
   Scenario: display inputs and raw materials description
     Given the following product
       | owner      | category | name     | price |
@@ -297,7 +297,7 @@ Feature: browse catalogs
     Then the "#inputs-description" should be visible
     And I should see "7.0 Liter of food" within "#inputs-description"
  
-  @selenium
+  @selenium-fixme
   Scenario: hide inputs and raw materials
     Given the following product
       | owner      | category | name     | price |
@@ -24,7 +24,7 @@ Scenario: show profile links button
   And I should not see "Members"
   And I should not see "Agenda"
  
-@selenium
+@selenium-fixme
 Scenario: show profile links when clicked
   Given I am on /assets/enterprises
   When I follow "Profile links"
@@ -32,7 +32,7 @@ Scenario: show profile links when clicked
   And I should see "Members" within "ul.menu-submenu-list"
   And I should see "Agenda" within "ul.menu-submenu-list"
  
-@selenium
+@selenium-fixme
 Scenario: go to catalog when click on products link
   Given I am on /assets/enterprises
   When I follow "Profile links"
@@ -25,7 +25,7 @@ Feature: categories_block
       | environment | CategoriesBlock |
     And I am logged in as admin
  
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: List just product categories
     Given I go to /admin/environment_design
     And I follow "Edit" within ".categories-block"
@@ -33,11 +33,11 @@ Feature: categories_block
     When I press "Save"
     Then I should see "Food"
     And I should see "Book"
-    And I should not see "Vegetarian"
-    And I should not see "Steak"
-    And I should not see "Fiction"
+    And "Vegetarian" should not be visible within "span#category-name"
+    And "Steak" should not be visible within "span#category-name"
+    And "Fiction" should not be visible within "span#category-name"
  
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: Show submenu if it exists
     Given I go to /admin/environment_design
     And I follow "Edit" within ".categories-block"
@@ -45,40 +45,39 @@ Feature: categories_block
     And I press "Save"
     Then I should see "Food"
     And I should see "Book"
-    And I should not see "Vegetarian"
-    And I should not see "Steak"
-    And I should not see "Literature"
-    When I click ".category-link-expand category-root"
+    And "Vegetarian" should not be visible within "span#category-name"
+    And "Steak" should not be visible within "span#category-name"
+    And "Literature" should not be visible within "span#category-name"
+    When I follow "block_2_category_2"
     Then I should see "Literature"
-    When I click ".category-link-expand category-root"
+    When I follow "block_2_category_1"
     Then I should see "Vegetarian"
     And I should see "Steak"
     And I should not see "Fiction"
  
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: Show only one submenu per time
     Given I go to /admin/environment_design
     And I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Book"
-    And I should not see "Literature"
-    When I click ".category-link-expand category-root"
+    And "Literature" should not be visible within "span#category-name"
+    When I follow "block_2_category_2"
     Then I should see "Literature"
  
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: List just general categories
     Given I go to /admin/environment_design
     And I follow "Edit" within ".categories-block"
-    And I check "Generic Category"
+    And I check "Generic category"
     When I press "Save"
     Then I should see "Wood"
  
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: List just regions
     Given I go to /admin/environment_design
     And I follow "Edit" within ".categories-block"
     And I check "Region"
     When I press "Save"
     Then I should see "Bahia"
-
@@ -12,12 +12,12 @@ Feature: change organization name
       | joaosilva | Joao Silva |
     And "Joao Silva" is admin of "Sample Community"
     And I am logged in as "joaosilva"
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     And I follow "Community Info and settings"
     And I fill in "Name" with "New Sample Community"
     When I press "Save"
-    Then I should be on New Sample Community's control panel
-
+    Then I should be on sample-community's control panel
+    And I should see "New Sample Community" within "title"
  
   Scenario: changing enterprise's name
     Given the following enterprises
@@ -28,8 +28,9 @@ Feature: change organization name
       | joaosilva | Joao Silva |
     And "Joao Silva" is admin of "Sample Enterprise"
     And I am logged in as "joaosilva"
-    And I am on Sample Enterprise's control panel
+    And I am on sample-enterprise's control panel
     And I follow "Enterprise Info and settings"
     And I fill in "Name" with "New Sample Enterprise"
     When I press "Save"
-    Then I should be on New Sample Enterprise's control panel
+    Then I should be on sample-enterprise's control panel
+    And I should see "New Sample Enterprise" within "title"
@@ -17,7 +17,7 @@ Feature: chat
   Scenario: provide link to open chat
     Given feature "xmpp_chat" is enabled on environment
     And I am logged in as "tame"
-    Then I should see "Open chat" link
+    Then I should see "Open chat" within "#user"
  
   @selenium
   Scenario: provide the chat online users content
@@ -30,18 +30,18 @@ Feature: chat
     Given the profile "tame" has no blocks
     And feature "xmpp_chat" is enabled on environment
     And I am logged in as "tame"
-    And I go to Tame's profile
-    When I click "#chat-online-users-title"
+    And I go to tame's profile
+    When I follow "chat-online-users-title"
     Then I should see "Maria Silva"
     And I should see "Jose Silva"
  
   Scenario: not provide link to chat when environment not support that
     Given I am logged in as "tame"
-    Then I should not see "Open chat" link
+    Then I should not see "Open chat" within "#user"
  
   Scenario: not provide link to chat when the user is logged out
-    Given I am on Tame's homepage
-    Then I should not see "Open chat" link
+    Given I am on tame's homepage
+    Then I should not see "Open chat" within "#user"
  
   @selenium
   Scenario: not provide the chat online users list when environment not support that
@@ -71,8 +71,8 @@ Feature: chat
     Given the profile "tame" has no blocks
     And feature "xmpp_chat" is enabled on environment
     And I am logged in as "tame"
-    And I go to Tame's profile
-    When I click "#chat-online-users-title"
+    And I go to tame's profile
+    When I follow "chat-online-users-title"
     And I follow "Maria Silva"
     And I select window "noosfero_chat"
     Then I should see "Chat - Colivre.net - Friends online (0)"
@@ -83,7 +83,7 @@ Feature: chat
     And I am logged in as "tame"
     When I follow "Open chat"
     And I select window "noosfero_chat"
-    Then I should see "Offline" link
+    Then I should see "Offline" within "a"
  
   @selenium
   Scenario: view options to change my chat status through menu
@@ -91,13 +91,13 @@ Feature: chat
     And I am logged in as "tame"
     And I follow "Open chat"
     When I select window "noosfero_chat"
-    Then the "#chat-online" should not be visible
-    And the "#chat-busy" should not be visible
-    And the "#chat-disconnect" should not be visible
+    Then "Online" should not be visible within "#user-status"
+    And "Busy" should not be visible within "#user-status"
+    And "Sign out of chat" should not be visible within "#user-status"
     When I follow "Offline"
-    Then the "#chat-connect" should be visible
-    And the "#chat-busy" should be visible
-    And the "#chat-disconnect" should be visible
+    Then "Online" should be visible within "#user-status"
+    And "Busy" should be visible within "#user-status"
+    And "Sign out of chat" should be visible within "#user-status"
  
   @selenium
   Scenario: link to open chatroom of a community
@@ -107,8 +107,8 @@ Feature: chat
     And "Tame" is a member of "Autoramas"
     And feature "xmpp_chat" is enabled on environment
     And I am logged in as "tame"
-    When I go to Autoramas's profile
-    Then I should see "Enter chat room" link
+    When I go to autoramas's profile
+    Then I should see "Enter chat room"
  
   @selenium
   Scenario: not see link to open chatroom of a community if not a member
@@ -117,8 +117,8 @@ Feature: chat
       | autoramas | Autoramas |
     And feature "xmpp_chat" is enabled on environment
     And I am logged in as "tame"
-    When I go to Autoramas's profile
-    Then I should not see "Enter chat room" link
+    When I go to autoramas's profile
+    Then I should not see "Enter chat room" within "a"
  
   @selenium
   Scenario: not see link to open chatroom of a community if xmpp_chat disabled
@@ -127,8 +127,8 @@ Feature: chat
       | autoramas | Autoramas |
     And "Tame" is a member of "Autoramas"
     And I am logged in as "tame"
-    When I go to Autoramas's profile
-    Then I should not see "Enter chat room" link
+    When I go to autoramas's profile
+    Then I should not see "Enter chat room" within "a"
  
   @selenium
   Scenario: open chatroom of a community in a new window
@@ -138,7 +138,7 @@ Feature: chat
       | autoramas | Autoramas |
     And "Tame" is a member of "Autoramas"
     And I am logged in as "tame"
-    When I go to Autoramas's profile
+    When I go to autoramas's profile
     And I follow "Enter chat room"
     And I select window "noosfero_chat"
     Then I should see "Chat - Colivre.net - Friends online (0)"
@@ -22,7 +22,7 @@ Feature: clickable images
       | owner   | name | image     | dimensions |
       | booking | real | rails.png | 50x64      |
     When I go to /booking/real
-    Then I should not see "Zoom in"
+    Then "Zoom in" should not be visible within "a#zoomify-image"
  
   @selenium
   Scenario: not show link if image does not have dimensions set
@@ -30,9 +30,9 @@ Feature: clickable images
       | owner   | name    | image     |
       | booking | not set | rails.png |
     When I go to /booking/not-set
-    Then I should not see "Zoom in"
+    Then "Zoom in" should not be visible within "a#zoomify-image"
  
-  @selenium
+  @selenium-fixme
   Scenario: copy style from image
     Given the following article with image
       | owner   | name       | image     | style        | dimensions |
@@ -40,11 +40,11 @@ Feature: clickable images
     When I go to /booking/with-style
     Then "zoomable-image" should be right aligned
  
-  @selenium
+  @selenium-fixme
   Scenario: zoom image
     Given the following article with image
       | owner   | name | image     | dimensions |
       | booking | zoom | rails.png | 25x32      |
     When I go to /booking/zoom
-    And I follow "Zoom in"
-    Then the "#fancybox-wrap" should be visible
+    And I follow "Zoom in" within "a#zoomify-image"
+    Then I should see "fancybox-wrap"
@@ -14,19 +14,23 @@ Feature: comment
       | article              | author  | title | body         |
       | article with comment | booking | hi    | how are you? |
       | article with comment | booking | hello | i am fine    |
+    And feature "captcha_for_logged_users" is disabled on environment
+    And I am logged in as "booking"
  
   Scenario: not post a comment without javascript
     Given I am on /booking/article-to-comment
-    And I fill in "Name" with "Joey Ramone"
-    And I fill in "e-mail" with "joey@ramones.com"
+    And I follow "Post a comment"
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
     Then I should not see "Hey ho, let's go"
  
-  @selenium
+  # This test requires some way to overcome the captcha with unauthenticated
+  # user.
+  @selenium-fixme
   Scenario: post a comment while not authenticated
     Given I am on /booking/article-to-comment
+    And I follow "Post a comment"
     And I fill in "Name" with "Joey Ramone"
     And I fill in "e-mail" with "joey@ramones.com"
     And I fill in "Title" with "Hey ho, let's go!"
@@ -36,8 +40,8 @@ Feature: comment
  
   @selenium
   Scenario: post comment while authenticated
-    Given I am logged in as "booking"
-    And I am on /booking/article-to-comment
+    Given I am on /booking/article-to-comment
+    And I follow "Post a comment"
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
@@ -48,8 +52,8 @@ Feature: comment
     Given the following files
       | owner   | file      | mime      |
       | booking | rails.png | image/png |
-    Given I am logged in as "booking"
     And I am on /booking/rails.png?view=true
+    And I follow "Post a comment"
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
@@ -57,35 +61,34 @@ Feature: comment
  
   @selenium
   Scenario: show error messages when make a blank comment
-    Given I am logged in as "booking"
-    And I am on /booking/article-to-comment
+    Given I am on /booking/article-to-comment
+    And I follow "Post a comment"
     When I press "Post comment"
-    Then I should see "Title can't be blank"
-    And I should see "Body can't be blank"
+    Then I should see "Body can't be blank"
  
-  @selenium
+  @selenium-fixme
   Scenario: disable post comment button
     Given I am on /booking/article-to-comment
-    And I fill in "Name" with "Joey Ramone"
-    And I fill in "e-mail" with "joey@ramones.com"
+    And I follow "Post a comment"
     And I fill in "Title" with "Hey ho, let's go!"
     And I fill in "Enter your comment" with "Hey ho, let's go!"
     When I press "Post comment"
-    Then the "value.Post comment" button should not be enabled
-    And I should see "Hey ho, let's go"
+# Implement these steps...
+#    Then "Post comment" button should not be enabled
+#    And I should see "Hey ho, let's go"
  
   @selenium
   Scenario: render comment form and go to bottom
     Given I am on /booking/article-with-comment
-    When I follow "Post a comment" within ".post-comment-button"
-    Then I should see "Enter your comment" within "div#page-comment-form div.post_comment_box.opened"
-    And I should be exactly on /booking/article-with-comment
-    And I should be moved to anchor "comment_form"
+    When I follow "Post a comment"
+    Then I should see "Enter your comment"
+    And I should be on /booking/article-with-comment
  
   @selenium
   Scenario: keep comments field filled while trying to do a comment
     Given I am on /booking/article-with-comment
-    And I fill in "Name" with "Joey Ramone"
+    And I follow "Post a comment"
+    And I fill in "Title" with "Joey Ramone"
     When I press "Post comment"
-    Then the "Name" field should contain "Joey Ramone"
-    And I should see "errors prohibited"
+    Then the "Title" field should contain "Joey Ramone"
+    And I should see "Body can't be blank"
@@ -25,7 +25,7 @@ Feature: comment
     Then I should not see "Enter your comment" within "div.comment-balloon"
     And I should see "Reply" within "div.comment-balloon"
  
-  @selenium
+  @selenium-fixme
   Scenario: show error messages when make a blank comment reply
     Given I am logged in as "booking"
     And I go to /booking/article-to-comment
@@ -51,9 +51,9 @@ Feature: comment
     Given I am on /booking/article-to-comment
     When I follow "Reply" within ".comment-balloon"
     And I follow "Cancel" within ".comment-balloon"
-    Then I should see "Enter your comment" within "div.comment_reply.closed"
+    Then I should not see "Enter your comment" within "div.comment_reply.closed"
  
-  @selenium
+  @selenium-fixme
   Scenario: not render same reply form twice
     Given I am on /booking/article-to-comment
     When I follow "Reply" within ".comment-balloon"
@@ -62,7 +62,7 @@ Feature: comment
     Then there should be 1 "comment_form" within "comment_reply"
     And I should see "Enter your comment" within "div.comment_reply.opened"
  
-  @selenium
+  @selenium-fixme
   Scenario: reply a comment
     Given I go to /booking/another-article
     And I follow "Reply" within ".comment-balloon"
@@ -74,7 +74,7 @@ Feature: comment
     Then I should see "Hey ho, let's go" within "ul.comment-replies"
     And there should be 1 "comment-replies" within "article-comment"
  
-  @selenium
+  @selenium-fixme
   Scenario: redirect to right place after reply a picture comment
     Given the following files
       | owner   | file      | mime      |
@@ -14,8 +14,8 @@ In order to ask questions and solve problems
  
   @selenium
   Scenario: without states
-    Given I am on Sample Community's homepage
-    When I follow "Send an e-mail" and wait
+    Given I am on sample-community's homepage
+    When I follow "Send an e-mail"
     Then I should not see "City and state"
  
   @selenium
@@ -23,7 +23,6 @@ In order to ask questions and solve problems
     Given the following states
       | name  |
       | Bahia |
-    And I am on Sample Community's homepage
-    When I follow "Send an e-mail" and wait
+    And I am on sample-community's homepage
+    When I follow "Send an e-mail"
     Then I should see "City and state"
-    
@@ -11,7 +11,7 @@ Feature: create community
   Scenario: a user creates a community
     Given I am logged in as "joaosilva"
     And feature "admin_must_approve_new_communities" is disabled on environment
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     And I follow "Manage my groups"
     When I follow "Create a new community"
     And I fill in "Name" with "Fancy community"
@@ -22,7 +22,7 @@ Feature: create community
   Scenario: a user creates a community when environment moderates it
     Given I am logged in as "joaosilva"
     And feature "admin_must_approve_new_communities" is enabled on environment
-    When I go to the Control panel
+    And I go to joaosilva's control panel
     And I follow "Manage my groups"
     And I follow "Create a new community"
     And I fill in "Name" with "Community for moderation"
@@ -32,7 +32,7 @@ Feature: create community
   Scenario: a user tries to create a community without a name
     Given I am logged in as "joaosilva"
     And feature "admin_must_approve_new_communities" is disabled on environment
-    And I go to the Control panel
+    And I go to joaosilva's control panel
     And I follow "Manage my groups"
     When I follow "Create a new community"
     And I press "Create"
@@ -42,20 +42,20 @@ Feature: create community
     Given I am logged in as admin
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
-    And I go to the Control panel
+    And I go to admin_user's control panel
     Then I should see "admin_user wants to create community Community for approval"
  
   Scenario: environment admin accepts new community task
     Given I am logged in as admin
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
-    And I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Process requests"
     And I should see "admin_user wants to create community Community for approval"
     And I choose "Accept"
     When I press "Apply!"
     Then I should not see "admin_user wants to create community Community for approval"
-    When I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Manage my groups"
     Then I should see "Community for approval"
  
@@ -63,13 +63,13 @@ Feature: create community
     Given I am logged in as admin
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
-    And I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Process requests"
     And I should see "admin_user wants to create community Community for approval"
     And I choose "Reject"
     When I press "Apply!"
     Then I should not see "admin_user wants to create community Community for approval"
-    When I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Manage my groups"
     Then I should not see "Community for approval"
  
@@ -78,7 +78,7 @@ Feature: create community
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
     And I approve community "Community for approval"
-    When I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Manage my groups"
     Then I should see "Community for approval"
  
@@ -87,6 +87,6 @@ Feature: create community
     And feature "admin_must_approve_new_communities" is enabled on environment
     When I create community "Community for approval"
     And I reject community "Community for approval"
-    When I go to the Control panel
+    And I go to admin_user's control panel
     And I follow "Manage my groups"
     Then I should not see "Community for approval"
@@ -13,9 +13,10 @@ Feature: delete profile
       | sample-community | Sample Community |
     And "Maria Silva" is a member of "Sample Community"
  
+  @selenium
   Scenario: deleting profile
     Given I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Edit Profile"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
@@ -31,24 +32,25 @@ Feature: delete profile
  
   Scenario: giving up of deleting profile
     Given I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Edit Profile"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
     When I follow "No, I gave up"
-    Then I should be on Joao Silva's profile
+    Then I should be on joaosilva's profile
  
   Scenario: community admin can see link to delete profile
     Given "Joao Silva" is admin of "Sample Community"
     And I am logged in as "joaosilva"
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     When I follow "Community Info and settings"
     Then I should see "Delete profile"
  
+  @selenium
   Scenario: community admin deletes the community
     Given "Joao Silva" is admin of "Sample Community"
     And I am logged in as "joaosilva"
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     And I follow "Community Info and settings"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
@@ -69,17 +71,18 @@ Feature: delete profile
       | sample-enterprise | Sample Enterprise |
     And "Joao Silva" is admin of "Sample Enterprise"
     And I am logged in as "joaosilva"
-    And I am on Sample Enterprise's control panel
+    And I am on sample-enterprise's control panel
     When I follow "Enterprise Info and settings"
     Then I should see "Delete profile"
  
+  @selenium
   Scenario: enterprise admin deletes the enterprise
     Given the following enterprise
       | identifier | name |
       | sample-enterprise | Sample Enterprise |
     And "Joao Silva" is admin of "Sample Enterprise"
     And I am logged in as "joaosilva"
-    And I am on Sample Enterprise's control panel
+    And I am on sample-enterprise's control panel
     When I follow "Enterprise Info and settings"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
@@ -98,9 +101,10 @@ Feature: delete profile
     And I go to /myprofile/sample-enterprise/profile_editor/destroy_profile
     Then I should see "Access denied"
  
+  @selenium
   Scenario: environment admin deletes profile
     Given I am logged in as admin
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Edit Profile"
     And I follow "Delete profile"
     Then I should see "Are you sure you want to delete this profile?"
@@ -13,17 +13,17 @@ Feature: edit article
     And I am logged in as "joaosilva"
  
   Scenario: create a folder
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Folder"
     And I fill in "Title" with "My Folder"
     And I press "Save"
-    And I go to Joao Silva's control panel
+    And I go to joaosilva's control panel
     Then I should see "My Folder"
  
   Scenario: redirect to the created folder
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Folder"
@@ -33,29 +33,29 @@ Feature: edit article
     And I should be on /joaosilva/my-folder
  
   Scenario: cancel button back to cms
-    Given I go to the Control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Folder"
     When I follow "Cancel" within ".main-block"
-    Then I should be on Joao Silva's cms
+    Then I should be on joaosilva's cms
  
   Scenario: display tag list field when creating event
-    Given I go to the Control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Event"
     Then I should see "Tag list"
  
   Scenario: display tag list field when creating folder
-    Given I go to the Control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Folder"
     Then I should see "Tag list"
  
   Scenario: create new article with tags
-    Given I go to the Control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Text article with Textile markup language"
@@ -68,7 +68,7 @@ Feature: edit article
     And I should see "bug" within "#article-tags a:last"
  
   Scenario: redirect to the created article
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     When I follow "New content"
     When I follow "Text article with visual editor"
@@ -79,62 +79,62 @@ Feature: edit article
  
   @selenium
   Scenario: edit an article
-    Given I am on Joao Silva's sitemap
-    When I follow "Save the whales" and wait
-    And I follow "Edit" and wait
+    Given I am on joaosilva's sitemap
+    When I follow "Save the whales"
+    And I follow "Edit"
     And I fill in "Title" with "My Article edited"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should be on /joaosilva/my-article-edited
  
   @selenium
   Scenario: cancel button back to article when edit
-    Given I am on Joao Silva's sitemap
-    When I follow "Save the whales" and wait
-    And I follow "Edit" and wait
-    And I follow "Cancel" and wait
+    Given I am on joaosilva's sitemap
+    When I follow "Save the whales"
+    And I follow "Edit" within "#article-actions"
+    And I follow "Cancel"
     Then I should be on /joaosilva/save-the-whales
  
   @selenium
   Scenario: create an article inside a folder
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     When I follow "Manage Content"
     And I follow "New content"
-    And I follow "Folder" and wait
+    And I follow "Folder"
     And I fill in "Title" with "My Folder"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
-    And I follow "Text article with visual editor" and wait
+    And I follow "Text article with visual editor"
     And I fill in "Title" with "My Article"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should see "My Article"
     And I should be on /joaosilva/my-folder/my-article
  
   @selenium
   Scenario: cancel button back to folder after giving up creating
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     When I follow "Manage Content"
     And I follow "New content"
-    And I follow "Folder" and wait
+    And I follow "Folder"
     And I fill in "Title" with "My Folder"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should be on /joaosilva/my-folder
     When I follow "New article"
-    And I follow "Text article with visual editor" and wait
-    And I follow "Cancel" within ".no-boxes" and wait
+    And I follow "Text article with visual editor"
+    And I follow "Cancel" within ".no-boxes"
     Then I should be on /joaosilva/my-folder
  
   @selenium
   Scenario: save and continue
     Given I am on /joaosilva/save-the-whales
-    And I follow "Edit" and wait
+    And I follow "Edit"
     When I fill in "Text" with "new text"
     And I press "Save and continue"
     Then the "Text" field should contain "new text"
     And I should be on "Save the whales" edit page
  
   Scenario: save and continue when creating a new article
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     When I follow "Manage Content"
     And I follow "New content"
     And I follow "Text article with visual editor"
@@ -147,16 +147,16 @@ Feature: edit article
  
   @selenium
   Scenario: add a translation to an article
-    Given I am on Joao Silva's sitemap
+    Given I am on joaosilva's sitemap
     And I follow "Save the whales"
     Then I should not see "Add translation"
-    And I follow "Edit" and wait
+    And I follow "Edit"
     And I select "English" from "Language"
-    Then I press "Save" and wait
-    And I follow "Add translation" and wait
+    Then I press "Save"
+    And I follow "Add translation"
     And I fill in "Title" with "Mi neuvo artículo"
     And I select "Español" from "Language"
-    When I press "Save" and wait
+    When I press "Save"
     Then I should be on /joaosilva/mi-neuvo-articulo
     And I should see "Translations"
  
@@ -165,13 +165,13 @@ Feature: edit article
     Given the following articles
       | owner     | name               | language |
       | joaosilva | Article in English | en       |
-    And I am on Joao Silva's sitemap
-    When I follow "Article in English" and wait
-    And I follow "Add translation" and wait
+    And I am on joaosilva's sitemap
+    When I follow "Article in English"
+    And I follow "Add translation"
     And I fill in "Title" with "Article in Portuguese"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should see "Language must be choosen"
     When I select "Português" from "Language"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should not see "Language must be choosen"
     And I should be on /joaosilva/article-in-portuguese
@@ -12,7 +12,7 @@ Feature: edit_block_of_links
       | eddievedder | LinkListBlock |
     And I am logged in as "eddievedder"
  
-  @selenium
+  @selenium-fixme
   Scenario: show the icon selector
     Given I follow "Edit sideboxes"
     And I follow "Edit" within ".link-list-block"
@@ -4,50 +4,46 @@ Feature: edit environment templates
  
   Background:
     Given that the default environment have all profile templates
+    And I am logged in as admin
+    And I am on the environment control panel
  
+  @selenium
   Scenario: See links to edit all templates
-    Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
-    Then I should see "Person template" link
-    And I should see "Community template" link
-    And I should see "Enterprise template" link
-    And I should see "Inactive Enterprise template" link
+    Given I follow "Profile templates"
+    Then I should see "Person template"
+    And I should see "Community template"
+    And I should see "Enterprise template"
+    And I should see "Inactive Enterprise template"
  
+  @selenium
   Scenario: Go to control panel of person template
-    Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
+    Given I follow "Profile templates"
     And I follow "Person template"
-    Then I should be on Person template's control panel
+    Then I should be on colivre.net_person_template's control panel
  
+  @selenium
   Scenario: Go to control panel of enterprise template
-    Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
+    Given I follow "Profile templates"
     And I follow "Enterprise template"
-    Then I should be on Enterprise template's control panel
+    Then I should be on colivre.net_enterprise_template's control panel
  
+  @selenium
   Scenario: Go to control panel of inactive enterprise template
-    Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
-    And I follow "Inactive enterprise template"
-    Then I should be on Inactive Enterprise template's control panel
+    Given I follow "Profile templates"
+    And I follow "Inactive Enterprise template"
+    Then I should be on colivre.net_inactive_enterprise_template's control panel
  
+  @selenium
   Scenario: Go to control panel of community template
-    Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
-    And I follow "Community template"
-    Then I should be on Community template's control panel
+    Given I follow "Profile templates"
+    When I follow "Community template"
+    Then I should be on colivre.net_community_template's control panel
  
+  @selenium
   Scenario: Not see link to edit an unexistent template
-    Given that the default environment have no Inactive Enterprise template
-    And I am logged in as admin
-    When I follow "Administration"
-    And I follow "Profile templates"
-    Then I should see "Person template" link
-    And I should see "Community template" link
-    And I should see "Enterprise template" link
-    And I should not see "Inactive enterprise template" link
+    Given I follow "Profile templates"
+    And that the default environment have no Inactive Enterprise template
+    Then I should see "Person template"
+    And I should see "Community template"
+    And I should see "Enterprise template"
+    And I should not see "Inactive enterprise template"
@@ -15,25 +15,25 @@ Feature: edit language of block
   Scenario: display in all languages
     Given I go to edit ArticleBlock of joaosilva
     And I fill in "Custom title for this block" with "Block displayed"
-    And I select "all languages"
+    And I select "all languages" from "Show for"
     And I press "Save"
-    When I go to Jose Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "Block displayed"
  
   Scenario: display in the selected language
     Given I go to edit LinkListBlock of joaosilva
     And I fill in "Custom title for this block" with "Block displayed"
-    And I select "English"
+    And I select "English" from "Show for"
     And I press "Save"
     And my browser prefers English
-    When I go to Jose Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "Block displayed"
  
   Scenario: not display in a not selected language
     Given I go to edit LinkListBlock of joaosilva
     And I fill in "Custom title for this block" with "Block not displayed"
-    And I select "English"
+    And I select "English" from "Show for"
     And I press "Save"
     And my browser prefers Portuguese
-    When I go to Jose Silva's homepage
+    When I go to joaosilva's homepage
     Then I should not see "Block displayed"
@@ -12,8 +12,8 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November"
-    And I select "15"
+    And I select "November" from "profile_data_birth_date_2i"
+    And I select "15" from "profile_data_birth_date_3i"
     And I press "Save"
     Then I should see "Birth date is invalid"
     And I should not see "Birth date can't be blank"
@@ -24,8 +24,8 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November"
-    And I select "15"
+    And I select "November" from "profile_data_birth_date_2i"
+    And I select "15" from "profile_data_birth_date_3i"
     And I press "Save"
     Then I should see "Birth date is invalid"
     And I should not see "Birth date can't be blank"
@@ -36,9 +36,9 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November"
-    And I select "15"
-    And I select "1980"
+    And I select "November" from "profile_data_birth_date_2i"
+    And I select "15" from "profile_data_birth_date_3i"
+    And I select "1980" from "profile_data_birth_date_1i"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -49,9 +49,9 @@ Feature: edit profile
       | birth_date |
     When I go to joao's control panel
     And I follow "Edit Profile"
-    And I select "November"
-    And I select "15"
-    And I select "1980"
+    And I select "November" from "profile_data_birth_date_2i"
+    And I select "15" from "profile_data_birth_date_3i"
+    And I select "1980" from "profile_data_birth_date_1i"
     And I press "Save"
     Then I should not see "Birth date is invalid"
     And I should not see "Birth date is mandatory"
@@ -62,11 +62,11 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to O Rappa's control panel
-    And I follow "Community Info and settings" and wait
-    Then the "#identifier-change-confirmation" should not be visible
+    When I go to o-rappa's control panel
+    And I follow "Community Info and settings"
+    And I should not see "identifier-change-confirmation"
     When I fill in "Address" with "banda-o-rappa"
-    Then the "#identifier-change-confirmation" should be visible
+    And I should see "identifier-change-confirmation"
  
   @selenium
   Scenario: Confirm url change
@@ -74,12 +74,12 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to O Rappa's control panel
-    And I follow "Community Info and settings" and wait
+    When I go to o-rappa's control panel
+    And I follow "Community Info and settings"
     When I fill in "Address" with "banda-o-rappa"
-    Then the "#identifier-change-confirmation" should be visible
+    Then I should see "identifier-change-confirmation"
     When I follow "Yes"
-    Then the "#identifier-change-confirmation" should not be visible
+    Then "identifier-change-confirmation" should not be visible within "profile-identifier-formitem"
  
   @selenium
   Scenario: Cancel url change
@@ -87,9 +87,9 @@ Feature: edit profile
       | identifier | name | owner |
       | o-rappa | O Rappa | joao  |
     And feature "enable_organization_url_change" is enabled on environment
-    When I go to O Rappa's control panel
-    And I follow "Community Info and settings" and wait
+    When I go to o-rappa's control panel
+    And I follow "Community Info and settings"
     When I fill in "Address" with "banda-o-rappa"
-    Then the "#identifier-change-confirmation" should be visible
+    Then I should see "identifier-change-confirmation"
     When I follow "No"
-    Then the "#identifier-change-confirmation" should not be visible
+    Then "identifier-change-confirmation" should not be visible within "profile-identifier-formitem"
@@ -3,6 +3,7 @@ Feature: setting environment name
   I want to change the name of the environment
   So that it appears in the window's title bar
  
+  @selenium-fixme
   Scenario: setting environment name through administration panel
     Given I am logged in as admin
     When I follow "Administration"
@@ -184,7 +184,7 @@ Feature: events
     And "josesilva" is a member of "Sample Community"
     And I go to josesilva's control panel
     And I follow "Manage Content"
-    And I follow "Another Conference" and wait
+    And I follow "Another Conference"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
@@ -213,15 +213,15 @@ Feature: events
     And I am on josesilva's Event creation
     Then I should see "Lead"
  
-  @selenium
+  @selenium-fixme
   Scenario: events lead should be shown on blogs with short format
     Given I am logged in as "josesilva"
     And I am on josesilva's control panel
-    And I follow "Configure blog" and wait
+    And I follow "Configure blog"
     And I select "First paragraph" from "How to display posts:"
     And I press "Save"
     And I follow "New post"
-    And I follow "A calendar event" and wait
+    And I follow "A calendar event"
     And I fill in "Title" with "Leaded event"
     And I type "This is the abstract." in TinyMCE field "article_abstract"
     And I type "This is the real text." in TinyMCE field "article_body"
@@ -9,15 +9,13 @@ Feature: export users
  
   Scenario: Export users as XML
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
+    When I go to /admin/users
     And I follow "[XML]"
     Then I should see "ultraje"
  
   Scenario: Export users as CSV
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
+    When I go to /admin/users
     And I follow "[CSV]"
     Then I should see "name;email"
     And I should see "ultraje"
@@ -23,7 +23,7 @@ Feature: featured_products_block
       | redemoinho | automobile  | Moto | Very long description of and auto-mobile moto to be truncated | true |
     And I am logged in as "eddievedder"
  
-  @selenium
+  @selenium-fixme
   Scenario: select a product to be featured
     And I follow "Manage my groups"
     And I follow "Control panel of this group"
@@ -35,7 +35,7 @@ Feature: featured_products_block
     And I should not see "float_to_currency"
     And I should not see "product_path"
  
-  @selenium
+  @selenium-fixme
   Scenario: display block with long description
     Given I follow "Manage my groups"
     And I follow "Control panel of this group"
@@ -10,18 +10,18 @@ Feature: forum
     And "joaosilva" has no articles
     And I am logged in as "joaosilva"
  
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: create a forum
-    Given I am on Joao Silva's control panel
+    Given I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    When I follow "Forum" and wait
+    When I follow "Forum"
     And I fill in "Title" with "My Forum"
-    And I press "Save" and wait
+    And I press "Save"
     Then I should see "Configure forum"
  
   Scenario: redirect to forum after create forum from cms
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     When I follow "Forum"
@@ -30,13 +30,13 @@ Feature: forum
     Then I should be on /joaosilva/forum-from-cms
  
   Scenario: create multiple forums
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Forum"
     And I fill in "Title" with "Forum One"
     And I press "Save"
-    Then I go to the Control panel
+    Then I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Forum"
@@ -46,7 +46,7 @@ Feature: forum
     And I should be on /joaosilva/forum-two
  
   Scenario: cancel button back to cms
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Forum"
@@ -54,7 +54,7 @@ Feature: forum
     Then I should be on /myprofile/joaosilva/cms
  
   Scenario: cancel button back to myprofile
-    Given I go to the Control panel
+    Given I go to joaosilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
     And I follow "Forum"
@@ -66,8 +66,8 @@ Feature: forum
     Given the following forums
        | owner     | name      |
        | joaosilva | Forum One |
-    And I visit "/joaosilva/forum-one" and wait
-    When I follow "Configure forum" and wait
+    And I go to /joaosilva/forum-one
+    When I follow "Configure forum"
     Then I should be on edit "Forum One" by joaosilva
  
   Scenario: last topic update by unautenticated user should not link
@@ -94,4 +94,4 @@ Feature: forum
        | article | author | title | body |
        | Post one | joaosilva | Hi all | Hi all |
    When I go to /joaosilva/forum
-   Then I should see "Joao" linking to "http:///joaosilva"
+   Then I should see "Joao" linking to "http://localhost/joaosilva"
@@ -23,7 +23,7 @@ Feature: gallery_navigation
   @selenium
   Scenario: view next image when follow next link
     Given I am on /marciopunk/my-gallery/other-pic.jpg?view=true
-    When I follow "Next »" and wait
+    When I follow "Next »"
     Then I should see "rails.png" within ".title"
  
   Scenario: not link to next when in last image
@@ -38,7 +38,7 @@ Feature: gallery_navigation
   @selenium
   Scenario: view previous image when follow previous link
     Given I am on /marciopunk/my-gallery/rails.png?view=true
-    When I follow "« Previous" and wait
+    When I follow "« Previous"
     Then I should see "other-pic.jpg" within ".title"
  
   Scenario: not link to previous when in first image
@@ -68,11 +68,19 @@ Feature: gallery_navigation
     When I follow "Go back to my-gallery"
     Then I should be on /marciopunk/my-gallery
  
+  # Looking for page title is problematic on selenium since it considers the
+  # title to be invibible. Checkout some information about this:
+  #   * https://github.com/jnicklas/capybara/issues/863
+  #   * https://github.com/jnicklas/capybara/pull/953
   @selenium
   Scenario: image title in window title
     Given I am logged in as "marciopunk"
-    When I visit "/marciopunk/other-gallery/rails.png?view=true" and wait
-    And I follow "Edit" and wait
+    When I go to /marciopunk/other-gallery/rails.png?view=true
+    Then I should see "rails.png" within any "h1"
+#    And the page title should be "rails.png"
+    And I follow "Edit"
     And I fill in "Title" with "Rails is cool"
-    And I press "Save" and wait
-    Then The page title should contain "Rails is cool"
+    And I press "Save"
+    When I go to /marciopunk/other-gallery/rails.png?view=true
+    Then I should see "Rails is cool" within any "h1"
+    #Then the page title should be "Rails is cool"
@@ -35,13 +35,13 @@ Feature: HTTP caching
     Then the response should be valid for 90 minutes
  
   Scenario: profile pages, default configuaration
-    When I go to João Silva's homepage
+    When I go to joao's homepage
     Then the response should be valid for 15 minutes
  
   Scenario: profile pages, custom configuration
     Given the following environment configuration
       | profile_cache_in_minutes | 90 |
-    When I go to João Silva's homepage
+    When I go to joao's homepage
     Then the response should be valid for 90 minutes
  
   Scenario: account controller should not be cached at all
@@ -50,7 +50,7 @@ Feature: HTTP caching
  
   Scenario: profile administration
     Given I am logged in as "joao"
-    When I go to João Silva's control panel
+    When I go to joao's control panel
     Then there must be no cache at all
  
   Scenario: environment administration
@@ -28,6 +28,7 @@ Feature: internationalization
     When I follow "Português"
     Then the site should be in Portuguese
  
+  @fixme
   Scenario: language set by previous users
     Given a user accessed in English before
     And my browser prefers Portuguese
@@ -32,11 +32,13 @@ Feature: invitation
     When I am on /profile/josesilva/invite/friends
     Then I should see "Invite your friends"
  
+  @selenium
   Scenario: back to friends after invite friends
     Given I am on /myprofile/josesilva/friends
     And I follow "Invite people from my e-mail contacts"
     And I press "Next"
     And I fill in "manual_import_addresses" with "misfits@devil.doll"
+    And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
     When I press "Invite my friends!"
     Then I should be on /profile/josesilva/friends
@@ -46,8 +48,7 @@ Feature: invitation
     Then I should see "Invite your friends to join 26 Bsslines" link
  
   Scenario: not see link to invite members to community if has no rights
-    Given I am not logged in
-    And I am logged in as "josesantos"
+    Given I am logged in as "josesantos"
     When I am on /profile/26-bsslines/members
     Then I should not see "Invite your friends to join 26 Bsslines" link
  
@@ -65,8 +66,7 @@ Feature: invitation
     Then I should not see "Invite your friends to join Beatles For Sale" link
  
   Scenario: deny access if user has no right to invite members
-    Given I am not logged in
-    And I am logged in as "josesantos"
+    Given I am logged in as "josesantos"
     When I am on /profile/26-bsslines/invite/friends
     Then I should see "Access denied"
  
@@ -74,93 +74,107 @@ Feature: invitation
     Given I am on Beatles For Sale's members management
     Then I should not see "Invite your friends to join Beatles For Sale" link
  
+  @selenium
   Scenario: back to members after invite friends to join a community
     Given I am on 26 Bsslines's members management
     And I follow "Invite your friends to join 26 Bsslines"
     And I press "Next"
     And I fill in "manual_import_addresses" with "misfits@devil.doll"
+    And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
     When I press "Invite my friends!"
     Then I should be on /profile/26-bsslines/members
  
+  @selenium
   Scenario: noosfero user receives a task when a user invites to join a community
     Given I am on 26 Bsslines's members management
     And I follow "Invite your friends to join 26 Bsslines"
     And I press "Next"
     And I fill in "manual_import_addresses" with "santos@invalid.br"
+    And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
     And I press "Invite my friends!"
     Given there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I should see "josesilva invited you to join 26 Bsslines."
  
+  @selenium
   Scenario: noosfero user accepts to join community
     Given I invite email "santos@invalid.br" to join community "26 Bsslines"
     And there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Process requests"
     And I should see "josesilva invited you to join 26 Bsslines."
     And I choose "Accept"
     When I press "Apply!"
     Then I should not see "josesilva invited you to join 26 Bsslines."
-    When I go to the Control panel
+    When I go to josesantos's control panel
     And I follow "Manage my groups"
     Then I should see "26 Bsslines"
  
+  @selenium
   Scenario: noosfero user rejects to join community
     Given I invite email "santos@invalid.br" to join community "26 Bsslines"
     And there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Process requests"
     And I should see "josesilva invited you to join 26 Bsslines."
     And I choose "Reject"
     When I press "Apply!"
     Then I should not see "josesilva invited you to join 26 Bsslines."
-    When I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Manage my groups"
     Then I should not see "26 Bsslines"
  
+  @selenium
   Scenario: noosfero user receives a task when a user invites to be friend
     Given I am on josesilva's control panel
-    And I follow "Manage Friends"
+    And I follow "Manage friends"
     And I follow "Invite people from my e-mail contacts"
     And I press "Next"
     And I fill in "manual_import_addresses" with "santos@invalid.br"
+    And I follow "Personalize invitation mail"
     And I fill in "mail_template" with "Follow this link <url>"
     And I press "Invite my friends!"
     Given there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Process requests"
     Then I should see "josesilva wants to be your friend."
  
+  @selenium
   Scenario: noosfero user accepts to be friend
-    Given I invite email "santos@invalid.br" to be my friend
+    Given I am logged in as "josesilva"
+    And I go to josesilva's control panel
+    And I invite email "santos@invalid.br" to be my friend
     And there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Process requests"
     And I should see "josesilva wants to be your friend."
     And I choose "Accept"
     When I press "Apply!"
     And I should not see "josesilva wants to be your friend."
-    When I go to the Control panel
+    When I go to josesantos's control panel
     And I follow "Manage friends"
     Then I should see "josesilva"
  
+  @selenium
   Scenario: noosfero user rejects to be friend
-    Given I invite email "santos@invalid.br" to be my friend
+    Given I am logged in as "josesilva"
+    And I go to josesilva's control panel
+    And I invite email "santos@invalid.br" to be my friend
     And there are no pending jobs
     When I am logged in as "josesantos"
-    And I go to the Control panel
+    And I go to josesantos's control panel
     And I follow "Process requests"
     And I should see "josesilva wants to be your friend."
     And I choose "Reject"
     When I press "Apply!"
     And I should not see "josesilva wants to be your friend."
-    When I go to the Control panel
+    When I go to josesantos's control panel
     And I follow "Manage friends"
     Then I should not see "josesilva"
@@ -7,7 +7,7 @@ Feature: language redirection
       | login  | name         |
       | manuel | Manuel Silva |
     And the following articles
-      | owner  | name       | body            | lang | translation_of |
+      | owner  | name       | body            | language | translation_of |
       | manuel | Meu Artigo | isso é um teste | pt   | nil            |
       | manuel | My Article | this is a test  | en   | Meu Artigo     |
  
@@ -26,9 +26,9 @@ Feature: language redirection
     # Testing the web UI
     Given I am logged in as "manuel"
     And my browser prefers English
-    And I go to manuel's profile editor
+    And I go to /myprofile/manuel/profile_editor/edit
     And I check "Automaticaly redirect the visitor to the article translated to his/her language"
-    And I press "save"
+    And I press "Save"
     When I go to /manuel/meu-artigo
     Then the site should be in English
  
@@ -16,13 +16,14 @@ Feature: Location
       | state    |
       | city     |
       | zip_code |
-    And I go to the Control panel
+    And I go to zezinho's control panel
     And I follow "Location"
     When I fill in "Address" with "Rua Marechal Floriano, 28"
     And I select "Brazil" from "Country"
     And I fill in "State" with "Bahia"
     And I fill in "City" with "Salvador"
-    And I fill in "ZIP Code" with "40110010"
+    And I fill in "ZIP code" with "40110010"
+    And I follow "Locate in the map"
     And I press "Save"
     Then "zezinho" should have the following data
       | address                   | country | state | city     | zip_code |
@@ -38,14 +39,14 @@ Feature: Location
     Given the following <plural>
       | identifier   | name    | owner   |
       | mycollective | My Collective | zezinho |
-    And I am on My Collective's control panel
+    And I am on mycollective's control panel
     And I follow "Location"
     And I select "Brazil" from "Country"
     And I fill in the following:
       | Address   | Rua Marechal Floriano, 28 |
       | State    | Bahia                     |
       | City     | Salvador                  |
-      | ZIP Code | 40110010                  |
+      | ZIP code | 40110010                  |
     When I press "Save"
     Then "mycollective" should have the following data
       | address                   | country | state | city     | zip_code |
@@ -8,17 +8,20 @@ Feature: login
       | login | name |
       | joaosilva | Joao Silva |
  
+  @selenium
   Scenario: login from portal homepage
     Given feature "allow_change_of_redirection_after_login" is disabled on environment
     And I am not logged in
     And I go to the homepage
+    And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
     Then I should be on the homepage
     And I should be logged in as "joaosilva"
  
+  @selenium
   Scenario: login from some profile page
     Given feature "allow_change_of_redirection_after_login" is disabled on environment
     And I am not logged in
@@ -28,30 +31,31 @@ Feature: login
     And the following articles
       | owner      | name         | homepage |
       | mariasilva | my home page | true |
-    And I go to Maria Silva's homepage
+    And I go to mariasilva's homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Maria Silva's homepage
+    Then I should be on mariasilva's homepage
  
   Scenario: view my control panel
     Given feature "allow_change_of_redirection_after_login" is disabled on environment
     And I am not logged in
-    And I go to Joao Silva's control panel
+    And I go to joaosilva's control panel
     And I should be on login page
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's control panel
+    Then I should be on joaosilva's control panel
  
   Scenario: be redirected if user goes to login page and is logged
     Given I am logged in as "joaosilva"
     And I go to login page
-    Then I should be on Joao Silva's control panel
+    Then I should be on joaosilva's control panel
  
+  @selenium
   Scenario: stay on the same page after login if this is the environment default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -62,26 +66,28 @@ Feature: login
     And the following articles
       | owner      | name         | homepage |
       | mariasilva | my home page | true |
-    And I go to Maria Silva's homepage
+    And I go to mariasilva's homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Maria Silva's homepage
+    Then I should be on mariasilva's homepage
  
+  @selenium
   Scenario: go to site homepage if this is the environment default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
     And the environment is configured to redirect to site homepage after login
-    And I go to Joao Silva's homepage
+    And I go to joaosilva's homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
     Then I should be on the homepage
  
+  @selenium
   Scenario: go to user profile after login if this is the environment default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -89,11 +95,12 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's profile
+    Then I should be on joaosilva's profile
  
+  @selenium
   Scenario: go to profile homepage after login if this is the environment default
     Given the following articles
       | owner     | name           | body               | homepage |
@@ -104,11 +111,12 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's homepage
+    Then I should be on joaosilva's homepage
  
+  @selenium
   Scenario: go to profile control panel after login if this is the environment default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -116,11 +124,12 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's control panel
+    Then I should be on joaosilva's control panel
  
+  @selenium
   Scenario: stay on the same page after login if this is the profile default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -132,27 +141,29 @@ Feature: login
     And the following articles
       | owner      | name         | homepage |
       | mariasilva | my home page | true |
-    And I go to Maria Silva's homepage
+    And I go to mariasilva's homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Maria Silva's homepage
+    Then I should be on mariasilva's homepage
  
+  @selenium
   Scenario: go to site homepage if this is the profile default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
     And the environment is configured to stay on the same page after login
     And the profile joaosilva is configured to redirect to site homepage after login
-    And I go to Joao Silva's homepage
+    And I go to joaosilva's homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
     Then I should be on the homepage
  
+  @selenium
   Scenario: go to user profile after login if this is the profile default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -161,11 +172,12 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's profile
+    Then I should be on joaosilva's profile
  
+  @selenium
   Scenario: go to profile homepage after login if this is the profile default
     Given the following articles
       | owner     | name           | body               | homepage |
@@ -177,11 +189,12 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's homepage
+    Then I should be on joaosilva's homepage
  
+  @selenium
   Scenario: go to profile control panel after login if this is the profile default
     Given feature "allow_change_of_redirection_after_login" is enabled on environment
     And I am not logged in
@@ -190,7 +203,7 @@ Feature: login
     And I go to the homepage
     And I follow "Login"
     And I fill in the following:
-      | Username | joaosilva |
+      | Username / Email | joaosilva |
       | Password | 123456 |
     When I press "Log in"
-    Then I should be on Joao Silva's control panel
+    Then I should be on joaosilva's control panel
@@ -26,7 +26,6 @@ Feature: manage categories
   Scenario: load subcategories only after following parent
     Then I should not see "Beans"
     And I should not see "Potatoes"
-    When I follow "Show" and wait for jquery
-    #    Then show me the page
-
-
+    When I follow "Show"
+    Then I should see "Beans"
+    And I should see "Potatoes"
@@ -15,8 +15,10 @@ Feature: manage enterprises
   Scenario: seeing my enterprises on menu
     Given I am logged in as "joaosilva"
     Then I should see "My enterprises" link
-    When I follow "My enterprises" and wait
-    Then I should see "Tangerine Dream" linking to "/myprofile/tangerine-dream"
+    When I follow "My enterprises"
+    And I follow "Tangerine Dream"
+    Then I should be on tangerine-dream's control panel
+
  
   @selenium
   Scenario: not show enterprises on menu to a user without enterprises
@@ -32,8 +32,8 @@ Feature: manage inputs
     And I follow "Inputs"
     Then I should not see "Add new input or raw material"
     And I follow "Add the inputs or raw material used by this product"
-    And I select "Music »" and wait for jquery
-    And I select "Rock" and wait for jquery
+    And I select "Music »" from "category_id" within "#categories_container_level0"
+    And I select "Rock" from "category_id" within "#categories_container_level1"
     And I press "Save and continue"
     Then I should see "Rock"
  
@@ -47,8 +47,8 @@ Feature: manage inputs
     And I follow "Inputs"
     And I should not see "Add the inputs or raw material used by this product"
     And I follow "Add new input or raw material"
-    And I select "Music »" and wait for jquery
-    And I select "Rock" and wait for jquery
+    And I select "Music »" from "category_id" within "#categories_container_level0"
+    And I select "Rock" from "category_id" within "#categories_container_level1"
     And I press "Save and continue"
     Then I should see "Rock"
  
@@ -57,8 +57,8 @@ Feature: manage inputs
     Given I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
-    And I follow "Add the inputs or raw material used by this product" and wait until "#input-category-form" is present
-    And I click "css=a.cancel-add-input"
+    And I follow "Add the inputs or raw material used by this product"
+    And I follow "Cancel" within "#categories_selection_actionbar"
     Then I should see "Abbey Road"
     And I should see "Add the inputs or raw material used by this product"
  
@@ -90,7 +90,7 @@ Feature: manage inputs
     And I follow "Inputs and raw material"
     Then I should see "Edit" within ".input-item"
  
-  @selenium
+  @selenium-fixme
   Scenario: Order inputs by position
     Given the following product_categories
       | name  |
@@ -131,7 +131,7 @@ Feature: manage inputs
     And I follow "Inputs"
     And I follow "Click here to add price and the amount used"
     And I should not see "Price by Meter ($)"
-    When I select "Meter"
+    When I select "Meter" from "input_unit_id" within ".edit_input"
     Then I should see "Price by Meter ($)"
  
   @selenium
@@ -145,7 +145,7 @@ Feature: manage inputs
     And I follow "Click here to add price and the amount used"
     And I fill in "Amount used" with "2.5"
     And I fill in "Price" with "11.50"
-    And I select "Meter"
+    And I select "Meter" from "input_unit_id" within ".edit_input"
     And I press "Save"
     Then I should see "2.5"
     And I should see "Meter"
@@ -162,14 +162,14 @@ Feature: manage inputs
     And I follow "Click here to add price and the amount used"
     And I fill in "Amount used" with "2.5"
     And I fill in "Price" with "11.50"
-    And I select "Meter"
+    And I select "Meter" from "input_unit_id" within ".edit_input"
     And I press "Save"
     Then I should see "2.5"
     And I should see "Meter"
     When I follow "Edit" within ".input-details"
     And I fill in "Amount used" with "3.0"
     And I fill in "Price" with "23.31"
-    And I select "Litre"
+    And I select "Litre" from "input_unit_id" within ".edit_input"
     And I press "Save"
     Then I should see "3"
     And I should see "Litre"
@@ -182,12 +182,12 @@ Feature: manage inputs
     And I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
-    And I follow "Click here to add price and the amount used" and wait until ".input-details-form" is present
+    And I follow "Click here to add price and the amount used"
     Then I should see "Cancel"
     And I should see "Amount used"
     And I should see "Price"
     And I should see "This input or raw material inpact on the final price of the product?"
-    When I click "css=a.cancel-edit-input"
+    When I follow "Cancel" within ".edit_input"
     Then I should see "Click here to add price and the amount used"
  
   @selenium
@@ -199,7 +199,7 @@ Feature: manage inputs
     When I go to Rede Moinho's page of product Abbey Road
     And I follow "Inputs"
     And I follow "Edit" within ".input-details"
-    And I follow "Cancel"
+    And I follow "Cancel" within ".edit_input"
     And I follow "Edit" within ".input-details"
     Then I should see "Amount used"
     And I should see "Price by Meter"
@@ -215,7 +215,7 @@ Feature: manage inputs
     Then I should see "Rock"
     And I should not see "Add the inputs or raw material used by this product"
     When I follow "Remove"
-    And I confirm
+    And I confirm the browser dialog
     Then I should see "Add the inputs or raw material used by this product"
  
   @selenium
@@ -226,18 +226,18 @@ Feature: manage inputs
       | redemoinho | Music    | Manu Chao    |
     And I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Depeche Mode
-    Then the content "Add some description to your product" should be visible
-    And the content "Add the inputs or raw material used by this product" should not be visible
+    Then I should see "Add some description to your product"
+    And "Add the inputs or raw material used by this product" should not be visible within "#show_product"
     When I follow "Inputs and raw material"
-    Then the content "Add the inputs or raw material used by this product" should be visible
-    And the content "Add some description to your product" should not be visible
+    Then I should see "Add the inputs or raw material used by this product"
+    And "Add some description to your product" should not be visible within "#show_product"
     When I go to Rede Moinho's page of product Manu Chao
-    Then the content "Add some description to your product" should be visible
+    Then I should see "Add some description to your product"
     When I go to Rede Moinho's page of product Depeche Mode
-    Then the content "Add the inputs or raw material used by this product" should be visible
-    And the content "Add some description to your product" should not be visible
+    Then I should see "Add the inputs or raw material used by this product"
+    And "Add some description to your product" should not be visible within "#show_product"
  
-  @selenium
+  @selenium-fixme
   Scenario: Order input list
     Given the following product_category
       | name  |
@@ -51,9 +51,9 @@ Feature: manage product price details
     And I follow "Price composition"
     And I follow "Describe here the cost of production"
     And I follow "New cost"
-    And I select "Taxes"
+    And I select "Taxes" from "price_details__production_cost_id" within "#display-product-price-details"
     And I fill in "$" with "5.00"
-    And I leave the ".price-details-price" field
+    And I leave the "#price_details__price" field
     And I press "Save"
     Then I should not see "Save"
     And I should see "Describe here the cost of production"
@@ -67,15 +67,15 @@ Feature: manage product price details
     And I follow "Price composition"
     And I follow "Describe here the cost of production"
     And I follow "New cost"
-    And I select "Taxes"
+    And I select "Taxes" from "price_details__production_cost_id" within "#display-product-price-details"
     And I fill in "$" with "20.00"
     And I leave the ".price-details-price" field
     And I press "Save"
     Then I should not see "Save"
     And I should see "Taxes" within "#display-price-details"
     When I follow "Describe here the cost of production"
-    And I select "Energy"
-    And I leave the ".price-details-price" field
+    And I select "Energy" from "price_details__production_cost_id" within "#display-product-price-details"
+    And I leave the "#price_details__price" field
     And I press "Save"
     And I should not see "Taxes" within "#display-price-details"
     And I should see "Energy" within "#display-price-details"
@@ -102,9 +102,10 @@ Feature: manage product price details
      And I follow "Price composition"
      And I follow "Describe here the cost of production"
      And I follow "New cost"
-     And I select "Taxes"
+     And I select "Taxes" from "price_details__production_cost_id" within "#display-product-price-details"
      And I fill in "$" with "20.00"
      And I press "Save"
+     And I go to Rede Moinho's page of product Abbey Road
      Then I should see "Inputs" within ".price-detail-name"
      And I should see "60.0" within ".price-detail-price"
  
@@ -114,10 +115,10 @@ Feature: manage product price details
     And I follow "Price composition"
     And I follow "Describe here the cost of production"
     And I follow "New cost"
+    And I select "Other cost" from "price_details__production_cost_id" within "#display-product-price-details"
     And I want to add "Energy" as cost
-    And I select "Other cost"
     And I fill in "$" with "10.00"
-    And I leave the ".price-details-price" field
+    And I leave the "#price_details__price" field
     And I press "Save"
     When I follow "Describe here the cost of production"
     Then I should see "Energy" within ".production-cost-selection"
@@ -127,9 +128,10 @@ Feature: manage product price details
     Given I go to Rede Moinho's page of product Abbey Road
     And I follow "Price composition"
     And I follow "Describe here the cost of production"
+    And I follow "New cost"
+    And I select "Other cost" from "price_details__production_cost_id" within "#display-product-price-details"
     And I want to add "Energy" as cost
-    And I select "Other cost"
-    Then I should see "Energy" within "#new-cost-fields"
+    Then I should see "Energy" within "#display-product-price-details"
  
   @selenium
   Scenario: remove price detail
@@ -141,7 +143,7 @@ Feature: manage product price details
     And I follow "Describe here the cost of production"
     And I should see "Taxes" within "#manage-product-details-form"
     When I follow "Remove" within "#manage-product-details-form"
-    And I confirm
+    And I confirm the browser dialog
     And I press "Save"
     And I follow "Describe here the cost of production"
     Then I should not see "Taxes" within "#manage-product-details-form"
@@ -160,7 +162,7 @@ Feature: manage product price details
     Then I should see "$ 60.00 of $ 80.00" within "#progressbar-text"
     And I follow "New cost"
     And I fill in "$" with "10.00"
-    And I leave the ".price-details-price" field
+    And I leave the "#price_details__price" field
     Then I should see "$ 70.00 of $ 80.00" within "#progressbar-text"
  
   @selenium
@@ -13,7 +13,7 @@ Feature: manage products
  
   Scenario: display "create new product" button
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
+    And I am on redemoinho's control panel
     When I follow "Manage Products and Services"
     Then I should see "New product or service"
  
@@ -34,7 +34,7 @@ Feature: manage products
       | redemoinho | bicycle  | Bike I | bicycle 9  |
       | redemoinho | bicycle  | Bike J | bicycle 10 |
       | redemoinho | bicycle  | Bike K | bicycle 11 |
-    When I go to /catalog/redemoinho
+    When I go to redemoinho's products page
     Then I should see "Bike A" within "#product-list"
     And I should see "Bike B" within "#product-list"
     And I should see "Bike C" within "#product-list"
@@ -52,13 +52,13 @@ Feature: manage products
  
   Scenario: listing products and services
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
+    And I am on redemoinho's control panel
     And I follow "Manage Products and Services"
     Then I should see "Listing products and services"
  
   Scenario: see button to back in categories hierarchy
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
+    And I am on redemoinho's control panel
     And I follow "Manage Products and Services"
     When I follow "New product or service"
     Then I should see "Back to the product listing" link
@@ -69,9 +69,7 @@ Feature: manage products
       | Products |
       | Services |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
+    And I go to redemoinho's new product page
     Then I should see "Products"
     And I should see "Service"
  
@@ -85,10 +83,8 @@ Feature: manage products
       | Computers level1 | products-level0 |
       | DVDs level1 | products-level0 |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Products level0 »" and wait for jquery
+    And I go to redemoinho's new product page
+    And I select "Products level0 »" from "category_id" within "#categories_container_level0"
     Then I should see "Computers level1"
     And I should see "DVDs level1"
  
@@ -103,12 +99,12 @@ Feature: manage products
       | Computers level1 | products-level0 |
       | Software development level1 | services-level0 |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Products level0 »" and wait for jquery
-    And I select "Computers level1" and wait for jquery
-    And I select "Services level0 »" and wait for jquery
+    And I go to redemoinho's new product page
+    And I should not see /Computers level/
+    And I select "Products level0 »" from "category_id" within "#categories_container_wrapper"
+    And I should see /Computers level/
+    And I should not see /Software develop/
+    And I select "Services level0 »" from "category_id" within "#categories_container_wrapper"
     Then I should see /Software develop/
     And I should not see /Computers level/
  
@@ -121,11 +117,9 @@ Feature: manage products
       | name | parent |
       | Computers | products |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Products »" and wait for jquery
-    And I select "Computers" and wait for jquery
+    And I go to redemoinho's new product page
+    And I select "Products »" from "category_id" within "#categories_container_level0"
+    And I select "Computers" from "category_id" within "#categories_container_level1"
     Then I should see "Products → Computers"
  
   @selenium
@@ -137,11 +131,9 @@ Feature: manage products
       | name | parent |
       | Category Level 1 | toplevel-product-categories |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Toplevel Product Categories »" and wait for jquery
-    And I select "Category Level 1" and wait for jquery
+    And I go to redemoinho's new product page
+    And I select "Toplevel Product Categories »" from "category_id" within "#categories_container_level0"
+    And I select "Category Level 1" from "category_id" within "#categories_container_level1"
     Then I should see "Toplevel Product Categories" link
     And I should not see "Category Level 1" link
  
@@ -151,8 +143,8 @@ Feature: manage products
       | name |
       | Only for test |
     And I am logged in as "joaosilva"
-    When I go to /myprofile/redemoinho/manage_products/new
-    Then the "#save_and_continue" button should not be enabled
+    When I go to redemoinho's new product page
+    Then the "#save_and_continue" button should be disabled
  
   @selenium
   Scenario: enable save button when select one category
@@ -160,11 +152,9 @@ Feature: manage products
     And the following product_category
       | name |
       | Browsers (accept categories) |
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Browsers (accept categories)" and wait for jquery
-    Then the "Save and continue" button should be enabled
+    When I go to redemoinho's new product page
+    And I select "Browsers (accept categories)" from "category_id" within "#categories_container_wrapper"
+    Then the "#save_and_continue" button should be enabled
  
   @selenium
   Scenario: dont enable save button when select category with not accept products
@@ -172,11 +162,9 @@ Feature: manage products
       | name | accept_products |
       | Browsers | false |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Browsers" and wait for jquery
-    Then the "#save_and_continue" button should not be enabled
+    When I go to redemoinho's new product page
+    And I select "Browsers" from "category_id" within "#categories_container_wrapper"
+    Then the "#save_and_continue" button should be disabled
  
   @selenium
   Scenario: save product
@@ -184,32 +172,14 @@ Feature: manage products
       | name |
       | Bicycle |
     Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    When I follow "New product or service"
-    And I select "Bicycle" and wait for jquery
+    When I go to redemoinho's new product page
+    And I select "Bicycle" from "category_id" within "#categories_container_wrapper"
     And I press "Save and continue"
-    Then I should see "Bicycle"
+    When I go to redemoinho's products page
+    And I follow "Bicycle" within "#product-list"
+    Then I should see "Bicycle" within "#show_product"
     And I should see "Change category"
  
-  @selenium
-  Scenario: stay on the same place after error on save
-    Given the following product_category
-      | name |
-      | Bicycle |
-    Given I am logged in as "joaosilva"
-    And I am on Rede Moinho's control panel
-    And I follow "Manage Products and Services"
-    And I follow "New product or service"
-    And I select "Bicycle" and wait for jquery
-    And I press "Save and continue"
-    When I follow "Back"
-    And I follow "New product or service"
-    And I select "Bicycle" and wait for jquery
-    And I press "Save and continue"
-    Then I should be on Rede Moinho's new product page
-    And I should see "Bicycle"
-
   Scenario: a user with permission can see edit links
     Given the following product_category
       | name |
@@ -331,10 +301,11 @@ Feature: manage products
     And I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Generic pc
     And I follow "Change category"
-    And I select "Eletronics »" and wait for jquery
-    Then I select "DVDs" and wait for jquery
+    And I select "Eletronics »" from "category_id" within "#categories_container_level0"
+    Then I select "DVDs" from "category_id" within "#categories_container_level1"
     And I press "Save and continue"
-    Then I should see "Eletronics → DVDs"
+    When I go to Rede Moinho's page of product Generic pc
+    Then I should see "Eletronics → DVDs" within ".hierarchy-category"
  
   @selenium
   Scenario: cancel edition of a product category
@@ -424,7 +395,9 @@ Feature: manage products
     And I follow "Change category"
     And I press "Save and continue"
     Then I should not see "Product category can't be blank"
-    And I should be on Rede Moinho's page of product Generic pc
+    When I go to Rede Moinho's page of product Generic pc
+    Then I should see "Eletronics → Computers" within ".hierarchy-category"
+
     And I should see "Generic pc"
  
   @selenium
@@ -450,7 +423,7 @@ Feature: manage products
     And I am logged in as "joaosilva"
     When I go to Rede Moinho's page of product Generic pc
     And I follow "Change category"
-    Then the select for category "Netbook from Venus" should be visible
+    Then "Netbook from Venus" should be visible within "#categories_container_wrapper"
  
   @selenium
   Scenario: Truncate long category name in selection of category
@@ -462,7 +435,7 @@ Feature: manage products
       | name | parent |
       | Netbook Quantum | Super Quantum Computers with teraflops |
     And I am logged in as "joaosilva"
-    When I go to Rede Moinho's new product page
+    When I go to redemoinho's new product page
     Then I should see "Nanonote nanotech with long lo..."
     And I should see "Super Quantum Computers with t... »"
  
@@ -481,7 +454,7 @@ Feature: manage products
     When I go to Rede Moinho's page of product Bike
     And I follow "Edit name and unit"
     And I fill in "Red bicycle" for "product_name"
-    And I select "Kilo"
+    And I select "Kilo" from "product_unit_id" within "#product-name-form"
     And I press "Save"
     Then I should see "Red bicycle - kilo"
  
@@ -519,12 +492,14 @@ Feature: manage products
     When I go to Rede Moinho's page of product Bike
     And I follow "Add price and other basic information"
     And I follow "Add new qualifier"
-    And I select "Organic" and wait for jquery
+    And I select "Organic" from "selected_qualifier" within "#product-qualifiers-list"
     And I press "Save"
+    And I go to Rede Moinho's page of product Bike
     Then I should see "Organic (Self declared)"
     When I follow "Edit basic information"
     And I follow "Delete qualifier"
     And I press "Save"
+    And I go to Rede Moinho's page of product Bike
     Then I should not see "Organic (Self declared)"
  
   @selenium
@@ -20,11 +20,11 @@ Feature: my_network_block
       | identifier              | name                   | owner     | public_profile |
       | other-public-community  | Other Public Community | joaosilva | true           |
       | private-community       | Private Community      | joaosilva | false          |
-    And I am on Joao Silva's homepage
+    And I am on joaosilva's homepage
     And I should see "2 communities"
-    When I go to Public Community's homepage
+    When I go to public-community's homepage
     And I follow "Join"
-    And I go to Joao Silva's homepage
+    And I go to joaosilva's homepage
     Then I should see "3 communities"
  
   @selenium
@@ -34,11 +34,11 @@ Feature: my_network_block
       | identifier            | name                  | owner     | visible |
       | visible-community     | Visible Community     | joaosilva | true    |
       | not-visible-community | Not Visible Community | joaosilva | false   |
-    And I am on Joao Silva's homepage
+    And I am on joaosilva's homepage
     And I should see "One community"
-    When I go to Public Community's homepage
+    When I go to public-community's homepage
     And I follow "Join"
-    And I go to Joao Silva's homepage
+    And I go to joaosilva's homepage
     Then I should see "2 communities"
  
   Scenario: display how many public/private friends I have
@@ -48,10 +48,10 @@ Feature: my_network_block
       | josesilva  | Jose Silva  | false          |
     And "joaosilva" is friend of "mariasilva"
     And I am logged in as "joaosilva"
-    And I am on Joao Silva's homepage
+    And I am on joaosilva's homepage
     Then I should see "1 friend"
     And "joaosilva" is friend of "josesilva"
-    When I go to Joao Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "2 friends"
  
   Scenario: not display how many invisible friends I have
@@ -62,8 +62,8 @@ Feature: my_network_block
     And "josesilva" is invisible
     And "joaosilva" is friend of "mariasilva"
     And I am logged in as "joaosilva"
-    When I go to Joao Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "1 friend"
     And "joaosilva" is friend of "josesilva"
-    When I go to Joao Silva's homepage
+    When I go to joaosilva's homepage
     Then I should see "1 friend"
@@ -7,10 +7,10 @@ Feature: create content on cms
       | login     | name       |
       | joaosilva | Joao Silva |
     And I am logged in as "joaosilva"
-    And I am on Joao Silva's cms
+    And I am on joaosilva's cms
  
   Scenario: open page to select type of content
-    Given I follow "New Content"
+    Given I follow "New content"
     Then I should see "Choose the type of content"
  
   Scenario: list all content types
@@ -27,7 +27,7 @@ Feature: create content on cms
     When I follow "Folder"
     And I fill in "Title" with "My Folder"
     And I press "Save"
-    And I go to Joao Silva's cms
+    And I go to joaosilva's cms
     Then I should see "My Folder"
  
   Scenario: create a tiny_mce article
@@ -35,7 +35,7 @@ Feature: create content on cms
     When I follow "Text article with visual editor"
     And I fill in "Title" with "My tiny_mce article"
     And I press "Save"
-    And I go to Joao Silva's cms
+    And I go to joaosilva's cms
     Then I should see "My tiny_mce article"
  
   Scenario: create a textile article
@@ -43,7 +43,7 @@ Feature: create content on cms
     When I follow "Text article with Textile markup"
     And I fill in "Title" with "My textile article"
     And I press "Save"
-    And I go to Joao Silva's cms
+    And I go to joaosilva's cms
     Then I should see "My textile article"
  
   Scenario: create a Blog
@@ -51,7 +51,7 @@ Feature: create content on cms
     When I follow "Blog"
     And I fill in "Title" with "My blog"
     And I press "Save"
-    And I go to Joao Silva's cms
+    And I go to joaosilva's cms
     Then I should see "My blog"
  
   Scenario: create an event
@@ -59,7 +59,7 @@ Feature: create content on cms
     When I follow "Event"
     And I fill in "Title" with "My event"
     And I press "Save"
-    And I go to Joao Silva's cms
+    And I go to joaosilva's cms
     Then I should see "My event"
  
   Scenario: redirect to upload files if choose UploadedFile
@@ -9,7 +9,7 @@ Feature: organization custom fields
       | joaosilva | Joao Silva |
     And I am logged in as "joaosilva"
     And feature "enterprise_registration" is enabled on environment
-    And I go to the Control panel
+    And I go to joaosilva's control panel
  
   Scenario Outline: organization active fields are not displayed on creation
     Given the following <organization> fields are active fields
@@ -35,7 +35,7 @@ Feature: organization custom fields
       | name          | identifier    |
       | Organization  | organization  |
     And "Joao Silva" is admin of "Organization"
-    And I am on Organization's control panel
+    And I am on organization's control panel
     And I follow <information>
     Then I should see "Display name"
     Then I should see "Contact email"
@@ -70,7 +70,7 @@ Feature: organization custom fields
       | name          | identifier    | display_name | contact_email | city |
       | Organization  |  organization | organization | bla@bleee.com | city |
     And "Joao Silva" is admin of "Organization"
-    And I am on Organization's control panel
+    And I am on organization's control panel
     And I follow <information>
     And I fill in the following:
       | Display name  | |
@@ -23,36 +23,36 @@ Feature: plugins
  
   Scenario: a user must see the plugin\'s button in the control panel if the plugin is enabled
     Given plugin TestPlugin is enabled on environment
-    And I go to Joao Silva's control panel
+    And I go to joaosilva's control panel
     Then I should see "Test plugin button"
  
   Scenario: a user must see the plugin\'s tab in in the profile if the plugin is enabled
     Given plugin TestPlugin is enabled on environment
-    And I am on Joao Silva's profile
+    And I am on joaosilva's profile
     Then I should see "Test plugin tab"
  
   Scenario: a user must not see the plugin\'s button in the control panel if the plugin is disabled
     Given plugin TestPlugin is disabled on environment
-    And I go to Joao Silva's control panel
+    And I go to joaosilva's control panel
     Then I should not see "Test plugin button"
  
   Scenario: a user must not see the plugin\'s tab in in the profile if the plugin is disabled
     Given plugin TestPlugin is disabled on environment
-    And I am on Joao Silva's profile
+    And I am on joaosilva's profile
     Then I should not see "Test plugin tab"
  
   Scenario: an admin should be able to deactivate a plugin
     Given plugin TestPlugin is enabled on environment
     And I am logged in as admin
-    When I go to the Control panel
+    When I go to admin_user's control panel
     Then I should see "Test plugin button"
-    When I go to the profile
+    When I go to admin_user's profile
     Then I should see "Test plugin tab"
     And I go to the environment control panel
     And I follow "Plugins"
     And I uncheck "Test plugin"
     And I press "Save changes"
-    When I go to the Control panel
+    When I go to admin_user's control panel
     Then I should not see "Test plugin button"
-    When I go to the profile
+    When I go to admin_user's profile
     Then I should not see "Test plugin tab"
@@ -14,7 +14,7 @@ Feature: private profiles
  
   Scenario: joining a private community
     Given I am logged in as "joao"
-    When I go to Safernet's homepage
+    When I go to safernet's homepage
     Then I should see "members only"
     When I follow "Join"
     And "joao" is accepted on community "Safernet"
@@ -12,62 +12,68 @@ Feature: domain for profile
       | sample-community | Sample Community | localhost |
     And the following blocks
       | owner            | type              |
-      | sample-community | ProfileImageBlock |
-      | sample-community | ProfileInfoBlock  |
+      | joaosilva        | ProfileInfoBlock  |
     And the environment domain is "127.0.0.1"
+    And "Joao Silva" is environment admin
     And "Joao Silva" is admin of "Sample Community"
  
   @selenium
   Scenario: access profile control panel through profile blocks
     Given I am logged in as "joaosilva"
-    When I visit "/" and wait
-    And I follow "Control panel" within "div.profile-info-block" and wait
-    Then I should see "Sample Community" within "span.control-panel-title"
-    When I visit "/" and wait
-    And I follow "Control panel" within "div.profile-image-block" and wait
-    Then I should see "Sample Community" within "span.control-panel-title"
+    When I go to joaosilva's homepage
+    And I follow "Control panel" within ".profile-info-block"
+    Then I should see "Joao Silva" within "span.control-panel-title"
+    When I follow "Control panel" within ".profile-image-block"
+    Then I should see "Joao Silva" within "span.control-panel-title"
  
   @selenium
   Scenario: access user control panel
     Given I am logged in as "joaosilva"
-    When I visit "/" and wait
-    And I follow "joaosilva" and wait
+    When I go to the homepage
+    And I follow "joaosilva"
+    And I go to sample-community's homepage
     And I follow "Login"
     And I fill in "joaosilva" for "Username"
     And I fill in "123456" for "Password"
-    And I press "Log in" and wait
-    And I follow "Control panel" within "div#user" and wait
+    And I press "Log in"
+    And I follow "Control panel" within "div#user"
     Then I should see "Joao Silva" within "span.control-panel-title"
  
+  # Looking for page title is problematic on selenium since it considers the
+  # title to be invibible. Checkout some information about this:
+  #   * https://github.com/jnicklas/capybara/issues/863
+  #   * https://github.com/jnicklas/capybara/pull/953
   @selenium
   Scenario: access user page
     Given I am logged in as "joaosilva"
-    When I visit "/" and wait
-    And I follow "joaosilva" and wait
-    Then The page title should contain "Joao Silva"
+    When I go to the homepage
+    And I follow "joaosilva"
+    Then I should be on joaosilva's profile
+    And I should see "Joao Silva" within any "h1"
+    #And the page title should be "Joao Silva"
  
-  @selenium
   Scenario: access community by domain
-    When I go to the homepage
-    Then The page title should contain "Sample Community"
+    Given I go to the search communities page
+    When I follow "Sample Community" within ".search-profile-item"
+    Then the page title should be "Sample Community"
  
-  @selenium
+  # This test is not working because the community domain isn't at all different
+  # from the environment (localhost / 127.0.0.1)
+  @fixme
   Scenario: Go to profile homepage after clicking on home button on not found page
-    Given I am on the homepage
+    Given I am on sample-community's homepage
     When I go to /something-that-does-not-exist
     And I follow "Go to the home page"
     Then the page title should be "Sample Community - Colivre.net"
  
-  @selenium
   Scenario: Go to environment homepage after clicking on home button on not found page
     Given I am on the homepage
-    And I click on the logo
-    When I open /something-that-does-not-exist
+    When I go to /something-that-does-not-exist
     And I follow "Go to the home page"
-    Then the page title should be "Colivre.net"
+    Then I should be on the homepage
+    And the page title should be "Colivre.net"
  
   @selenium
   Scenario: Compose link to administration with environment domain
     Given I am logged in as "joaosilva"
-    When I visit "/" and wait
-    Then I should see "Administration" linking to "http://127.0.0.1/admin"
+    Then I should see "Administration" linking to "http://127.0.0.1.*/admin"
@@ -14,7 +14,7 @@ Feature: search inside a profile
       | joaosilva | whales and dolphins  | this is an article about whales and dolphins  |
  
   Scenario: search on profile
-    Given I go to Joao Silva's profile
+    Given I go to joaosilva's profile
     And I fill in "q" with "bees"
     And I press "Search"
     Then I should see "bees and butterflies" within ".main-block"
@@ -25,7 +25,7 @@ Feature: search inside a profile
       | owner     | name                | start_date |
       | joaosilva | Group meeting       | 2009-10-01 |
       | joaosilva | John Doe's birthday | 2009-09-01 |
-    When I go to Joao Silva's profile
+    When I go to joaosilva's profile
     And I fill in "q" with "birthday"
     And I press "Search"
     Then I should see "John Doe's birthday" within ".main-block"
@@ -35,7 +35,7 @@ Feature: search inside a profile
     Given the following blocks
       | owner     | type                |
       | joaosilva | ProfileSearchBlock  |
-    When I go to Joao Silva's profile
+    When I go to joaosilva's profile
     And I fill in "q" with "bees" within ".profile-search-block"
     And I press "Search"
     Then I should see "bees and butterflies" within ".main-block"
@@ -45,14 +45,14 @@ Feature: search inside a profile
       | owner     | name                | body                      | published |
       | joaosilva | published article   | this is a public article  | true      |
       | joaosilva | unpublished article | this is a private article | false     |
-    And I go to Joao Silva's profile
+    And I go to joaosilva's profile
     And I fill in "q" with "article"
     And I press "Search"
     Then I should see "public article" within ".main-block"
     And I should not see "private article" within ".main-block"
  
   Scenario: search on environment
-    Given I go to Joao Silva's profile
+    Given I go to joaosilva's profile
     And I fill in "q" with "bees"
     And I choose "General"
     And I press "Search"
@@ -20,48 +20,48 @@ Feature: publish article
   Scenario: publishing an article that doesn't exists in the community
     Given I am logged in as "joaosilva"
     And "Joao Silva" is a member of "Sample Community"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
-    And I go to Sample Community's sitemap
+    And I go to sample-community's sitemap
     When I follow "Sample Article"
     Then I should see "This is the first published article"
  
   Scenario: publishing an article with a different name
     Given I am logged in as "joaosilva"
     And "Joao Silva" is a member of "Sample Community"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I fill in "Title" with "Another name"
     And I press "Spread this"
-    When I go to Sample Community's sitemap
+    When I go to sample-community's sitemap
     Then I should see "Another name"
     And I should not see "Sample Article"
  
-  @selenium
+  @selenium @ignore-hidden-elements
   Scenario: getting an error message when publishing article with same name
     Given I am logged in as "joaosilva"
     And "Joao Silva" is a member of "Sample Community"
-    And I am on Joao Silva's control panel
-    And I follow "Manage Content" and wait
+    And I am on joaosilva's control panel
+    And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And I am not logged in
     And I am logged in as "mariasilva"
     And "Maria Silva" is a member of "Sample Community"
-    And I am on Maria Silva's control panel
+    And I am on mariasilva's control panel
     And I follow "Manage Content"
     And I follow "New content"
-    And I follow "Text article with Textile markup language" and wait
+    And I follow "Text article with Textile markup language"
     And I fill in the following:
       | Title | Sample Article |
       | Text | this is Maria's first published article |
-    And I press "Save" and wait
+    And I press "Save"
     And I follow "Spread"
     And I check "Sample Community"
     When I press "Spread this"
@@ -77,13 +77,13 @@ Feature: publish article
     And "Joao Silva" is a member of "Sample Community"
     And "Joao Silva" is a member of "Another Community1"
     And "Joao Silva" is a member of "Another Community2"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And I should not see "This article name is already in use in the following community(ies):"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
@@ -91,30 +91,30 @@ Feature: publish article
     And I check "Another Community2"
     When I press "Spread this"
     Then I should see "The title (article name) is already being used by another article, please use another title."
-    When I go to Another Community1's sitemap
+    When I go to another-community1's sitemap
     Then I should see "Sample Article"
-    When I go to Another Community2's sitemap
+    When I go to another-community2's sitemap
     Then I should see "Sample Article"
  
   Scenario: publishing articles with the same name in a moderated community
     Given I am logged in as "joaosilva"
     And "Joao Silva" is a member of "Sample Community"
     And "Joao Silva" is admin of "Sample Community"
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     And I follow "Community Info and settings"
     And I choose "profile_data_moderated_articles_true"
     And I press "Save"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     And I follow "Tasks"
     And I choose "Accept"
     And I press "Apply!"
@@ -126,17 +126,17 @@ Feature: publish article
   Scenario: ask to publish an article that was deleted before approval
     Given I am logged in as "joaosilva"
     And "Joao Silva" is admin of "Sample Community"
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     And I follow "Community Info and settings"
     And I choose "profile_data_moderated_articles_true"
     And I press "Save"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Manage Content"
     And I follow "Spread"
     And I check "Sample Community"
     And I press "Spread this"
     And "joaosilva" has no articles
-    And I am on Sample Community's control panel
+    And I am on sample-community's control panel
     When I follow "Tasks"
     Then I should see "The article was removed."
     And I press "Apply!"
@@ -9,7 +9,7 @@ Feature: register enterprise
       | joaosilva | Joao Silva | joaosilva@example.com  |
  
     And I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And feature "enterprise_registration" is enabled on environment
  
   Scenario: enterprise registration is disabled by admin
@@ -92,7 +92,7 @@ Feature: register enterprise
     And I press "Next"
     Then I should see "Enterprise registration completed"
     And I am logged in as admin
-    And I go to the Control panel
+    And I go to admin_user's control panel
     When I follow "Tasks" within ".control-panel"
     Then I should see "Joao Silva wants to create enterprise My Enterprise."
     And the first mail is to admin_user@example.com
@@ -100,10 +100,11 @@ Feature: register enterprise
     And I press "Apply!"
     Then the last mail is to joaosilva@example.com
     And I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     When I follow "Manage my groups"
     Then I should see "My Enterprise"
  
+  @selenium
   Scenario: a user register an enterprise successfully through the admin
             validator method and the admin rejects
     Given organization_approval_method is "admin" on environment
@@ -119,7 +120,7 @@ Feature: register enterprise
     And I press "Next"
     Then I should see "Enterprise registration completed"
     And I am logged in as admin
-    And I go to the Control panel
+    And I go to admin_user's control panel
     When I follow "Tasks" within ".control-panel"
     Then I should see "Joao Silva wants to create enterprise My Enterprise."
     And the first mail is to admin_user@example.com
@@ -128,7 +129,7 @@ Feature: register enterprise
     And I press "Apply!"
     Then the last mail is to joaosilva@example.com
     And I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     When I follow "Manage my groups"
     Then I should not see "My Enterprise"
  
@@ -156,15 +157,16 @@ Feature: register enterprise
     When I choose "Validator"
     And I press "Confirm"
     Then I should see "Enterprise registration completed"
-    And I am on Validator's control panel
+    And I am on validator's control panel
     When I follow "Tasks"
     Then I should see "Joao Silva wants to create enterprise My Enterprise."
     And I choose "Accept"
     And I press "Apply!"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     When I follow "Manage my groups"
     Then I should see "My Enterprise"
  
+  @selenium
   Scenario: a user register an enterprise successfully through the region
             validator method and the validator rejects
     Given organization_approval_method is "region" on environment
@@ -189,13 +191,13 @@ Feature: register enterprise
     When I choose "Validator"
     And I press "Confirm"
     Then I should see "Enterprise registration completed"
-    And I am on Validator's control panel
+    And I am on validator's control panel
     When I follow "Tasks"
     Then I should see "Joao Silva wants to create enterprise My Enterprise."
     And I choose "Reject"
     And I fill in "Rejection explanation" with "This enterprise has some irregularities."
     And I press "Apply"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     When I follow "Manage my groups"
     Then I should not see "My Enterprise"
  
@@ -9,7 +9,7 @@ Feature: search
  
   Scenario: show empty results in all enabled assets
     Given I go to the search page
-    And I fill in "query" with "Anything"
+    And I fill in "search-input" with "Anything"
     And I press "Search"
     Then I should see "People" within ".search-results-people"
     And I should see "None" within ".search-results-people"
@@ -30,7 +30,7 @@ Feature: search
       | joaosilva  | Joao Silva  |
       | josearaujo | Jose Araujo |
     When I go to the search page
-    And I fill in "query" with "Silva"
+    And I fill in "search-input" with "Silva"
     And I press "Search"
     Then I should see "Joao Silva" within ".common-profile-list-block"
     And I should not see "Jose Araujo"
@@ -51,7 +51,7 @@ Feature: search
       | joaosilva | article #8 |
       | joaosilva | article #9 |
     When I go to the search page
-    And I fill in "query" with "article"
+    And I fill in "search-input" with "article"
     And I press "Search"
     Then I should see "article #8" within ".search-results-articles"
     And I should not see "article #9" within ".search-results-articles"
@@ -65,7 +65,7 @@ Feature: search
       | boring-community | Boring community | semterrinha |
       | fancy-community  | Fancy community  | agrotox |
     And I go to the search page
-    And I fill in "query" with "fancy"
+    And I fill in "search-input" with "fancy"
     And I press "Search"
     Then I should see "Fancy community" within ".common-profile-list-block"
     And I should not see "Boring community"
@@ -76,7 +76,7 @@ Feature: search
       | shop1 | Shoes shop |
       | shop2 | Fruits shop |
     And I go to the search page
-    And I fill in "query" with "shoes"
+    And I fill in "search-input" with "shoes"
     And I press "Search"
     Then I should see "Shoes shop" within ".common-profile-list-block"
     And I should not see "Fruits shop"
@@ -90,7 +90,7 @@ Feature: search
       | joaosilva | bees and butterflies | this is an article about bees and butterflies |
       | joaosilva | whales and dolphins | this is an article about whales and dolphins |
     When I go to the search page
-    And I fill in "query" with "whales"
+    And I fill in "search-input" with "whales"
     And I press "Search"
     Then I should see "whales and dolphins" within "div.search-results-articles"
     And I should not see "bees and butterflies"
@@ -107,7 +107,7 @@ Feature: search
       | colivre-ent | development | social networks consultancy |
       | colivre-ent | development | wikis consultancy           |
     When I go to the search page
-    And I fill in "query" with "wikis"
+    And I fill in "search-input" with "wikis"
     And I press "Search"
     Then I should see "wikis consultancy" within "div.search-results-products"
     And I should not see "social networks consultancy"
@@ -121,7 +121,7 @@ Feature: search
       | nice-people | Group meeting | 2009-10-01 |
       | nice-people | John Doe's birthday | 2009-09-01 |
     When I go to the search page
-    And I fill in "query" with "birthday"
+    And I fill in "search-input" with "birthday"
     And I press "Search"
     Then I should see "John Doe's birthday" within "div.search-results-events"
     And I should not see "Group meeting"
@@ -140,7 +140,7 @@ Feature: search
       | owner       | name              | category    |
       | colivre_dev | Noosfero platform | Development |
     When I go to the search page
-    And I fill in "query" with "noosfero"
+    And I fill in "search-input" with "noosfero"
     And I press "Search"
     Then I should see "Colivre - Noosfero dev." within "div.search-results-enterprises"
     And I should see "Noosfero users" within "div.search-results-communities"
@@ -28,7 +28,7 @@ Feature: search communities
  
   Scenario: simple search for community
     When I go to the search communities page
-    And I fill in "query" with "noosfero"
+    And I fill in "search-input" with "noosfero"
     And I press "Search"
     Then I should see "Noosfero Community" within "#search-results"
     And I should see "Noosfero Community" within ".only-one-result-box"
@@ -42,7 +42,7 @@ Feature: search communities
       | identifier | name               | category       |
       | noos-comm  | Noosfero Community | software-livre |
     When I go to the search communities page
-    And I fill in "query" with "software livre"
+    And I fill in "search-input" with "software livre"
     And I press "Search"
     Then I should see "Noosfero" within "#search-results"
  
@@ -57,7 +57,7 @@ Feature: search communities
       | identifier | name            | category       |
       | linux      | Linux Community | software-livre |
     When I go to the search communities page
-    And I fill in "query" with "Linux"
+    And I fill in "search-input" with "Linux"
     And I press "Search"
     Then I should see "Temáticas" within "#facets-menu"
  
@@ -66,7 +66,7 @@ Feature: search communities
       | identifier | name                       |
       | luwac      | Linux Users Without a Clue |
     When I go to the search communities page
-    And I fill in "query" with "Linux Clue"
+    And I fill in "search-input" with "Linux Clue"
     And I press "Search"
     Then I should see "Linux Users Without a Clue" within "#search-results"
  
@@ -83,7 +83,7 @@ Feature: search communities
       | noos-dev   | Noosfero Developers | software-livre |
       | facebook   | Facebook Developers | big-brother    |
     When I go to the search communities page
-    And I fill in "query" with "Developers"
+    And I fill in "search-input" with "Developers"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
     Then I should see "Noosfero Developers" within "#search-results"
@@ -106,10 +106,10 @@ Feature: search communities
       | rails-dev  | Rails Developers    | other-category |
       | rails-usr  | Rails Users         | software-livre |
     When I go to the search communities page
-    And I fill in "query" with "Developers"
+    And I fill in "search-input" with "Developers"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
-    And I fill in "query" with "Rails"
+    And I fill in "search-input" with "Rails"
     And I press "Search"
     Then I should see "Rails Users" within "#search-results"
     And I should not see "Rails Developers"
@@ -26,7 +26,7 @@ Feature: search contents
     Then I should see "whales and dolphins" within ".search-text-article-item"
     And I should see "whales and dolphins" within ".only-one-result-box"
     And I should not see "bees and butterflies"
-    And I should see content inside ".icon-content-textile-article"
+    And The page should contain ".icon-content-textile-article"
     When I follow "whales and dolphins"
     Then I should be on article "whales and dolphins"
  
@@ -155,19 +155,19 @@ Feature: search contents
  
   Scenario: link to author on search results
     When I go to the search articles page
-    And I fill in "query" with "whales"
+    And I fill in "search-input" with "whales"
     And I press "Search"
     Then I should see "Author" within ".search-article-author"
     Then I should see "Joao Silva" within ".search-article-author-name"
     When I follow "Joao Silva"
-    Then I should be on Joao Silva's profile
+    Then I should be on joaosilva's profile
  
   Scenario: show clean description excerpt on search results
     Given the following articles
       | owner     | name        | body |
       | joaosilva | Herreninsel | The island    <b>Herreninsel</b>,    with an area of 238 hectares, is the biggest of the three main islands of the Chiemsee, a lake in the state of Bavaria, Germany. Together with the islands of Fraueninsel and Krautinsel it forms the municipality of Chiemsee. |
     When I go to the search articles page
-    And I fill in "query" with "island"
+    And I fill in "search-input" with "island"
     And I press "Search"
     Then I should see "Description" within ".search-article-description"
     And I should see "The island Herreninsel, with" within ".search-article-description"
@@ -178,7 +178,7 @@ Feature: search contents
       | owner     | name        | body |
       | joaosilva | Herreninsel |      |
     When I go to the search articles page
-    And I fill in "query" with "Herreninsel"
+    And I fill in "search-input" with "Herreninsel"
     And I press "Search"
     Then I should see "None" within ".search-article-description"
  
@@ -188,7 +188,7 @@ Feature: search contents
       | bees and butterflies | Hymenoptera |
       | bees and butterflies | Lepidoptera |
     When I go to the search articles page
-    And I fill in "query" with "bees"
+    And I fill in "search-input" with "bees"
     And I press "Search"
     Then I should see "Tags" within ".search-article-tags"
     And I should see "Hymenoptera" within ".search-article-tags"
@@ -198,7 +198,7 @@ Feature: search contents
  
   Scenario: show empty tags in search results
     When I go to the search articles page
-    And I fill in "query" with "dolphins"
+    And I fill in "search-input" with "dolphins"
     And I press "Search"
     Then I should see "None" within ".search-article-tags"
  
@@ -210,14 +210,14 @@ Feature: search contents
       | owner     | name           | body                       | category       |
       | joaosilva | Sergei Sorokin | Retired ice hockey player  | soviet |
     When I go to the search articles page
-    And I fill in "query" with "hockey"
+    And I fill in "search-input" with "hockey"
     And I press "Search"
     Then I should see "Categories" within ".search-article-categories"
     And I should see "Soviet" within ".search-article-category"
  
   Scenario: show empty categories on search results
     When I go to the search articles page
-    And I fill in "query" with "whales"
+    And I fill in "search-input" with "whales"
     And I press "Search"
     Then I should see "whales and dolphins"
     And I should see "None" within ".search-article-categories-container"
@@ -243,7 +243,7 @@ Feature: search contents
       | owner     | name           | body                    | category       |
       | joaosilva | using noosfero | noosfero is a great CMS | software-livre |
     When I go to the search articles page
-    And I fill in "query" with "Software"
+    And I fill in "search-input" with "Software"
     And I press "Search"
     Then I should see "using noosfero" within "#search-results"
     And I should not see "bees and butterflies"
@@ -255,7 +255,7 @@ Feature: search contents
       | joaosilva | JSilva blog |
     When I search contents for "JSilva"
     Then I should see "JSilva blog" within ".search-result-title"
-    And I should see content inside ".icon-content-blog"
+    And The page should contain ".icon-content-blog"
  
   Scenario: show and link last posts on blog search results
     Given the following blogs
@@ -286,7 +286,7 @@ Feature: search contents
  
   Scenario: see default facets when searching
     When I go to the search articles page
-    And I fill in "query" with "bees"
+    And I fill in "search-input" with "bees"
     And I press "Search"
     Then I should see "Type" within "#facets-menu"
     And I should see "Published date" within "#facets-menu"
@@ -295,7 +295,7 @@ Feature: search contents
  
   Scenario: find enterprises without exact query
     When I go to the search articles page
-    And I fill in "query" with "article bees"
+    And I fill in "search-input" with "article bees"
     And I press "Search"
     Then I should see "bees and butterflies" within "#search-results"
  
@@ -309,7 +309,7 @@ Feature: search contents
       | joaosilva | noosfero and debian | this is an article about noosfero and debian | software-livre |
       | joaosilva | facebook and 1984 | this is an article about facebook and 1984 | big-brother |
     When I go to the search articles page
-    And I fill in "query" with "this is an article"
+    And I fill in "search-input" with "this is an article"
     And I press "Search"
     #  Then show me the page
     And I follow "Software Livre" within "#facets-menu"
@@ -329,10 +329,10 @@ Feature: search contents
       | joaosilva | facebook and 1984 | this is an article about facebook and 1984 | big-brother |
       | joaosilva | facebook defense | facebook is not so bad | software-livre |
     When I go to the search articles page
-    And I fill in "query" with "this is an article"
+    And I fill in "search-input" with "this is an article"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
-    And I fill in "query" with "facebook"
+    And I fill in "search-input" with "facebook"
     And I press "Search"
     Then I should see "facebook defense" within "#search-results"
     And I should not see "1984"
@@ -14,6 +14,7 @@ Feature: search enterprises
       | Temáticas |
  
   Scenario: show recent enterprises on index
+    Given there are no pending jobs
     When I go to the search enterprises page
     Then I should see "Shoes shop" within "#search-results"
     And I should see Shoes shop's profile image
@@ -26,7 +27,7 @@ Feature: search enterprises
  
   Scenario: simple search for enterprise
     When I go to the search enterprises page
-    And I fill in "query" with "shoes"
+    And I fill in "search-input" with "shoes"
     And I press "Search"
     Then I should see "Shoes shop" within ".only-one-result-box"
     And I should see Shoes shop's profile image
@@ -36,7 +37,7 @@ Feature: search enterprises
   Scenario: link to enterprise homepage on search results
     Given I search enterprises for "shoes"
     When I follow "Shoes shop"
-    Then I should be on Shoes shop's profile
+    Then I should be on shop1's profile
  
   Scenario: show clean enterprise homepage on search results
     Given the following articles
@@ -56,13 +57,13 @@ Feature: search enterprises
  
   Scenario: see default facets when searching
     When I go to the search enterprises page
-    And I fill in "query" with "shoes"
+    And I fill in "search-input" with "shoes"
     And I press "Search"
     Then I should see "City" within "#facets-menu"
  
   Scenario: see category facets when searching
     When I go to the search enterprises page
-    And I fill in "query" with "shoes"
+    And I fill in "search-input" with "shoes"
     And I press "Search"
     Then I should see "Temáticas" within "#facets-menu"
  
@@ -74,7 +75,7 @@ Feature: search enterprises
       | identifier | name          | region           |
       | art-pp     | Artesanato PP | Pres. Prudente |
     When I go to the search enterprises page
-    And I fill in "query" with "Artesanato"
+    And I fill in "search-input" with "Artesanato"
     And I press "Search"
     Then I should see "Pres. Prudente" within "#facet-menu-f_region"
     And I should see ", SP" within "#facet-menu-f_region"
@@ -89,7 +90,7 @@ Feature: search enterprises
       | identifier | name          | region         |
       | art-pp     | Artesanato PP | Pres. Prudente |
     When I go to the search enterprises page
-    And I fill in "query" with "Prudente"
+    And I fill in "search-input" with "Prudente"
     And I press "Search"
     Then I should see "Artesanato PP" within "#search-results"
  
@@ -101,7 +102,7 @@ Feature: search enterprises
       | identifier | name     | category       |
       | noosfero   | Noosfero | software-livre |
     When I go to the search enterprises page
-    And I fill in "query" with "software"
+    And I fill in "search-input" with "software"
     And I press "Search"
     Then I should see "Noosfero" within "#search-results"
     And I should see "Software Livre" within ".search-enterprise-category"
@@ -123,7 +124,7 @@ Feature: search enterprises
       | identifier | name                            |
       | noosfero   | Noosfero Developers Association |
     When I go to the search enterprises page
-    And I fill in "query" with "Noosfero Association"
+    And I fill in "search-input" with "Noosfero Association"
     And I press "Search"
     Then I should see "Noosfero Developers Association" within "#search-results"
  
@@ -136,7 +137,7 @@ Feature: search enterprises
       | noosfero   | Noosfero Developers | software-livre |
       | facebook   | Facebook Developers |                |
     When I go to the search enterprises page
-    And I fill in "query" with "Developers"
+    And I fill in "search-input" with "Developers"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
     Then I should see "Noosfero Developers" within "#search-results"
@@ -155,10 +156,10 @@ Feature: search enterprises
       | rails-dev  | Rails Developers    |                |
       | rails-usr  | Rails Users         | software-livre |
     When I go to the search enterprises page
-    And I fill in "query" with "Developers"
+    And I fill in "search-input" with "Developers"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
-    And I fill in "query" with "Rails"
+    And I fill in "search-input" with "Rails"
     And I press "Search"
     Then I should see "Rails Users" within "#search-results"
     And I should not see "Rails Developers"
@@ -17,7 +17,7 @@ Feature: search people
  
   Scenario: simple search for person
     When I go to the search people page
-    And I fill in "query" with "Silva"
+    And I fill in "search-input" with "Silva"
     And I press "Search"
     Then I should see "Joao Silva" within "#search-results"
     And I should see "Joao Silva" within ".only-one-result-box"
@@ -32,7 +32,7 @@ Feature: search people
       | name      |
       | Temáticas |
     When I go to the search people page
-    And I fill in "query" with "joao"
+    And I fill in "search-input" with "joao"
     And I press "Search"
     Then I should see "Temáticas" within "#facets-menu"
  
@@ -44,7 +44,7 @@ Feature: search people
       | login | name           | category       |
       | linus | Linus Torvalds | software-livre |
     When I go to the search people page
-    And I fill in "query" with "software livre"
+    And I fill in "search-input" with "software livre"
     And I press "Search"
     Then I should see "Linus Torvalds" within "#search-results"
     And I should not see "Joao Silva"
@@ -55,7 +55,7 @@ Feature: search people
       | login  | name                             |
       | jsilva | Joao Adalberto de Oliveira Silva |
     When I go to the search people page
-    And I fill in "query" with "Adalberto Silva"
+    And I fill in "search-input" with "Adalberto Silva"
     And I press "Search"
     Then I should see "Joao Adalberto de Oliveira Silva" within "#search-results"
  
@@ -71,7 +71,7 @@ Feature: search people
       | linus | Linus Torvalds | software-livre |
       | other | Other Linus    |                |
     When I go to the search people page
-    And I fill in "query" with "Linus"
+    And I fill in "search-input" with "Linus"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
     Then I should see "Linus Torvalds" within "#search-results"
@@ -93,10 +93,10 @@ Feature: search people
       | rilin | Richard Linus    |                |
       | stall | Richard Stallman | software-livre |
     When I go to the search people page
-    And I fill in "query" with "Linus"
+    And I fill in "search-input" with "Linus"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
-    And I fill in "query" with "Richard"
+    And I fill in "search-input" with "Richard"
     And I press "Search"
     Then I should see "Richard Stallman" within "#search-results"
     And I should not see "Richard Linus"
@@ -21,14 +21,18 @@ Feature: search products
     When I go to the search products page
     Then I should see "wikis consultancy" within "#search-results"
     And I should see "social networks consultancy" within "#search-results"
-    And I should not see content inside "div.pagination"
-    And I should not see content inside "#facets-menu"
+
+  Scenario: not show pagination and facets on recent products
+    When I go to the search products page
+    Then The page should not contain "div.pagination"
+    And The page should not contain "#facets-menu"
  
   Scenario: show empty search results
     When I search products for "something unrelated"
     Then I should see "None" within ".search-results-type-empty"
  
   Scenario: simple search for product
+    Given there are no pending jobs
     When I search products for "wikis"
     Then I should see "wikis consultancy" within "#search-results"
     And I should see "wikis consultancy" within ".only-one-result-box"
@@ -38,7 +42,7 @@ Feature: search products
  
   Scenario: see default facets when searching
     When I go to the search products page
-    And I fill in "query" with "wikis"
+    And I fill in "search-input" with "wikis"
     And I press "Search"
     Then I should see "Related products" within "#facets-menu"
     Then I should see "City" within "#facets-menu"
@@ -49,7 +53,7 @@ Feature: search products
       | product           | category    | solidary |
       | wikis consultancy | development | true     |
     When I go to the search products page
-    And I fill in "query" with "wikis"
+    And I fill in "search-input" with "wikis"
     And I press "Search"
     Then I should see "100%" within "div.search-product-ecosol-percentage-icon-100"
  
@@ -59,7 +63,7 @@ Feature: search products
       | wikis consultancy | development | true     |
       | wikis consultancy | development | false    |
     When I go to the search products page
-    And I fill in "query" with "wikis"
+    And I fill in "search-input" with "wikis"
     And I press "Search"
     Then I should see "50%" within "div.search-product-ecosol-percentage-icon-50"
  
@@ -71,7 +75,7 @@ Feature: search products
       | wikis consultancy | development | true     |
       | wikis consultancy | development | false    |
     When I go to the search products page
-    And I fill in "query" with "wikis"
+    And I fill in "search-input" with "wikis"
     And I press "Search"
     Then I should see "75%" within "div.search-product-ecosol-percentage-icon-75"
  
@@ -83,7 +87,7 @@ Feature: search products
       | wikis consultancy | development | false    |
       | wikis consultancy | development | false    |
     When I go to the search products page
-    And I fill in "query" with "wikis"
+    And I fill in "search-input" with "wikis"
     And I press "Search"
     Then I should see "25%" within "div.search-product-ecosol-percentage-icon-25"
  
@@ -92,7 +96,7 @@ Feature: search products
       | owner       | category    | name     | price | img              |
       | colivre-ent | development | noosfero | 12.34 | noosfero-network |
     When I go to the search products page
-    And I fill in "query" with "noosfero"
+    And I fill in "search-input" with "noosfero"
     And I press "Search"
     Then I should not see "No image"
     And I should see "Zoom in" within "a.zoomify-image"
@@ -105,7 +109,7 @@ Feature: search products
       | owner       | name     | category       |
       | colivre-ent | Noosfero | software-livre |
     When I go to the search products page
-    And I fill in "query" with "software livre"
+    And I fill in "search-input" with "software livre"
     And I press "Search"
     Then I should see "Noosfero" within "#search-results"
     And I should not see "wikis consultancy"
@@ -125,7 +129,7 @@ Feature: search products
       | owner  | name            | category  |
       | art-pp | Arte em Madeira | solidaria |
     When I go to the search products page
-    And I fill in "query" with "Madeira"
+    And I fill in "search-input" with "Madeira"
     And I press "Search"
     Then I should see "Pres. Prudente" within "#facet-menu-f_region"
     And I should see ", SP" within "#facet-menu-f_region"
@@ -145,7 +149,7 @@ Feature: search products
       | owner  | name            | category  |
       | art-pp | Arte em Madeira | solidaria |
     When I go to the search products page
-    And I fill in "query" with "Prudente"
+    And I fill in "search-input" with "Prudente"
     And I press "Search"
     Then I should see "Arte em Madeira" within "#search-results"
  
@@ -157,7 +161,7 @@ Feature: search products
       | owner       | name                             | category       |
       | colivre-ent | Noosfero Social Network Platform | software-livre |
     When I go to the search products page
-    And I fill in "query" with "Noosfero Network"
+    And I fill in "search-input" with "Noosfero Network"
     And I press "Search"
     Then I should see "Noosfero Social Network Platform" within "#search-results"
  
@@ -177,7 +181,7 @@ Feature: search products
       | colivre-ent | Noosfero Network | software-livre |
       | fb          | Facebook Network | big-brother    |
     When I go to the search products page
-    And I fill in "query" with "Network"
+    And I fill in "search-input" with "Network"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
     Then I should see "Noosfero Network" within "#search-results"
@@ -206,10 +210,10 @@ Feature: search products
       | other       | Other open         | software-livre |
       | other       | Other closed       | big-brother    |
     When I go to the search products page
-    And I fill in "query" with "Network"
+    And I fill in "search-input" with "Network"
     And I press "Search"
     And I follow "Software Livre" within "#facets-menu"
-    And I fill in "query" with "Other"
+    And I fill in "search-input" with "Other"
     And I press "Search"
     Then I should see "Other open" within "#search-results"
     And I should not see "Other closed"
@@ -217,4 +221,4 @@ Feature: search products
   Scenario: don't search when products are disabled in environment
     Given feature "disable_asset_products" is enabled on environment
     When I go to the search products page
-    Then I should not see content inside "#search-results"
+    Then I should see "There is no such page" within "#not-found"
@@ -17,37 +17,29 @@ Feature: send emails to environment members users
  
   Scenario: Send e-mail to members
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
-    And I follow "Send e-mail to users"
+    And I go to /admin/users/send_mail
     And I fill in "Subject" with "Hello, user!"
-    And I fill in "body" with "We have some news"
+    And I fill in "Body" with "We have some news"
     When I press "Send"
     Then I should be on /admin/users
  
   Scenario: Not send e-mail to members if subject is blank
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
-    And I follow "Send e-mail to users"
-    And I fill in "body" with "We have some news"
+    And I go to /admin/users/send_mail
+    And I fill in "Body" with "We have some news"
     When I press "Send"
     Then I should be on /admin/users/send_mail
  
   Scenario: Not send e-mail to members if body is blank
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
-    And I follow "Send e-mail to users"
+    And I go to /admin/users/send_mail
     And I fill in "Subject" with "Hello, user!"
     When I press "Send"
     Then I should be on /admin/users/send_mail
  
   Scenario: Cancel creation of mailing
     Given I am logged in as admin
-    When I follow "Administration"
-    And I follow "Users"
-    And I follow "Send e-mail to users"
+    And I go to /admin/users/send_mail
     Then I should be on /admin/users/send_mail
     When I follow "Cancel e-mail"
     Then I should be on /admin/users
@@ -33,7 +33,7 @@ Feature: send emails to organization members
     And I go to Sample Community's members management
     And I follow "Send e-mail to members"
     And I fill in "Subject" with "Hello, member!"
-    And I fill in "body" with "We have some news"
+    And I fill in "Body" with "We have some news"
     When I press "Send"
     Then I should be on Sample Community's members management
  
@@ -41,7 +41,7 @@ Feature: send emails to organization members
     Given I am logged in as "joaosilva"
     And I go to Sample Community's members management
     And I follow "Send e-mail to members"
-    And I fill in "body" with "We have some news"
+    And I fill in "Body" with "We have some news"
     When I press "Send"
     Then I should be on /profile/sample-community/send_mail
  
@@ -68,19 +68,19 @@ Feature: send emails to organization members
   Scenario: Show button "Send e-Mail to members" of community to an moderator
     Given I am logged in as "jose"
     When I go to Sample Community's members page
-    Then I should see "Send e-mail to members" link
+    Then I should see "Send e-mail to members"
  
   Scenario: Not show button "Send e-Mail to members" if user has no right permission
     Given I am logged in as "manoel"
     When I go to Sample Community's members page
-    Then I should not see "Send e-mail to members" link
+    Then I should not see "Send e-mail to members"
  
   Scenario: Redirect back to profile members page after send mail
     Given I am logged in as "jose"
     When I go to Sample Community's members page
     And I follow "Send e-mail to members"
     And I fill in "Subject" with "Hello, member!"
-    And I fill in "body" with "We have some news"
+    And I fill in "Body" with "We have some news"
     When I press "Send"
     Then I should be on Sample Community's members page
  
@@ -4,6 +4,7 @@ Feature: session and cookies handling
   I want Noosfero to manage well it usage of sessions and cookies
   So that we can use HTTP caching effectively
  
+  @fixme
   Scenario: home page, logged in
     Given the following users
       | login     |
@@ -16,10 +17,12 @@ Feature: session and cookies handling
     When I go to the homepage
     Then there must be no cookies
  
+  @fixme
   Scenario: user_data, not logged in
     When I make a AJAX request to the user data path
     Then there must be no cookies
  
+  @fixme
   Scenario: user_data, logged in
     Given I am logged in as admin
     When I make a AJAX request to the user data path
@@ -16,13 +16,12 @@ Feature: signup
       | Full name             | José da Silva         |
     And wait for the captcha signup time
     And I press "Create my account"
-    Then I should not be logged in
-    And I should receive an e-mail on josesilva@example.com
+    Then I should receive an e-mail on josesilva@example.com
     When I go to login page
     And I fill in "Username" with "josesilva"
     And I fill in "Password" with "secret"
     And I press "Log in"
-    Then I should not be logged in
+    Then I should not be logged in as "josesilva"
     When José da Silva's account is activated
     And I go to login page
     And I fill in "Username" with "josesilva"
@@ -36,7 +35,7 @@ Feature: signup
       | joaosilva | Joao Silva |
     Given I am logged in as "joaosilva"
     And I go to signup page
-    Then I should be on Joao Silva's control panel
+    Then I should be on joaosilva's control panel
  
   @selenium
   Scenario: user cannot register without a name
@@ -56,7 +55,7 @@ Feature: signup
       | login | name |
       | joaosilva | Joao Silva |
     Given I am logged in as "joaosilva"
-    And I am on Joao Silva's control panel
+    And I am on joaosilva's control panel
     And I follow "Edit Profile"
     And I fill in "Name" with ""
     When I press "Save"
@@ -0,0 +1,4 @@
+When /^I follow "([^"]*)" and wait while it hides$/ do |link|
+  click_link link
+  wait_until{ page.should have_no_css('a', :text => link, :visible => true) }
+end
@@ -0,0 +1,3 @@
+When /^I select window "([^\"]*)"$/ do |selector|
+  page.driver.browser.switch_to.window(selector)
+end
 include DatesHelper
  
 Given /^I create community "(.+)"$/ do |community|
-  Given 'I go to the Control panel'
+  Given %{I go to admin_user's control panel}
   click_link('Manage my groups')
   click_link('Create a new community')
   fill_in("Name", :with => community)
@@ -10,7 +10,7 @@ end
  
 Given /^I approve community "(.+)"$/ do |community|
    task = CreateCommunity.all.select {|c| c.name == community}.first
-   Given 'I go to the Control panel'
+   Given %{I go to admin_user's control panel}
    click_link('Process requests')
    choose("decision-finish-#{task.id}")
    click_button('Apply!')
@@ -18,7 +18,7 @@ end
  
 Given /^I reject community "(.+)"$/ do |community|
    task = CreateCommunity.all.select {|c| c.name == community}.first
-   Given 'I go to the Control panel'
+   Given %{I go to admin_user's control panel}
    click_link('Process requests')
    choose("decision-cancel-#{task.id}")
    click_button('Apply!')
@@ -27,5 +27,5 @@ end
 Then /^I should see "([^\"]*)"'s creation date$/ do |community|
   com = Community.find_by_name community
   text = "Created at: #{show_date(com.created_at)}"
-  response.should contain(text)
+  has_content?(text)
 end
@@ -0,0 +1,46 @@
+Then /^"([^"]*)" should not be visible within "([^"]*)"$/ do |text, selector|
+  if page.has_content?(text)
+    page.should have_no_css(selector, :text => text, :visible => false)
+  end
+end
+
+Then /^"([^"]*)" should be visible within "([^"]*)"$/ do |text, selector|
+  if page.has_content?(text)
+    page.should have_css(selector, :text => text, :visible => false)
+  end
+end
+
+Then /^I should see "([^"]*)" link$/ do |text|
+  page.should have_css('a', :text => text)
+end
+
+Then /^I should not see "([^"]*)" link$/ do |text|
+  page.should have_no_css('a', :text => text)
+end
+
+When /^I should see "([^\"]+)" linking to "([^\"]+)"$/ do |text, href|
+  page.should have_xpath("//a", :href => /#{href}/)
+end
+
+Then /^the "([^"]*)" button should be disabled$/ do |selector|
+  field = find(selector)
+  field['disabled'].should be_true
+end
+
+Then /^the "([^"]*)" button should be enabled$/ do |selector|
+  field = find(selector)
+  field['disabled'].should_not be_true
+end
+
+When /^I reload and wait for the page$/ do
+  raise "Why why need this? Remove!"
+  visit page.driver.browser.current_url
+end
+
+When /^I leave the "([^\"]+)" field$/ do |selector|
+  page.execute_script "jQuery('#{selector}').trigger('blur')"
+end
+
+When /^I confirm the browser dialog$/ do
+  page.driver.browser.switch_to.alert.accept
+end
@@ -1,48 +0,0 @@
-When /^I should see "([^\"]+)" link$/ do |text|
-  if response.class.to_s == 'Webrat::SeleniumResponse'
-    response.selenium.is_element_present("css=a:contains('#{text}')")
-  else
-    response.should have_selector("a:contains('#{text}')")
-  end
-end
-
-When /^I should not see "([^\"]+)" link$/ do |text|
-  response.should_not have_selector("a:contains('#{text}')")
-end
-
-When /^I should see "([^\"]+)" linking to "([^\"]+)"$/ do |text, href|
-  response.should have_selector("a:contains('#{text}')")
-  response.should have_selector("a[href='#{href}']")
-end
-
-Then /^I should be exactly on (.+)$/ do |page_name|
-  URI.parse(current_url).request_uri.should == path_to(page_name)
-end
-
-Then /^I should be moved to anchor "([^\"]+)"$/ do |anchor|
-  URI.parse(current_url).fragment.should == anchor
-end
-
-When /^I select "([^\"]*)"$/ do |value|
-  select(value)
-end
-
-When /^I fill in the following within "([^\"]*)":$/ do |parent, fields|
-  fields.rows_hash.each do |name, value|
-    When %{I fill in "#{name}" with "#{value}" within "#{parent}"}
-  end
-end
-
-When /^I fill in "([^\"]*)" with "([^\"]*)" within "([^\"]*)"$/ do |field, value, parent|
-  within(parent) do |content|
-    content.fill_in(field, :with => value)
-  end
-end
-
-When /^I should see content inside "([^\"]+)"$/ do |selector|
-  response.should have_selector(selector)
-end
-
-When /^I should not see content inside "([^\"]+)"$/ do |selector|
-  response.should_not have_selector(selector)
-end
 Then /^the response should be valid for (.+) minutes$/ do |n|
-  response.headers['Cache-Control'].split(/,\s*/).should include("max-age=#{n.to_i * 60}")
+  page.response_headers['Cache-Control'].split(/,\s*/).should include("max-age=#{n.to_i * 60}")
 end
  
 Then /^the cache should be public/ do
-  response.headers['Cache-Control'].split(/,\s*/).should include("public")
+  page.response_headers['Cache-Control'].split(/,\s*/).should include("public")
 end
  
 Then /^there must be no cache at all$/ do
-  parts = response.headers['Cache-Control'].split(/,\s*/)
+  parts = page.response_headers['Cache-Control'].split(/,\s*/)
   parts.should include('must-revalidate')
   parts.should include('max-age=0')
 end
+# -*- coding: utf-8 -*-
 def language_to_code(name)
   {
     'Brazilian Portuguese' => 'pt-br',
@@ -35,11 +36,11 @@ Given /^a user accessed in (.*) before$/ do |lang|
 end
  
 Given /^my browser prefers (.*)$/ do |lang|
-  header 'Accept-Language', language_to_code(lang)
+  page.driver.header 'Accept-Language', language_to_code(lang)
 end
  
 Then /^the site should be in (.*)$/ do |lang|
-  response.should have_selector("html[lang=#{language_to_code(lang)}]")
-  response.body.should match(/<strong>#{native_name(lang)}<\/strong>/)
+  page.should have_selector("html[lang=#{language_to_code(lang)}]")
+  page.body.should match(/<strong>#{native_name(lang)}<\/strong>/)
 end
  
@@ -4,22 +4,17 @@ Given /^I invite email &quot;(.+)&quot; to join community &quot;(.+)&quot;$/ do |email, community|
   click_link('Invite your friends to join 26 Bsslines')
   click_button('Next')
   fill_in('manual_import_addresses', :with => "#{email}")
+  click_link('Personalize invitation mail')
   fill_in('mail_template', :with => 'Follow this link <url>')
   click_button("Invite my friends!")
 end
  
 Given /^I invite email "(.+)" to be my friend$/ do |email|
-  Given "I go to the Control panel"
   click_link('Manage friends')
   click_link('Invite people from my e-mail contacts')
   click_button('Next')
   fill_in('manual_import_addresses', :with => "#{email}")
+  click_link('Personalize invitation mail')
   fill_in('mail_template', :with => 'Follow this link <url>')
   click_button("Invite my friends!")
 end
-
-Given /^there are no pending jobs$/ do
-  silence_stream(STDOUT) do
-    Delayed::Worker.new.work_off
-  end
-end
-def selenium_driver?
-  self.class.to_s == 'Webrat::SeleniumSession'
-end
-
 Given /^the following users?$/ do |table|
   # table is a Cucumber::Ast::Table
   table.hashes.each do |item|
@@ -118,7 +114,7 @@ Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded f
     parent = item.delete("parent")
     owner = Profile[owner_identifier]
     home = item.delete("homepage")
-    language = item.delete("lang")
+    language = item.delete("language")
     category = item.delete("category")
     filename = item.delete("filename")
     translation_of_id = nil
@@ -133,24 +129,24 @@ Given /^the following (articles|events|blogs|folders|forums|galleries|uploaded f
       :profile => owner,
       :language => language,
       :translation_of_id => translation_of_id)
-      if !filename.blank?
-        item.merge!(:uploaded_data => fixture_file_upload("/files/#{filename}", 'binary/octet-stream'))
-      end
-      result = klass.new(item)
-      if !parent.blank?
-        result.parent = Article.find_by_name(parent)
-      end
-      if category
-        cat = Category.find_by_slug category
-        if cat
-          result.add_category(cat)
-        end
-      end
-      result.save!
-      if home == 'true'
-        owner.home_page = result
-        owner.save!
+    if !filename.blank?
+      item.merge!(:uploaded_data => fixture_file_upload("/files/#{filename}", 'binary/octet-stream'))
+    end
+    result = klass.new(item)
+    if !parent.blank?
+      result.parent = Article.find_by_name(parent)
+    end
+    if category
+      cat = Category.find_by_slug category
+      if cat
+        result.add_category(cat)
       end
+    end
+    result.save!
+    if home == 'true'
+      owner.home_page = result
+      owner.save!
+    end
   end
 end
  
@@ -289,17 +285,25 @@ Given /^the following price details?$/ do |table|
 end
  
 Given /^I am logged in as "(.+)"$/ do |username|
-  visit('/account/logout')
-  visit('/account/login')
-  fill_in("Username", :with => username)
-  fill_in("Password", :with => '123456')
-  click_button("Log in")
-  # FIXME selenium do not wait page load sometimes
-  if selenium_driver?
-    selenium.wait_for_page
-  end
-  Then "I should be logged in as \"#{username}\""
-  @current_user = username
+  Given %{I go to logout page}
+    And %{I go to login page}
+    And %{I fill in "Username" with "#{username}"}
+    And %{I fill in "Password" with "123456"}
+   When %{I press "Log in"}
+    # FIXME:
+    # deveria apenas verificar que esta no myprofile do usuario
+    # nao conseguir fazer funcionar sem essa reduntancia no capybara
+    # acho que e algum problema com o http_referer
+    # olhar account_controller#store_location
+    And %{I go to #{username}'s control panel}
+   Then %{I should be on #{username}'s control panel}
+end
+
+Given /^"([^"]*)" is environment admin$/ do |person|
+  user = Profile.find_by_name(person)
+  e = Environment.default
+
+  e.add_admin(user)
 end
  
 Given /^I am logged in as admin$/ do
@@ -312,10 +316,6 @@ Given /^I am logged in as admin$/ do
   fill_in("Username", :with => user.login)
   fill_in("Password", :with => '123456')
   click_button("Log in")
-  # FIXME selenium do not wait page load sometimes
-  if selenium_driver?
-    selenium.wait_for_page
-  end
 end
  
 Given /^I am not logged in$/ do
@@ -421,12 +421,16 @@ Given /^enterprise &quot;([^\&quot;]*)&quot; is disabled$/ do |enterprise_name|
   enterprise.save
 end
  
-Then /^The page title should contain "(.*)"$/ do |text|
-  if response.class.to_s == 'Webrat::SeleniumResponse'
-    response.selenium.text('css=title').should include(text)
-  else
-    response.should have_selector("title:contains('#{text}')")
-  end
+Then /^the page title should be "(.*)"$/ do |text|
+  Then %{I should see "#{text}" within "title"}
+end
+
+Then /^The page should contain "(.*)"$/ do |selector|
+  page.should have_css("#{selector}")
+end
+
+Then /^The page should not contain "(.*)"$/ do |selector|
+  page.should have_no_css("#{selector}")
 end
  
 Given /^the mailbox is empty$/ do
@@ -458,12 +462,14 @@ Given /^the following environment configuration$/ do |table|
   env.save
 end
  
-Then /^I should be logged in as "(.+)"$/ do |login|
-  User.find(session[:user]).login.should == login
+Then /^I should be logged in as "(.+)"$/ do |username|
+   When %{I go to #{username}'s control panel}
+   Then %{I should be on #{username}'s control panel}
 end
  
-Then /^I should not be logged in$/ do
-  session[:user].nil?
+Then /^I should not be logged in as "(.+)"$/ do |username|
+   When %{I go to #{username}'s control panel}
+   Then %{I should be on login page}
 end
  
 Given /^the profile "(.+)" has no blocks$/ do |profile|
@@ -586,11 +592,6 @@ Then /^I should be taken to &quot;([^\&quot;]*)&quot; product page$/ do |product_name|
   end
 end
  
-When /^I reload and wait for the page$/ do
-  response.selenium.refresh
-  selenium.wait_for_page
-end
-
 Given /^the following enterprise homepages?$/ do |table|
   # table is a Cucumber::Ast::Table
   table.hashes.each do |item|
@@ -602,7 +603,9 @@ Given /^the following enterprise homepages?$/ do |table|
 end
  
 And /^I want to add "([^\"]*)" as cost$/ do |string|
-  selenium.answer_on_next_prompt(string)
+  prompt = page.driver.browser.switch_to.alert
+  prompt.send_keys(string)
+  prompt.accept
 end
  
 Given /^([^\s]+) (enabled|disabled) translation redirection in (?:his|her) profile$/ do
@@ -658,44 +661,42 @@ end
  
 When /^I search ([^\"]*) for "([^\"]*)"$/ do |asset, query|
   When %{I go to the search #{asset} page}
-  And %{I fill in "query" with "#{query}"}
+  And %{I fill in "search-input" with "#{query}"}
   And %{I press "Search"}
 end
  
 Then /^I should see ([^\"]*)'s product image$/ do |product_name|
   p = Product.find_by_name product_name
-  path = url_for(p.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => p, :only_path => true))
-  response.should have_selector("div[class~=\"zoomable-image\"] a[href=\"http://#{path}\"]")
+  path = url_for(p.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => p))
+
+  with_scope('.zoomable-image') do
+    page.should have_xpath("a[@href=\"#{path}\"][@class='search-image-pic']")
+  end
 end
  
 Then /^I should not see ([^\"]*)'s product image$/ do |product_name|
   p = Product.find_by_name product_name
-  path = url_for(p.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => p, :only_path => true))
-  response.should_not have_selector("div[class~=\"zoomable-image\"] a[href=\"http://#{path}\"]")
+  path = url_for(p.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => p))
+
+  with_scope('.zoomable-image') do
+    page.should have_no_xpath("a[@href=\"#{path}\"][@class='search-image-pic']")
+  end
 end
  
 Then /^I should see ([^\"]*)'s profile image$/ do |name|
-  response.should have_selector("img[alt=\"#{name}\"]")
+  page.should have_xpath("//img[@alt=\"#{name}\"]")
 end
  
 Then /^I should not see ([^\"]*)'s profile image$/ do |name|
-  response.should_not have_selector("img[alt=\"#{name}\"]")
-end
-
-Then /^I should see ([^\"]*)'s content image$/ do |name|
-  response.should have_selector("img[alt=\"#{name}\"]")
-end
-
-Then /^I should not see ([^\"]*)'s content image$/ do |name|
-  response.should_not have_selector("img[alt=\"#{name}\"]")
+  page.should have_no_xpath("//img[@alt=\"#{name}\"]")
 end
  
 Then /^I should see ([^\"]*)'s community image$/ do |name|
-  response.should have_selector("img[alt=\"#{name}\"]")
+  page.should have_xpath("//img[@alt=\"#{name}\"]")
 end
  
 Then /^I should not see ([^\"]*)'s community image$/ do |name|
-  response.should_not have_selector("img[alt=\"#{name}\"]")
+  page.should have_no_xpath("//img[@alt=\"#{name}\"]")
 end
  
 Given /^the article "([^\"]*)" is updated by "([^\"]*)"$/ do |article, person|
@@ -754,3 +755,9 @@ When /^wait for the captcha signup time$/ do
   environment = Environment.default
   sleep environment.min_signup_delay + 1
 end
+
+Given /^there are no pending jobs$/ do
+  silence_stream(STDOUT) do
+    Delayed::Worker.new.work_off
+  end
+end
@@ -1,133 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
-
-def string_to_element_locator(selector)
-  if selector.gsub!(/^\./, '')
-    "css=[class='#{selector}']"
-  elsif selector.gsub!(/^value[.=]/, '')
-    "xpath=//input[@value='#{selector}']"
-  elsif selector.gsub!(/^option=/, '')
-    "xpath=//option[@value='#{selector}']"
-  elsif selector.gsub!(/^#/, '')
-    "css=[id='#{selector}']"
-  elsif selector.gsub!(/^content=/, '')
-    "xpath=//*[.='#{selector}']"
-  elsif selector.gsub!(/^li=/, '')
-    "xpath=//li[contains(.,'#{selector}')]"
-  else
-    selector
-  end
-end
-
-Then /^the "([^\"]*)" should be visible$/ do |selector|
-  (selenium.is_element_present(string_to_element_locator(selector)) && selenium.is_visible(string_to_element_locator(selector))).should be_true
-end
-Then /^the content "([^\"]*)" should be visible$/ do |selector|
-  selenium.is_visible(string_to_element_locator("content=#{selector}")).should be_true
-end
-
-Then /^the "([^\"]*)" should not be visible$/ do |selector|
-  (selenium.is_element_present(string_to_element_locator(selector)) && selenium.is_visible(string_to_element_locator(selector))).should be_false
-end
-Then /^the content "([^\"]*)" should not be visible$/ do |selector|
-  selenium.is_visible(string_to_element_locator("content=#{selector}")).should be_false
-end
-
-When /^I click "([^\"]*)"$/ do |selector|
-  selenium.click(string_to_element_locator(selector))
-end
-
-Then /^the "([^\"]*)" button should not be enabled$/ do |text|
-  selenium.is_editable(string_to_element_locator(text)).should be_false
-end
-
-Then /^the "([^\"]*)" button should be enabled$/ do |text|
-  selenium.is_editable(string_to_element_locator("value.#{text}")).should be_true
-end
-
-Then /^I should see "([^\"]*)" above of "([^\"]*)"$/ do |above, below|
-  above_position = selenium.get_element_position_top(string_to_element_locator("li=#{above}"))
-  below_position = selenium.get_element_position_top(string_to_element_locator("li=#{below}"))
-  above_position.to_i.should < below_position.to_i
-end
-
-When /^I drag "([^\"]*)" to "([^\"]*)"$/ do |from, to|
-  selenium.drag_and_drop_to_object(string_to_element_locator("li=#{from}"), string_to_element_locator("li=#{to}"))
-  selenium.wait_for_ajax
-end
-
-When /^I select "([^\"]*)" and wait for (jquery)$/ do |value, framework|
-  select(value)
-  # FIXME ugly hack to make selenium tests waiting to render page
-  # "select(value, :wait_for => :ajax)" did not effect
-  selenium.wait_for(:wait_for => :ajax, :javascript_framework => framework)
-end
-
-When /^I select window "([^\"]*)"$/ do |selector|
-  selenium.select_window(selector)
-end
-
-When /^I fill in "([^\"]*)" within "([^\"]*)" with "([^\"]*)"$/ do |field_label, parent_class, value|
-  selenium.type("xpath=//*[contains(@class, '#{parent_class}')]//*[@id=//label[contains(., '#{field_label}')]/@for]", value)
-end
-
-When /^I press "([^\"]*)" within "([^\"]*)"$/ do |button_value, selector|
-  selenium.click("css=#{selector} input[value=#{button_value}]")
-  selenium.wait_for_page_to_load(10000)
-end
-
-Then /^there should be ([1-9][0-9]*) "([^\"]*)" within "([^\"]*)"$/ do |number, child_class, parent_class|
-  # Using xpath is the only way to count
-  response.selenium.get_xpath_count("//*[contains(@class,'#{parent_class}')]//*[contains(@class,'#{child_class}')]").to_i.should be(number.to_i)
-end
-
-Then /^"([^\"]*)" should be (left|right) aligned$/ do |element_class, align|
-  # Using xpath is the only way to count
-  response.selenium.get_xpath_count("//*[contains(@class,'#{element_class}') and contains(@style,'float: #{align}')]").to_i.should be(1)
-end
-
-When /^I confirm$/ do
-  selenium.get_confirmation
-end
-
-When /^I type "([^\"]*)" in TinyMCE field "([^\"]*)"$/ do |value, field_id|
-  response.selenium.type("dom=document.getElementById('#{field_id}_ifr').contentDocument.body", value)
-end
-
-When /^I refresh the page$/ do
-  response.selenium.refresh
-end
-
-When /^I click on the logo$/ do
-  selenium.click("css=h1#site-title a")
-  selenium.wait_for_page_to_load(10000)
-end
-
-When /^I open (.*)$/ do |url|
-  selenium.open(URI.join(response.selenium.get_location, url))
-end
-
-Then /^the page title should be "([^"]+)"$/ do |text|
-  selenium.get_text("//title").should == text
-end
-
-#### Noosfero specific steps ####
-
-Then /^the select for category "([^\"]*)" should be visible$/ do |name|
-  sleep 2 # FIXME horrible hack to wait categories selection scolling to right
-  category = Category.find_by_name(name)
-  selenium.is_visible(string_to_element_locator("option=#{category.id}")).should be_true
-end
-
-When /^I follow "([^\"]*)" and sleep ([^\"]*) seconds?$/ do |link, time|
-  click_link(link)
-  sleep time.to_i
-end
-
-When /^I follow "([^\"]*)" and wait for jquery$/ do |link|
-  click_link(link)
-  selenium.wait_for(:wait_for => :ajax, :javascript_framework => framework)
-end
-
-When /^I leave the "([^\"]+)" field$/ do |field|
-   selenium.fire_event("css=#{field}", "blur")
-end
@@ -0,0 +1,245 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+require 'uri'
+require 'cgi'
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+module WithinHelpers
+  def with_scope(locator)
+    locator ? within(locator) { yield } : yield
+  end
+end
+World(WithinHelpers)
+
+Given /^(?:|I )am on (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )go to (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )press "([^"]*)"(?: within "([^"]*)")?$/ do |button, selector|
+  with_scope(selector) do
+    click_button(button)
+  end
+end
+
+When /^(?:|I )follow "([^"]*)"(?: within "([^"]*)")?$/ do |link, selector|
+  with_scope(selector) do
+    click_link(link)
+  end
+end
+
+When /^(?:|I )fill in "([^"]*)" with "([^"]*)"(?: within "([^"]*)")?$/ do |field, value, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+When /^(?:|I )fill in "([^"]*)" for "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+# Use this to fill in an entire form with data from a table. Example:
+#
+#   When I fill in the following:
+#     | Account Number | 5002       |
+#     | Expiry date    | 2009-11-01 |
+#     | Note           | Nice guy   |
+#     | Wants Email?   |            |
+#
+# TODO: Add support for checkbox, select og option
+# based on naming conventions.
+#
+When /^(?:|I )fill in the following(?: within "([^"]*)")?:$/ do |selector, fields|
+  with_scope(selector) do
+    fields.rows_hash.each do |name, value|
+      When %{I fill in "#{name}" with "#{value}"}
+    end
+  end
+end
+
+When /^(?:|I )select "([^"]*)" from "([^"]*)"(?: within "([^"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    select(value, :from => field)
+  end
+end
+
+When /^(?:|I )check "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    check(field)
+  end
+end
+
+When /^(?:|I )uncheck "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    uncheck(field)
+  end
+end
+
+When /^(?:|I )choose "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    choose(field)
+  end
+end
+
+When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"(?: within "([^"]*)")?$/ do |path, field, selector|
+  with_scope(selector) do
+    attach_file(field, path)
+  end
+end
+
+Then /^(?:|I )should see JSON:$/ do |expected_json|
+  require 'json'
+  expected = JSON.pretty_generate(JSON.parse(expected_json))
+  actual   = JSON.pretty_generate(JSON.parse(response.body))
+  expected.should == actual
+end
+
+Then /^(?:|I )should see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_content(text)
+    else
+      assert page.has_content?(text)
+    end
+  end
+end
+
+
+Then /^(?:|I )should see "([^"]*)" within any "([^"]*)"?$/ do |text, selector|
+  if page.respond_to? :should
+    page.should have_css(selector, :content => text)
+  else
+    assert page.has_css?(selector, :content => text)
+  end
+end
+
+Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_xpath('//*', :text => regexp)
+    else
+      assert page.has_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^(?:|I )should not see "([^"]*)"(?: within "([^"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_no_content(text)
+    else
+      assert page.has_no_content?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if page.respond_to? :should
+      page.should have_no_xpath('//*', :text => regexp)
+    else
+      assert page.has_no_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^the "([^"]*)" field(?: within "([^"]*)")? should contain "([^"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should
+      field_value.should =~ /#{value}/
+    else
+      assert_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^"]*)" field(?: within "([^"]*)")? should not contain "([^"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    field = find_field(field)
+    field_value = (field.tag_name == 'textarea') ? field.text : field.value
+    if field_value.respond_to? :should_not
+      field_value.should_not =~ /#{value}/
+    else
+      assert_no_match(/#{value}/, field_value)
+    end
+  end
+end
+
+Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should be checked$/ do |label, selector|
+  with_scope(selector) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should be_true
+    else
+      assert field_checked
+    end
+  end
+end
+
+Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |label, selector|
+  with_scope(selector) do
+    field_checked = find_field(label)['checked']
+    if field_checked.respond_to? :should
+      field_checked.should be_false
+    else
+      assert !field_checked
+    end
+  end
+end
+
+Then /^(?:|I )should be on (.+)$/ do |page_name|
+  current_path = URI.parse(current_url).path
+  if current_path.respond_to? :should
+    current_path.should == path_to(page_name)
+  else
+    assert_equal path_to(page_name), current_path
+  end
+end
+
+Then /^(?:|I )should be exactly on (.+)$/ do |page_name|
+  uri = URI.parse(current_url)
+  path_with_params = "#{uri.path}?#{uri.query}"
+  if path_with_params.respond_to? :should
+    path_with_params.should == path_to(page_name)
+  else
+    assert_equal path_to(page_name), path_with_params
+  end
+end
+
+Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
+  query = URI.parse(current_url).query
+  actual_params = query ? CGI.parse(query) : {}
+  expected_params = {}
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
+
+  if actual_params.respond_to? :should
+    actual_params.should == expected_params
+  else
+    assert_equal expected_params, actual_params
+  end
+end
+
+Then /^show me the page$/ do
+  save_and_open_page
+end
+
+Then /^display "([^\"]*)"$/ do |element|
+  # Need this " && false " work-around because this version of selenium doesn't
+  # have the execute_script method which does not returns the script. Checout:
+  #   * https://github.com/jnicklas/capybara/issues/76
+  evaluate_script("jQuery('#{element}').show() && false;")
+end
@@ -1,239 +0,0 @@
-# IMPORTANT: This file was generated by Cucumber 0.4.0
-# Edit at your own peril - it's recommended to regenerate this file
-# in the future when you upgrade to a newer version of Cucumber.
-# Consider adding your own code to a new file instead of editing this one.
-
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
-
-# Commonly used webrat steps
-# http://github.com/brynary/webrat
-
-Given /^I am on (.+)$/ do |page_name|
-  visit path_to(page_name)
-end
-
-When /^I go to (.+)$/ do |page_name|
-  visit path_to(page_name)
-end
-
-When /^I visit "([^\"]*)" and wait$/ do |page_name|
-  visit path_to(page_name)
-  selenium.wait_for_page_to_load(10000)
-#  selenium.wait_for_page
-end
-
-When /^I press "([^\"]*)"$/ do |button|
-  click_button(button)
-end
-
-When /^I press "([^\"]*)" and wait$/ do |button|
-  click_button(button)
-  selenium.wait_for_page_to_load(10000)
-end
-
-When /^I follow "([^\"]*)"$/ do |link|
-  click_link(link)
-end
-
-When /^I follow "([^\"]*)" and wait$/ do |link|
-  click_link(link)
-  selenium.wait_for_page_to_load(10000)
-end
-
-When /^I follow "([^\"]*)" and wait until "([^\"]*)" is present$/ do |link, element|
-  click_link(link)
-  selenium.wait_for_element(string_to_element_locator(element))
-end
-
-When /^I follow "([^\"]*)" within "([^\"]*)"$/ do |link, parent|
-  click_link_within(parent, link)
-end
-
-When /^I follow "([^\"]*)" within "([^\"]*)" and wait$/ do |link, parent|
-  click_link_within(parent, link)
-  selenium.wait_for_page_to_load(10000)
-end
-
-When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
-  if response.class.to_s == 'Webrat::SeleniumResponse'
-    response.selenium.type("//*[@id=//label[contains(., '#{field}')]/@for]", value)
-  else
-    fill_in(field, :with => value)
-  end
-end
-
-When /^I fill in "([^\"]*)" for "([^\"]*)"$/ do |value, field|
-  fill_in(field, :with => value)
-end
-
-# Use this to fill in an entire form with data from a table. Example:
-#
-#   When I fill in the following:
-#     | Account Number | 5002       |
-#     | Expiry date    | 2009-11-01 |
-#     | Note           | Nice guy   |
-#     | Wants Email?   |            |
-#
-# TODO: Add support for checkbox, select og option
-# based on naming conventions.
-#
-When /^I fill in the following:$/ do |fields|
-  fields.rows_hash.each do |name, value|
-    When %{I fill in "#{name}" with "#{value}"}
-  end
-end
-
-When /^I select "([^\"]*)" from "([^\"]*)"$/ do |value, field|
-  if response.class.to_s == 'Webrat::SeleniumResponse'
-    response.selenium.select("//*[@id=//label[contains(., '#{field}')]/@for]", value)
-  else
-    select(value, :from => field)
-  end
-end
-
-# Use this step in conjunction with Rail's datetime_select helper. For example:
-# When I select "December 25, 2008 10:00" as the date and time
-When /^I select "([^\"]*)" as the date and time$/ do |time|
-  select_datetime(time)
-end
-
-# Use this step when using multiple datetime_select helpers on a page or
-# you want to specify which datetime to select. Given the following view:
-#   <%= f.label :preferred %><br />
-#   <%= f.datetime_select :preferred %>
-#   <%= f.label :alternative %><br />
-#   <%= f.datetime_select :alternative %>
-# The following steps would fill out the form:
-# When I select "November 23, 2004 11:20" as the "Preferred" date and time
-# And I select "November 25, 2004 10:30" as the "Alternative" date and time
-When /^I select "([^\"]*)" as the "([^\"]*)" date and time$/ do |datetime, datetime_label|
-  select_datetime(datetime, :from => datetime_label)
-end
-
-# Use this step in conjunction with Rail's time_select helper. For example:
-# When I select "2:20PM" as the time
-# Note: Rail's default time helper provides 24-hour time-- not 12 hour time. Webrat
-# will convert the 2:20PM to 14:20 and then select it.
-When /^I select "([^\"]*)" as the time$/ do |time|
-  select_time(time)
-end
-
-# Use this step when using multiple time_select helpers on a page or you want to
-# specify the name of the time on the form.  For example:
-# When I select "7:30AM" as the "Gym" time
-When /^I select "([^\"]*)" as the "([^\"]*)" time$/ do |time, time_label|
-  select_time(time, :from => time_label)
-end
-
-# Use this step in conjunction with Rail's date_select helper.  For example:
-# When I select "February 20, 1981" as the date
-When /^I select "([^\"]*)" as the date$/ do |date|
-  select_date(date)
-end
-
-# Use this step when using multiple date_select helpers on one page or
-# you want to specify the name of the date on the form. For example:
-# When I select "April 26, 1982" as the "Date of Birth" date
-When /^I select "([^\"]*)" as the "([^\"]*)" date$/ do |date, date_label|
-  select_date(date, :from => date_label)
-end
-
-When /^I check "([^\"]*)"$/ do |field|
-  check(field)
-end
-
-When /^I uncheck "([^\"]*)"$/ do |field|
-  uncheck(field)
-end
-
-When /^I choose "([^\"]*)"$/ do |field|
-  choose(field)
-end
-
-When /^I attach the file at "([^\"]*)" to "([^\"]*)"$/ do |path, field|
-  attach_file(field, path)
-end
-
-Then /^I should see "([^\"]*)"$/ do |text|
-  response.should contain(text)
-end
-
-Then /^I should see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
-  if response.class.to_s == 'Webrat::SeleniumResponse'
-    response.selenium.text('css=' + selector).should include(text)
-  else
-    within(selector) do |content|
-      content.should contain(text)
-    end
-  end
-end
-
-Then /^I should see \/([^\/]*)\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-  response.should contain(regexp)
-end
-
-Then /^I should see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
-  within(selector) do |content|
-    regexp = Regexp.new(regexp)
-    content.should contain(regexp)
-  end
-end
-
-Then /^I should not see "([^\"]*)"$/ do |text|
-  response.should_not contain(text)
-end
-
-Then /^I should not see "([^\"]*)" within "([^\"]*)"$/ do |text, selector|
-  if response.class.to_s == 'Webrat::SeleniumResponse'
-    response.selenium.text('css=' + selector).should_not include(text)
-  else
-    within(selector) do |content|
-      content.should_not contain(text)
-    end
-  end
-end
-
-Then /^I should not see \/([^\/]*)\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-  response.should_not contain(regexp)
-end
-
-Then /^I should not see \/([^\/]*)\/ within "([^\"]*)"$/ do |regexp, selector|
-  within(selector) do |content|
-    regexp = Regexp.new(regexp)
-    content.should_not contain(regexp)
-  end
-end
-
-Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
-  if response.class.to_s == 'Webrat::SeleniumResponse'
-    response.selenium.get_value("//*[@id=//label[contains(., '#{field}')]/@for]").should match(value)
-  else
-    field_labeled(field).value.should =~ /#{value}/
-  end
-end
-
-Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
-  field_labeled(field).value.should_not =~ /#{value}/
-end
-
-Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
-  field_labeled(label).should be_checked
-end
-
-Then /^the "([^\"]*)" checkbox should not be checked$/ do |label|
-  field_labeled(label).should_not be_checked
-end
-
-Then /^I should be on (.+)$/ do |page_name|
-  if response.class.to_s == 'Webrat::SeleniumResponse'
-    URI.parse(response.selenium.get_location).path.should == path_to(page_name)
-  else
-    URI.parse(current_url).path.should == path_to(page_name)
-  end
-end
-
-Then /^show me the page$/ do
-  save_and_open_page
-end
@@ -17,15 +17,15 @@ Feature: suggest article
       | target           | article_name        | article_body                    | name | email            |
       | sample-community | A suggested article | this is an article about whales | jose | jose@example.org |
     When I am logged in as "joaosilva"
-    And I go to Sample Community's control panel
+    And I go to sample-community's control panel
     And I follow "Process requests"
     And I should see "suggested the publication of the article"
     Then I should see "Highlight this article" within ".task_box"
  
-  @selenium
+  @selenium-fixme
   Scenario: an article is suggested and the admin approve it
     Given I am on Sample Community's blog
-    And I follow "Suggest an article" and wait
+    And I follow "Suggest an article"
     And I fill in "Title" with "Suggestion"
     And I fill in "Your name" with "Some Guy"
     And I fill in "Email" with "someguy@somewhere.com"
-# IMPORTANT: This file was generated by Cucumber 0.4.0
-# Edit at your own peril - it's recommended to regenerate this file
-# in the future when you upgrade to a newer version of Cucumber.
-# Consider adding your own code to a new file instead of editing this one.
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
  
-# Sets up the Rails environment for Cucumber
 ENV["RAILS_ENV"] ||= "cucumber"
-
-# Start/stop Solr
-if not $cucumber_env_loaded
-	abort unless system 'rake solr:start'
-  at_exit { system 'rake solr:stop' }
-  $cucumber_env_loaded = true
-end
+abort unless system 'rake -s solr:start'
+at_exit { system 'rake -s solr:stop' }
  
 require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
-require 'cucumber/rails/world'
-
-# If you set this to true, each scenario will run in a database transaction.
-# You can still turn off transactions on a per-scenario basis, simply tagging 
-# a feature or scenario with the @no-txn tag. 
-#
-# If you set this to false, transactions will be off for all scenarios,
-# regardless of whether you use @no-txn or not.
-#
-# Beware that turning transactions off will leave data in your database 
-# after each scenario, which can lead to hard-to-debug failures in 
-# subsequent scenarios. If you do this, we recommend you create a Before
-# block that will explicitly put your database in a known state.
-Cucumber::Rails::World.use_transactional_fixtures = true
  
-# If you set this to false, any error raised from within your app will bubble 
+require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
+require 'cucumber/rails/world'
+require 'cucumber/rails/active_record'
+require 'cucumber/web/tableish'
+
+require 'capybara/rails'
+require 'capybara/cucumber'
+require 'capybara/session'
+# require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links with onclick javascript handlers without using @culerity or @javascript
+# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
+# order to ease the transition to Capybara we set the default here. If you'd
+# prefer to use XPath just remove this line and adjust any selectors in your
+# steps to use the XPath syntax.
+Capybara.default_selector = :css
+Capybara.ignore_hidden_elements = true
+
+# If you set this to false, any error raised from within your app will bubble
 # up to your step definition and out to cucumber unless you catch it somewhere
 # on the way. You can make Rails rescue errors and render error pages on a
 # per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
@@ -40,16 +37,25 @@ Cucumber::Rails::World.use_transactional_fixtures = true
 # of your scenarios, as this makes it hard to discover errors in your application.
 ActionController::Base.allow_rescue = false
  
-require 'cucumber'
-# Comment out the next line if you don't want Cucumber Unicode support
-require 'cucumber/formatter/unicode'
-require 'cucumber/webrat/element_locator' # Lets you do table.diff!(element_at('#my_table_or_dl_or_ul_or_ol').to_table)
-require 'cucumber/rails/rspec'
-
-require 'webrat'
-require 'webrat/core/matchers' 
-Webrat.configure do |config|
-  config.mode = :rails
-  config.open_error_files = false # Set to true if you want error pages to pop up in the browser
+# If you set this to true, each scenario will run in a database transaction.
+# You can still turn off transactions on a per-scenario basis, simply tagging
+# a feature or scenario with the @no-txn tag. If you are using Capybara,
+# tagging with @culerity or @javascript will also turn transactions off.
+#
+# If you set this to false, transactions will be off for all scenarios,
+# regardless of whether you use @no-txn or not.
+#
+# Beware that turning transactions off will leave data in your database
+# after each scenario, which can lead to hard-to-debug failures in
+# subsequent scenarios. If you do this, we recommend you create a Before
+# block that will explicitly put your database in a known state.
+Cucumber::Rails::World.use_transactional_fixtures = true
+# How to clean your database when transactions are turned off. See
+# http://github.com/bmabey/database_cleaner for more info.
+
+Before do
+  Fixtures.reset_cache
+  fixtures_folder = File.join(RAILS_ROOT, 'test', 'fixtures')
+  fixtures = ['environments', 'roles']
+  Fixtures.create_fixtures(fixtures_folder, fixtures)
 end
-
@@ -1,6 +0,0 @@
-# set the very basic fixtures for Noosfero
-Fixtures.reset_cache
-fixtures_folder = File.join(RAILS_ROOT, 'test', 'fixtures')
-fixtures = ['environments', 'roles']
-Fixtures.create_fixtures(fixtures_folder, fixtures)
-
@@ -3,7 +3,7 @@ module NavigationHelpers
   #
   #   When /^I go to (.+)$/ do |page_name|
   #
-  # step definition in webrat_steps.rb
+  # step definition in web_steps.rb
   #
   def path_to(page_name)
     case page_name
@@ -11,6 +11,12 @@ module NavigationHelpers
     when /the homepage/
       '/'
  
+    # Add more mappings here.
+    # Here is an example that pulls values out of the Regexp:
+    #
+    #   when /^(.*)'s profile page$/i
+    #     user_profile_path(User.find_by_login($1))
+
     when /^\//
       page_name
  
@@ -31,43 +37,37 @@ module NavigationHelpers
       "/myprofile/#{$2}/profile_design/edit/#{block.id}"
  
     when /^(.*)'s homepage$/
-      '/%s' % Profile.find_by_name($1).identifier
+      '/' + profile_identifier($1)
  
     when /^(.*)'s blog$/
-      '/%s/blog' % Profile.find_by_name($1).identifier
+      '/%s/blog' % profile_identifier($1)
  
     when /^(.*)'s (.+) creation$/
-      '/myprofile/%s/cms/new?type=%s' % [Profile.find_by_name($1).identifier,$2]
+      '/myprofile/%s/cms/new?type=%s' % [profile_identifier($1),$2]
  
     when /^(.*)'s sitemap/
-      '/profile/%s/sitemap' % Profile.find_by_name($1).identifier
+      '/profile/%s/sitemap' % profile_identifier($1)
  
     when /^(.*)'s profile$/
-      '/profile/%s' % Profile.find_by_name($1).identifier
-
-    when /^the profile$/
-      '/profile/%s' % User.find_by_id(session[:user]).login
+      '/profile/' + profile_identifier($1)
  
     when /^(.*)'s join page/
-      '/profile/%s/join' % Profile.find_by_name($1).identifier
+      '/profile/%s/join' % profile_identifier($1)
  
     when /^(.*)'s leave page/
-      '/profile/%s/leave' % Profile.find_by_name($1).identifier
-
-    when /^(.*)'s profile editor$/
-      "myprofile/manuel/profile_editor/edit"
+      '/profile/%s/leave' % profile_identifier($1)
  
     when /^login page$/
       '/account/login'
  
+    when /^logout page$/
+      '/account/logout'
+
     when /^signup page$/
       '/account/signup'
  
     when /^(.*)'s control panel$/
-      '/myprofile/%s' % Profile.find_by_name($1).identifier
-
-    when /^the Control panel$/
-      '/myprofile/%s' % User.find_by_id(session[:user]).login
+      '/myprofile/' + profile_identifier($1)
  
     when /the environment control panel/
       '/admin'
@@ -79,7 +79,7 @@ module NavigationHelpers
       '/search/%s' % $1
  
     when /^(.+)'s cms/
-      '/myprofile/%s/cms' % Profile.find_by_name($1).identifier
+      '/myprofile/%s/cms' % profile_identifier($1)
  
     when /^"(.+)" edit page/
       article = Article.find_by_name($1)
@@ -89,7 +89,7 @@ module NavigationHelpers
       '/myprofile/%s/profile_members' % Profile.find_by_name($1).identifier
  
     when /^(.+)'s new product page/
-      '/myprofile/%s/manage_products/new' % Profile.find_by_name($1).identifier
+      '/myprofile/%s/manage_products/new' % profile_identifier($1)
  
     when /^(.+)'s page of product (.*)$/
       enterprise = Profile.find_by_name($1)
@@ -97,7 +97,7 @@ module NavigationHelpers
       '/myprofile/%s/manage_products/show/%s' % [enterprise.identifier, product.id]
  
     when /^(.*)'s products page$/
-      '/catalog/%s' % Profile.find_by_name($1).identifier
+      '/catalog/%s' % $1
  
     when /^chat$/
       '/chat'
@@ -109,19 +109,24 @@ module NavigationHelpers
       '/account/user_data'
  
     when /^(.+)'s members page/
-      '/profile/%s/members' % Profile.find_by_name($1).identifier
-
-    # Add more mappings here.
-    # Here is a more fancy example:
-    #
-    #   when /^(.*)'s profile page$/i
-    #     user_profile_path(User.find_by_login($1))
+      '/profile/%s/members' % profile_identifier($1)
  
     else
-      raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
-        "Now, go and add a mapping in #{__FILE__}"
+      begin
+        page_name =~ /the (.*) page/
+        path_components = $1.split(/\s+/)
+        self.send(path_components.push('path').join('_').to_sym)
+      rescue Object => e
+        raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+          "Now, go and add a mapping in #{__FILE__}"
+      end
     end
   end
+
+  def profile_identifier(field)
+    profile = Profile.find_by_name(field) || Profile.find_by_identifier(field)
+    profile.identifier
+  end
 end
  
 World(NavigationHelpers)
-Webrat.configure do |config|
-  config.mode = :selenium
-  config.application_environment = :cucumber
-  config.selenium_browser_startup_timeout = 30000
-end
+require 'database_cleaner'
+require 'database_cleaner/cucumber'
  
 Cucumber::Rails::World.use_transactional_fixtures = false
  
-require 'database_cleaner'
-require 'database_cleaner/cucumber'
+Capybara.default_driver = :selenium
+Capybara.register_driver :selenium do |app|
+  Capybara::Selenium::Driver.new(app, :browser => :firefox)
+end
  
+# FIXME: 'DELETE FROM ...' is being ran 3x - see cucumber.log
 DatabaseCleaner.clean_with :truncation
 DatabaseCleaner.strategy = :truncation
  
 Before do
-  Fixtures.reset_cache
-  fixtures_folder = File.join(RAILS_ROOT, 'test', 'fixtures')
-  fixtures = ['environments', 'roles']
-  Fixtures.create_fixtures(fixtures_folder, fixtures)
-  ENV['LANG'] = 'C'
   DatabaseCleaner.start
 end
  
+Before('@ignore-hidden-elements') do
+  Capybara.ignore_hidden_elements = true
+end
+
+Capybara.default_wait_time = 30
+
 After do
-  sleep 2
   DatabaseCleaner.clean
 end
+
+World(Capybara)
@@ -1,29 +0,0 @@
-if Cucumber::VERSION::STRING != '0.4.0'
-warning = <<-WARNING
-(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) 
-
-         (::)   R O T T E N   C U C U M B E R   A L E R T    (::)
-
-Your #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} file was generated with Cucumber 0.4.0,
-but you seem to be running Cucumber #{Cucumber::VERSION::STRING}. If you're running an older 
-version than #{Cucumber::VERSION::STRING}, just upgrade your gem. If you're running a newer 
-version than #{Cucumber::VERSION::STRING} you should:
-
-  1) Read http://wiki.github.com/aslakhellesoy/cucumber/upgrading
-  
-  2) Regenerate your cucumber environment with the following command:
-
-     ruby script/generate cucumber
-
-If you get prompted to replace a file, hit 'd' to see the difference.
-When you're sure you have captured any personal edits, confirm that you
-want to overwrite #{__FILE__.gsub(/version_check.rb$/, 'env.rb')} by pressing 'y'. Then reapply any
-personal changes that may have been overwritten. 
-
-This message will then self destruct.
-
-(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) 
-WARNING
-warn(warning)
-at_exit {warn(warning)}
-end
 \ No newline at end of file
@@ -15,7 +15,7 @@ Feature: unblock button
   Scenario: the environment administrator unblocks a blocked enterprise
     Given I am logged in as admin
     And enterprise "Sample Enterprise" is blocked
-    And I am on Sample Enterprise's homepage
+    And I am on sample-enterprise's homepage
     When I follow "Unblock"
     Then I should not see "Unblock"
  
@@ -25,10 +25,10 @@ Feature: unblock button
       | joaosilva | Joao Silva |
     And I am logged in as "joaosilva"
     And enterprise "Sample Enterprise" is blocked
-    When I am on Sample Enterprise's homepage
+    When I am on sample-enterprise's homepage
     Then I should not see "Unblock"
  
   Scenario: a not blocked enterprise should not show "Unblock" button
     Given I am logged in as admin
-    When I am on Sample Enterprise's homepage
+    When I am on sample-enterprise's homepage
     Then I should not see "Unblock"
@@ -16,7 +16,7 @@ Feature: upload files
     And the following galleries
       | owner | name |
       | sample-community | Gallery test |
-    And I go to Sample Community's profile
+    And I go to sample-community's profile
     And I follow "0 pictures"
     And I should see "Upload files"
  
@@ -28,7 +28,7 @@ Feature: upload files
     And the following galleries
       | owner | name |
       | sample-enterprise | Gallery test |
-    And I go to Sample Enterprise's profile
+    And I go to sample-enterprise's profile
     And I follow "0 pictures"
     And I should see "Upload files"
  
+# -*- coding: utf-8 -*-
 require 'fast_gettext'
  
 module Noosfero
@@ -78,13 +79,14 @@ module Noosfero
   end
  
   def self.url_options
-    if ENV['RAILS_ENV'] == 'development'
+    case ENV['RAILS_ENV']
+    when 'development'
       development_url_options
-    elsif ENV['RAILS_ENV'] == 'cucumber'
-      Webrat.configuration.mode == :rails ? { :host => '' } : { :port => Webrat.configuration.application_port }
-    else
-      {}
-    end
+    when 'cucumber'
+      if Capybara.current_driver == :selenium
+        { :host => Capybara.current_session.driver.rack_server.host, :port => Capybara.current_session.driver.rack_server.port }
+      end
+    end || { }
   end
  
   def self.development_url_options
-# This file was generated by 
-$LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
  
-unless ARGV.any? {|a| a =~ /^gems/}
+
+unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
+
+vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
  
 begin
   require 'cucumber/rake/task'
  
-  # Use vendored cucumber binary if possible. If it's not vendored,
-  # Cucumber::Rake::Task will automatically use installed gem's cucumber binary
-  vendored_cucumber_binary = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-
   namespace :cucumber do
     Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
-      t.binary = vendored_cucumber_binary
+      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
       t.fork = true # You may get faster startup if you set this to false
-      t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
+      t.profile = 'default'
     end
  
     Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
-      t.binary = vendored_cucumber_binary
+      t.binary = vendored_cucumber_bin
       t.fork = true # You may get faster startup if you set this to false
-      t.cucumber_opts = "--color --tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'progress'}"
+      t.profile = 'wip'
     end
  
-    Cucumber::Rake::Task.new({:selenium => 'db:test:prepare'}, 'Run features with selenium') do |t|
-      t.binary = vendored_cucumber_binary
+    Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
+      t.binary = vendored_cucumber_bin
       t.fork = true # You may get faster startup if you set this to false
-      t.cucumber_opts = "--color -p selenium --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+      t.profile = 'rerun'
     end
  
     desc 'Run all features'
     task :all => [:ok, :wip]
   end
   desc 'Alias for cucumber:ok'
-  task :cucumber => ['cucumber:ok']
+  task :cucumber => 'cucumber:ok'
+
+  task :default => :cucumber
  
   task :features => :cucumber do
     STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
@@ -31,7 +31,7 @@ def run_cucumber(name, profile, files_glob)
   if files.empty?
     puts "I: no tests to run #{name}"
   else
-    sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *features
+    sh 'xvfb-run', 'ruby', '-S', 'cucumber', '--profile', profile.to_s, '--format', ENV['CUCUMBER_FORMAT'] || 'progress' , *files
   end
 end
  
@@ -42,14 +42,16 @@ def plugin_test_task(name, plugin, files_glob)
   end
 end
  
-def plugin_cucumber_task(plugin, files_glob)
-  task :cucumber => 'db:test:plugins:prepare' do |t|
+def plugin_cucumber_task(name, plugin, files_glob)
+  desc "Run #{name} tests for #{plugin_name(plugin)}"
+  task name => 'db:test:plugins:prepare' do |t|
     run_cucumber t.name, :default, files_glob
   end
 end
  
-def plugin_selenium_task(plugin, files_glob)
-  task :selenium => 'db:test:plugins:prepare' do |t|
+def plugin_selenium_task(name, plugin, files_glob)
+  desc "Run #{name} tests for #{plugin_name(plugin)}"
+  task name => 'db:test:plugins:prepare' do |t|
     run_cucumber t.name, :selenium, files_glob
   end
 end
@@ -79,11 +81,11 @@ namespace :test do
         plugin_test_task :units, plugin, "plugins/#{plugin}/test/unit/**/*.rb"
         plugin_test_task :functionals, plugin, "plugins/#{plugin}/test/functional/**/*.rb"
         plugin_test_task :integration, plugin, "plugins/#{plugin}/test/integration/**/*.rb"
-        plugin_cucumber_task plugin, "plugins/#{plugin}/features/**/*.feature"
-        plugin_selenium_task plugin, "plugins/#{plugin}/features/**/*.feature"
+        plugin_cucumber_task :cucumber, plugin, "plugins/#{plugin}/test/features/**/*.feature"
+        plugin_selenium_task :selenium, plugin, "plugins/#{plugin}/test/features/**/*.feature"
       end
  
-      test_sequence_task(plugin, plugin, "#{plugin}:units", "#{plugin}:functionals", "#{plugin}:integration", "#{plugin}:cucumber", "#{plugin}:selenium") # FIXME missing cucumber and selenium
+      test_sequence_task(plugin, plugin, "#{plugin}:units", "#{plugin}:functionals", "#{plugin}:integration", "#{plugin}:cucumber", "#{plugin}:selenium")
     end
  
     { :units => :unit , :functionals => :functional , :integration => :integration }.each do |taskname,folder|
@@ -93,11 +95,11 @@ namespace :test do
     end
  
     task :cucumber => 'db:test:plugins:prepare' do |t|
-      run_cucumber t.name, :default, "plugins/{#{enabled_plugins.join(',')}}/features/**/*.features"
+      run_cucumber t.name, :default, "plugins/{#{enabled_plugins.join(',')}}/test/features/**/*.features"
     end
  
     task :selenium => 'db:test:plugins:prepare' do |t|
-      run_cucumber t.name, :selenium, "plugins/{#{enabled_plugins.join(',')}}/features/**/*.features"
+      run_cucumber t.name, :selenium, "plugins/{#{enabled_plugins.join(',')}}/test/features/**/*.features"
     end
  
     task :temp_enable_all_plugins do
@@ -0,0 +1,23 @@
+jQuery('.display-comment-form').click(function(){
+  toggleBox('.post_comment_box');
+  jQuery('.display-comment-form').hide();
+  jQuery('form.comment_form input').first().focus();
+  return false;
+});
+
+jQuery('#cancel-comment').click(function(){
+  toggleBox('.post_comment_box');
+  jQuery('.display-comment-form').show();
+  return false
+})
+
+function toggleBox(div_selector){
+  div = jQuery(div_selector);
+  if(div.hasClass('opened')) {
+    div.removeClass('opened');
+    div.addClass('closed');
+  } else {
+    div.removeClass('closed');
+    div.addClass('opened');
+  }
+}
@@ -1106,8 +1106,7 @@ a.comment-picture {
 }
 #article .article-comments-list, #article .article-comments-list ul, #article .article-comments-list li {
   padding: 0;
-  margin: 0;
-  margin-bottom: 10px;
+  margin: 25px 0 10px 0;
   list-style: none;
 }
 .article-comment .button-bar {
@@ -1273,20 +1272,24 @@ a.comment-picture {
   background: transparent url(../images/loading-small.gif) no-repeat left center;
 }
  
+
 .post_comment_box {
   text-align: center;
   padding: 0px 15px 5px 15px;
-  margin: 10px auto;
 }
-.post-comment-button a, .post_comment_box h4 {
+
+#comments_list a.display-comment-form {
   padding: 1px 20px;
   margin: 0px;
   background: #eee;
-}
-.post-comment-button a, .post_comment_box.closed h4 {
-  display: inline;
   border: 1px solid #888;
-  cursor: pointer;
+  text-decoration: none;
+  color: black;
+  font-size: 14px;
+  font-weight: bold;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  border-radius: 4px;
 }
 .post_comment_box.opened {
   border: 1px solid #888;
@@ -2720,6 +2723,29 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   padding-bottom: 0.5em;
 }
  
+#catalog-categories-homepage-link {
+  background-color: #d3d7cf;
+  font-weight: bold;
+  height: 28px;
+  text-align: center;
+  border-radius: 5px;
+  margin-bottom: 10px;
+}
+
+
+#catalog-categories-homepage-link:hover {
+  background-color: #babdb6;
+}
+
+
+#catalog-categories-homepage-link a{
+  display: inline-block;
+  height: 100%;
+  width: 100%;
+  line-height: 28px;
+  text-decoration: none;
+  color: #2e3436;
+}
 /* * * Show Product * * * * * * * * * * * * */
  
 .controller-catalog #show_product .product-pic {
 #!/usr/bin/env ruby
  
-vendored_cucumber_binary = Dir[File.join(File.dirname(__FILE__),
-                                         '..',
-                                         'vendor',
-                                         '{gems,plugins}',
-                                         'cucumber*',
-                                         'bin',
-                                         'cucumber')].first
-
-if vendored_cucumber_binary
-  load File.expand_path(vendored_cucumber_binary)
+vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+if vendored_cucumber_bin
+  load File.expand_path(vendored_cucumber_bin)
 else
   require 'rubygems' unless ENV['NO_RUBYGEMS']
   require 'cucumber'
@@ -1281,7 +1281,7 @@ end
     comment = article.comments.build(:author => profile, :title => 'hi', :body => 'hello')
     comment.save!
     get :view_page, :profile => 'testuser', :page => [ 'test' ]
-    assert_no_tag :tag => 'p', :attributes => { :class => 'post-comment-button' }
+    assert_no_tag :tag => 'a', :attributes => { :class => 'display-comment-form' }
   end
  
   should 'not show a post comment button on top if there are no comments' do
@@ -1289,7 +1289,7 @@ end
     article = profile.articles.build(:name => 'test')
     article.save!
     get :view_page, :profile => 'testuser', :page => [ 'test' ]
-    assert_no_tag :tag => 'p', :attributes => { :class => 'post-comment-button' }
+    assert_no_tag :tag => 'a', :attributes => { :class => 'display-comment-form' }
   end
  
   should 'show a post comment button on top if there are at least two comments' do
@@ -1301,7 +1301,7 @@ end
     comment2 = article.comments.build(:author => profile, :title => 'hi', :body => 'hello', :reply_of_id => comment1.id)
     comment2.save!
     get :view_page, :profile => 'testuser', :page => [ 'test' ]
-    assert_tag :tag => 'p', :attributes => { :class => 'post-comment-button' }
+    assert_tag :tag => 'a', :attributes => { :class => 'display-comment-form' }
   end
  
   should 'store number of comments' do
 namespace :solr do
  
   APACHE_MIRROR = ENV['APACHE_MIRROR'] || "http://ftp.unicamp.br/pub/apache"
-  SOLR_VERSION = '3.6.0'
+  SOLR_VERSION = '3.6.2'
   SOLR_FILENAME = "apache-solr-#{SOLR_VERSION}.tgz" 
-  SOLR_MD5SUM = 'ac11ef4408bb015aa3a5eefcb1047aec'
+  SOLR_MD5SUM = 'e9c51f51265b070062a9d8ed50b84647'
   SOLR_URL = "#{APACHE_MIRROR}/lucene/solr/#{SOLR_VERSION}/#{SOLR_FILENAME}" 
   SOLR_DIR = "apache-solr-#{SOLR_VERSION}"
1	1	source :rubygems
2		-gem 'cucumber', '0.4.0'
3		-gem 'webrat', '0.5.1'
4		-gem 'rspec', '1.2.9'
5		-gem 'rspec-rails', '1.2.9'
6		-gem 'Selenium', '>= 1.1.14'
7		-gem 'selenium-client', '>= 1.2.17'
8		-gem 'database_cleaner'
	2	+
9	3	gem 'exception_notification', '1.0.20090728'
10	4	gem 'system_timer'
11	5
	6	+group :test do
	7	+ gem 'rspec', '1.2.9'
	8	+ gem 'rspec-rails', '1.2.9'
	9	+end
	10	+
	11	+group :cucumber do
	12	+ gem 'rake', '0.8.7'
	13	+ gem 'cucumber-rails', '0.3.2'
	14	+ gem 'capybara', '1.1.1'
	15	+ gem 'cucumber', '1.1.0'
	16	+ gem 'database_cleaner'
	17	+end
	18	+
12	19	def program(name)
13	20	unless system("which #{name} > /dev/null")
14	21	puts "W: Program #{name} is needed, but was not found in your PATH"
...	...
1	1	GEM
2	2	remote: http://rubygems.org/
3	3	specs:
4		- Selenium (1.1.14)
5		- builder (3.0.0)
6		- cucumber (0.4.0)
	4	+ builder (3.1.4)
	5	+ capybara (1.1.1)
	6	+ mime-types (>= 1.16)
	7	+ nokogiri (>= 1.3.3)
	8	+ rack (>= 1.0.0)
	9	+ rack-test (>= 0.5.4)
	10	+ selenium-webdriver (~> 2.0)
	11	+ xpath (~> 0.1.4)
	12	+ childprocess (0.3.6)
	13	+ ffi (~> 1.0, >= 1.0.6)
	14	+ cucumber (1.1.0)
7	15	builder (>= 2.1.2)
8	16	diff-lcs (>= 1.1.2)
9		- polyglot (>= 0.2.9)
10		- term-ansicolor (>= 1.0.3)
11		- treetop (>= 1.4.2)
12		- database_cleaner (0.7.0)
	17	+ gherkin (~> 2.5.0)
	18	+ json (>= 1.4.6)
	19	+ term-ansicolor (>= 1.0.6)
	20	+ cucumber-rails (0.3.2)
	21	+ cucumber (>= 0.8.0)
	22	+ database_cleaner (0.9.1)
13	23	diff-lcs (1.1.3)
14	24	exception_notification (1.0.20090728)
15		- nokogiri (1.5.0)
16		- polyglot (0.3.3)
17		- rack (1.3.5)
	25	+ ffi (1.2.0)
	26	+ gherkin (2.5.4)
	27	+ json (>= 1.4.6)
	28	+ json (1.7.5)
	29	+ libwebsocket (0.1.6.1)
	30	+ websocket
	31	+ mime-types (1.19)
	32	+ multi_json (1.3.7)
	33	+ nokogiri (1.5.5)
	34	+ rack (1.1.0)
	35	+ rack-test (0.6.2)
	36	+ rack (>= 1.0)
	37	+ rake (0.8.7)
18	38	rspec (1.2.9)
19	39	rspec-rails (1.2.9)
20	40	rack (>= 1.0.0)
21	41	rspec (>= 1.2.9)
22		- selenium-client (1.2.18)
	42	+ rubyzip (0.9.9)
	43	+ selenium-webdriver (2.26.0)
	44	+ childprocess (>= 0.2.5)
	45	+ libwebsocket (~> 0.1.3)
	46	+ multi_json (~> 1.0)
	47	+ rubyzip
23	48	system_timer (1.2.4)
24	49	term-ansicolor (1.0.7)
25		- treetop (1.4.10)
26		- polyglot
27		- polyglot (>= 0.3.1)
28		- webrat (0.5.1)
29		- nokogiri (>= 1.2.0)
30		- rack (>= 1.0)
	50	+ websocket (1.0.4)
	51	+ xpath (0.1.4)
	52	+ nokogiri (~> 1.3)
31	53
32	54	PLATFORMS
33	55	ruby
34	56
35	57	DEPENDENCIES
36		- Selenium (>= 1.1.14)
37		- cucumber (= 0.4.0)
	58	+ capybara (= 1.1.1)
	59	+ cucumber (= 1.1.0)
	60	+ cucumber-rails (= 0.3.2)
38	61	database_cleaner
39	62	exception_notification (= 1.0.20090728)
	63	+ rake (= 0.8.7)
40	64	rspec (= 1.2.9)
41	65	rspec-rails (= 1.2.9)
42		- selenium-client (>= 1.2.17)
43	66	system_timer
44		- webrat (= 0.5.1)
...	...
...	...	@@ -616,12 +616,10 @@ class Environment < ActiveRecord::Base
616	616	end
617	617
618	618	def top_url
619		- protocol = 'http'
620		- result = "#{protocol}://#{default_hostname}"
621		- if Noosfero.url_options.has_key?(:port)
622		- result << ':' << Noosfero.url_options[:port].to_s
623		- end
624		- result
	619	+ url = 'http://'
	620	+ url << (Noosfero.url_options.key?(:host) ? Noosfero.url_options[:host] : default_hostname)
	621	+ url << ':' << Noosfero.url_options[:port].to_s if Noosfero.url_options.key?(:port)
	622	+ url
625	623	end
626	624
627	625	def to_s
...	...
...	...	@@ -4,7 +4,7 @@
4	4
5	5	<%= render :file => 'shared/tiny_mce' %>
6	6
7		-<% labelled_form_for :environment, @environment, :url => {:host => @environment.default_hostname, :port => request.port} do \|f\| %>
	7	+<% labelled_form_for :environment, @environment do \|f\| %>
8	8	<% tabs = [] %>
9	9	<% tabs << {:title => _('Site info'), :id => 'site-info',
10	10	:content => (render :partial => 'site_info', :locals => {:f => f})} %>
...	...
...	...	@@ -7,6 +7,7 @@
7	7
8	8	<div class='l-sidebar-left-bar'>
9	9	<ul>
	10	+ <%= content_tag('li', link_to(_('Enterprise homepage'), profile.public_profile_url), :id => 'catalog-categories-homepage-link') %>
10	11	<% if @categories.present? %>
11	12	<% @categories.each do \|category\| %>
12	13	<%= category_link(category) %>
...	...
...	...	@@ -21,8 +21,6 @@ function submit_comment_form(button) {
21	21	}
22	22	</script>
23	23
24		-<% focus_on = logged_in? ? 'title' : 'name' %>
25		-
26	24	<% if @comment && @comment.errors.any? && @comment.reply_of_id.blank? %>
27	25	<%= error_messages_for :comment %>
28	26	<script type="text/javascript">jQuery(function() { document.location.href = '#page-comment-form'; });</script>
...	...	@@ -32,17 +30,7 @@ function submit_comment_form(button) {
32	30
33	31	<div class="post_comment_box <%= @form_div %>">
34	32
35		-<% if display_link %>
36		- <h4 onclick="var d = jQuery(this).parent('.post_comment_box');
37		- if (d.hasClass('closed')) {
38		- d.removeClass('closed');
39		- d.addClass('opened');
40		- d.find('input[name=comment[title]], textarea').val('');
41		- d.find('.comment_form input[name=comment[<%= focus_on %>]]').focus();
42		- }">
43		- <%= content_tag('a', '', :name => 'comment_form') + _('Post a comment') %>
44		- </h4>
45		-<% end %>
	33	+ <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') if display_link %>
46	34
47	35	<% unless pass_without_comment_captcha? %>
48	36	<div id="recaptcha-container" style="display: none">
...	...	@@ -62,8 +50,6 @@ function submit_comment_form(button) {
62	50	<% end %>
63	51
64	52	<% form_tag( url, { :class => 'comment_form' } ) do %>
65		- <%= hidden_field_tag(:confirm, 'false') %>
66		-
67	53	<%= required_fields_message %>
68	54
69	55	<% unless logged_in? %>
...	...	@@ -84,10 +70,13 @@ function submit_comment_form(button) {
84	70	<%= labelled_form_field(_('Title'), text_field(:comment, :title)) %>
85	71	<%= required labelled_form_field(_('Enter your comment'), text_area(:comment, :body, :rows => 5)) %>
86	72
	73	+ <%= hidden_field_tag(:confirm, 'false') %>
	74	+ <%= hidden_field_tag(:view, params[:view])%>
	75	+
87	76	<% button_bar do %>
88	77	<%= submit_button('add', _('Post comment'), :onclick => "submit_comment_form(this); return false") %>
89	78	<% if cancel_triggers_hide %>
90		- <%= button_to_function :cancel, _('Cancel'), "f=jQuery(this).parents('.post_comment_box'); f.removeClass('opened'); f.addClass('closed'); return false" %>
	79	+ <%= button :cancel, _('Cancel'), '', :id => 'cancel-comment' %>
91	80	<% else %>
92	81	<%= button('cancel', _('Cancel'), {:action => 'view_page', :profile => profile.identifier, :page => @comment.article.explode_path})%>
93	82	<% end %>
...	...	@@ -95,3 +84,5 @@ function submit_comment_form(button) {
95	84	<% end %>
96	85
97	86	</div><!-- end class="post_comment_box" -->
	87	+
	88	+<%= javascript_include_tag 'comment_form'%>
...	...
...	...	@@ -90,7 +90,7 @@
90	90	<% end %>
91	91
92	92	<% if @page.accept_comments? && @comments_count > 1 %>
93		- <p class="post-comment-button"><a href="#comment_form" onclick="jQuery('#page-comment-form h4').first().trigger('click')"><%= _('Post a comment') %></a></p>
	93	+ <%= link_to(_('Post a comment'), '#', :class => 'display-comment-form') %>
94	94	<% end %>
95	95
96	96	<ul class="article-comments-list">
...	...
...	...	@@ -4,7 +4,7 @@
4	4
5	5	<%= render :file => 'shared/tiny_mce' %>
6	6
7		-<% form_for :mailing, :url => {:action => 'send_mail', :host => @environment.default_hostname} do \|f\| %>
	7	+<% form_for :mailing do \|f\| %>
8	8	<%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
9	9	<%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
10	10	<%= submit_button(:send, _('Send')) %>
...	...
1		-default: --tags ~@selenium,~@wip --exclude features/support/selenium.rb --exclude features/step_definitions/selenium_steps.rb -r features/support -r features/step_definitions
2		-selenium: --tags @selenium,~@wip -r features/support -r features/step_definitions
	1	+default: --color --format progress --strict --tags ~@selenium --tags ~@selenium-fixme --tags ~@fixme --exclude features/support/selenium.rb -r features/support -r features/step_definitions
	2	+selenium: --strict --tags @selenium -r features/support -r features/step_definitions
...	...
...	...	@@ -6,6 +6,7 @@ development:
6	6	test: &TEST
7	7	adapter: sqlite3
8	8	database: db/test.db
	9	+ timeout: 2000
9	10
10	11	production:
11	12	adapter: sqlite3
...	...