Fixing cucumber tests

Rodrigo Souto
1 parent 5034abbb
Showing 5 changed files with 20 additions and 3 deletions Show diff stats
app/views/catalog/index.rhtml
features/browse_catalogs.feature
features/signup.feature
features/step_definitions/noosfero_steps.rb
public/stylesheets/application.css
@@ -7,13 +7,15 @@
 <div class='l-sidebar-left-bar'>
   <ul>
-    <% if @categories.size > 0 %>
+    <% if @categories.present? %>
       <% @categories.each do |category| %>
         <%= category_link(category) %>
         <%= category_sub_links(category) %>
       <% end %>
+    <% elsif @category.present? %>
+      <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :id => 'catalog-categories-notice') %>
     <% else %>
-      <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :style => 'color: #555753; padding-bottom: 0.5em;') %>
+      <%= content_tag('li', _('There are no categories available.'), :id => 'catalog-categories-notice') %>
     <% end %>
   </ul>
 </div>
@@ -18,7 +18,7 @@ Feature: browse catalogs
   Scenario: display titles
     Then I should see "Associação de Artesanato de Bonito"
-    And I should see "Products/Services" within "#product-list"
+    And I should see "Products/Services"
   Scenario: display the simplest possible product
     Given the following products
@@ -3,6 +3,7 @@ Feature: signup
   I want to sign up to the site
   So I can have fun using its features
+@selenium
   Scenario: successfull registration
     Given I am on the homepage
     When I follow "Login"
@@ -13,6 +14,7 @@ Feature: signup
       | Password              | secret                |
       | Password confirmation | secret                |
       | 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
@@ -36,6 +38,7 @@ Feature: signup
     And I go to signup page
     Then I should be on Joao Silva's control panel
+  @selenium
   Scenario: user cannot register without a name
     Given I am on the homepage
     And I follow "Login"
@@ -44,6 +47,7 @@ Feature: signup
     And I fill in "Username" with "josesilva"
     And I fill in "Password" with "secret"
     And I fill in "Password confirmation" with "secret"
+    And wait for the captcha signup time
     And I press "Create my account"
     Then I should see "Name can't be blank"
@@ -538,6 +538,7 @@ end
 Then /^I should receive an e-mail on (.*)$/ do |address|
   last_mail = ActionMailer::Base.deliveries.last
+  last_mail.nil?.should be_false
   last_mail['to'].to_s.should == address
 end
@@ -748,3 +749,8 @@ Given /^the profile (.*) is configured to (.*) after login$/ do |profile, option
   profile.redirection_after_login = redirection
   profile.save
 end
+
+When /^wait for the captcha signup time$/ do
+  environment = Environment.default
+  sleep environment.min_signup_delay + 1
+end
@@ -2715,6 +2715,11 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   padding: 0;
 }
+#catalog-categories-notice {
+  color: #555753;
+  padding-bottom: 0.5em;
+}
+
 /* * * Show Product * * * * * * * * * * * * */
 .controller-catalog #show_product .product-pic {
	@@ -18,7 +18,7 @@ Feature: browse catalogs		@@ -18,7 +18,7 @@ Feature: browse catalogs
18		18
19	Scenario: display titles	19	Scenario: display titles
20	Then I should see "Associação de Artesanato de Bonito"	20	Then I should see "Associação de Artesanato de Bonito"
21	- And I should see "Products/Services" within "#product-list"	21	+ And I should see "Products/Services"
22		22
23	Scenario: display the simplest possible product	23	Scenario: display the simplest possible product
24	Given the following products	24	Given the following products
	@@ -538,6 +538,7 @@ end		@@ -538,6 +538,7 @@ end
538		538
539	Then /^I should receive an e-mail on (.*)$/ do \|address\|	539	Then /^I should receive an e-mail on (.*)$/ do \|address\|
540	last_mail = ActionMailer::Base.deliveries.last	540	last_mail = ActionMailer::Base.deliveries.last
		541	+ last_mail.nil?.should be_false
541	last_mail['to'].to_s.should == address	542	last_mail['to'].to_s.should == address
542	end	543	end
543		544
	@@ -748,3 +749,8 @@ Given /^the profile (.) is configured to (.) after login$/ do \|profile, option		@@ -748,3 +749,8 @@ Given /^the profile (.) is configured to (.) after login$/ do \|profile, option
748	profile.redirection_after_login = redirection	749	profile.redirection_after_login = redirection
749	profile.save	750	profile.save
750	end	751	end
		752	+
		753	+When /^wait for the captcha signup time$/ do
		754	+ environment = Environment.default
		755	+ sleep environment.min_signup_delay + 1
		756	+end