rails3: fix cucumber tests

Victor Costa
1 parent 00299ccc
Showing 11 changed files with 21 additions and 15 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/forms_helper.rb
app/models/members_block.rb
features/browse_catalogs.feature
features/caching.feature
features/online_manual.feature
features/profile_domain.feature
features/step_definitions/custom_web_steps.rb
features/step_definitions/noosfero_steps.rb
features/step_definitions/web_steps.rb
@@ -7,6 +7,7 @@ class ContentViewerController &lt; ApplicationController
  
   def view_page
     path = params[:page]
+    path = "#{path}.#{params[:format]}" if params[:format]
     @version = params[:version].to_i
  
     if path.blank?
@@ -37,7 +38,7 @@ class ContentViewerController &lt; ApplicationController
       end
     end
  
-    redirect_to_translation if @page.profile.redirect_l10n
+    redirect_to_translation and return if @page.profile.redirect_l10n
  
     if request.post?
       if @page.forum? && @page.has_terms_of_use && params[:terms_accepted] == "true"
@@ -114,7 +115,9 @@ class ContentViewerController &lt; ApplicationController
  
     if params[:slideshow]
       render :action => 'slideshow', :layout => 'slideshow'
+      return
     end
+    render :view_page, :formats => [:html]
   end
  
   def article_versions
@@ -1388,7 +1388,7 @@ module ApplicationHelper
     content_tag(:div, :class => 'errorExplanation', :id => 'errorExplanation') do
       content_tag(:h2, _('Errors while saving')) +
       content_tag(:ul) do
-        errors.map { |err| content_tag(:li, err) }
+        errors.map { |err| content_tag(:li, err) }.join
       end
     end
   end
@@ -41,6 +41,7 @@ module FormsHelper
       the_class << ' ' << html_options[:class]
     end
  
+    html_options.delete(:cancel)
     bt_submit = submit_tag(label, html_options.merge(:class => the_class))
  
     bt_submit + bt_cancel
 class MembersBlock < ProfileListBlock
   settings_items :show_join_leave_button, :type => :boolean, :default => false
  
+  attr_accessible :show_join_leave_button
+
   def self.description
     _('Members')
   end
@@ -17,7 +17,7 @@ Feature: browse catalogs
     And I am on /catalog/artebonito
  
   Scenario: display titles
-    Then I should see "Associação de Artesanato de Bonito"
+    Then the page title should be "Associação de Artesanato de Bonito - Colivre.net"
     And I should see "Products/Services"
  
   Scenario: display the simplest possible product
@@ -19,9 +19,9 @@ Feature: caching
       | mario | Post1 | Sample Blog  |
       | mario | Post2 | Sample Blog  |
     When I go to article "Sample Blog"
-    Then I should see "No comments yet"
+    Then I should see "no comments yet"
     When I follow "Português"
-    Then I should see "Sem comentários ainda"
+    Then I should see "sem comentários ainda"
  
   Scenario: blocks
     Given I am on Mario's homepage
@@ -30,15 +30,15 @@ Feature: online manual
  
   Scenario: adding title on browser
     When I go to /doc
-    Then I should see "Online Manual - Colivre.net"
+    Then the page title should be "Online Manual - Colivre.net"
  
   Scenario: adding title on browser in a section
     When I go to /doc
     And I follow "User features"
-    Then I should see "User features - Online Manual - Colivre.net"
+    Then the page title should be "User features - Online Manual - Colivre.net"
  
   Scenario: adding title on browser in a topic
     When I go to /doc
     And I follow "User features"
     And I follow "Commenting articles"
-    Then I should see "Commenting articles - User features - Online Manual - Colivre.net"
+    Then the page title should be "Commenting articles - User features - Online Manual - Colivre.net"
@@ -55,7 +55,7 @@ Feature: domain for profile
   Scenario: access community by domain
     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"
+    Then the page title should be "Sample Community - Colivre.net"
  
   # This test is not working because the community domain isn't at all different
   # from the environment (localhost / 127.0.0.1)
@@ -19,7 +19,7 @@ Then /^I should not see &quot;([^&quot;]*)&quot; link$/ do |text|
 end
  
 When /^I should see "([^\"]+)" linking to "([^\"]+)"$/ do |text, href|
-  page.should have_xpath("//a", :href => /#{href}/)
+  page.should have_xpath("//a[@href='#{href}']")
 end
  
 Then /^the "([^"]*)" button should be disabled$/ do |selector|
@@ -421,7 +421,7 @@ Given /^enterprise &quot;([^\&quot;]*)&quot; is disabled$/ do |enterprise_name|
 end
  
 Then /^the page title should be "(.*)"$/ do |text|
-  step %{I should see "#{text}" within "title"}
+  page.title.should == text
 end
  
 Then /^The page should contain "(.*)"$/ do |selector|
@@ -438,9 +438,9 @@ end
  
 Given /^the (.+) mail (?:is|has) (.+) (.+)$/ do |position, field, value|
   if(/^[0-9]+$/ =~ position)
-    ActionMailer::Base.deliveries[position.to_i][field] == value
+    ActionMailer::Base.deliveries[position.to_i][field].to_s == value
   else
-    ActionMailer::Base.deliveries.send(position)[field] == value
+    ActionMailer::Base.deliveries.send(position)[field].to_s == value
   end
 end
  
@@ -39,7 +39,7 @@ end
  
 When /^(?:|I )fill in "([^"]*)" with "([^"]*)"(?: within "([^"]*)")?$/ do |field, value, selector|
   with_scope(selector) do
-    fill_in(field, :with => value)
+    fill_in(field, :with => value, :match => :prefer_exact)
   end
 end
  
@@ -88,7 +88,7 @@ end
  
 When /^(?:|I )choose "([^"]*)"(?: within "([^"]*)")?$/ do |field, selector|
   with_scope(selector) do
-    choose(field)
+    choose(field, :match => :prefer_exact)
   end
 end
...	...	@@ -7,6 +7,7 @@ class ContentViewerController < ApplicationController
7	7
8	8	def view_page
9	9	path = params[:page]
	10	+ path = "#{path}.#{params[:format]}" if params[:format]
10	11	@version = params[:version].to_i
11	12
12	13	if path.blank?
...	...	@@ -37,7 +38,7 @@ class ContentViewerController < ApplicationController
37	38	end
38	39	end
39	40
40		- redirect_to_translation if @page.profile.redirect_l10n
	41	+ redirect_to_translation and return if @page.profile.redirect_l10n
41	42
42	43	if request.post?
43	44	if @page.forum? && @page.has_terms_of_use && params[:terms_accepted] == "true"
...	...	@@ -114,7 +115,9 @@ class ContentViewerController < ApplicationController
114	115
115	116	if params[:slideshow]
116	117	render :action => 'slideshow', :layout => 'slideshow'
	118	+ return
117	119	end
	120	+ render :view_page, :formats => [:html]
118	121	end
119	122
120	123	def article_versions
...	...
...	...	@@ -1388,7 +1388,7 @@ module ApplicationHelper
1388	1388	content_tag(:div, :class => 'errorExplanation', :id => 'errorExplanation') do
1389	1389	content_tag(:h2, _('Errors while saving')) +
1390	1390	content_tag(:ul) do
1391		- errors.map { \|err\| content_tag(:li, err) }
	1391	+ errors.map { \|err\| content_tag(:li, err) }.join
1392	1392	end
1393	1393	end
1394	1394	end
...	...
...	...	@@ -41,6 +41,7 @@ module FormsHelper
41	41	the_class << ' ' << html_options[:class]
42	42	end
43	43
	44	+ html_options.delete(:cancel)
44	45	bt_submit = submit_tag(label, html_options.merge(:class => the_class))
45	46
46	47	bt_submit + bt_cancel
...	...
1	1	class MembersBlock < ProfileListBlock
2	2	settings_items :show_join_leave_button, :type => :boolean, :default => false
3	3
	4	+ attr_accessible :show_join_leave_button
	5	+
4	6	def self.description
5	7	_('Members')
6	8	end
...	...
...	...	@@ -17,7 +17,7 @@ Feature: browse catalogs
17	17	And I am on /catalog/artebonito
18	18
19	19	Scenario: display titles
20		- Then I should see "Associação de Artesanato de Bonito"
	20	+ Then the page title should be "Associação de Artesanato de Bonito - Colivre.net"
21	21	And I should see "Products/Services"
22	22
23	23	Scenario: display the simplest possible product
...	...
...	...	@@ -19,9 +19,9 @@ Feature: caching
19	19	\| mario \| Post1 \| Sample Blog \|
20	20	\| mario \| Post2 \| Sample Blog \|
21	21	When I go to article "Sample Blog"
22		- Then I should see "No comments yet"
	22	+ Then I should see "no comments yet"
23	23	When I follow "Português"
24		- Then I should see "Sem comentários ainda"
	24	+ Then I should see "sem comentários ainda"
25	25
26	26	Scenario: blocks
27	27	Given I am on Mario's homepage
...	...
...	...	@@ -30,15 +30,15 @@ Feature: online manual
30	30
31	31	Scenario: adding title on browser
32	32	When I go to /doc
33		- Then I should see "Online Manual - Colivre.net"
	33	+ Then the page title should be "Online Manual - Colivre.net"
34	34
35	35	Scenario: adding title on browser in a section
36	36	When I go to /doc
37	37	And I follow "User features"
38		- Then I should see "User features - Online Manual - Colivre.net"
	38	+ Then the page title should be "User features - Online Manual - Colivre.net"
39	39
40	40	Scenario: adding title on browser in a topic
41	41	When I go to /doc
42	42	And I follow "User features"
43	43	And I follow "Commenting articles"
44		- Then I should see "Commenting articles - User features - Online Manual - Colivre.net"
	44	+ Then the page title should be "Commenting articles - User features - Online Manual - Colivre.net"
...	...
...	...	@@ -55,7 +55,7 @@ Feature: domain for profile
55	55	Scenario: access community by domain
56	56	Given I go to the search communities page
57	57	When I follow "Sample Community" within ".search-profile-item"
58		- Then the page title should be "Sample Community"
	58	+ Then the page title should be "Sample Community - Colivre.net"
59	59
60	60	# This test is not working because the community domain isn't at all different
61	61	# from the environment (localhost / 127.0.0.1)
...	...
...	...	@@ -19,7 +19,7 @@ Then /^I should not see "([^"]*)" link$/ do \|text\|
19	19	end
20	20
21	21	When /^I should see "([^\"]+)" linking to "([^\"]+)"$/ do \|text, href\|
22		- page.should have_xpath("//a", :href => /#{href}/)
	22	+ page.should have_xpath("//a[@href='#{href}']")
23	23	end
24	24
25	25	Then /^the "([^"]*)" button should be disabled$/ do \|selector\|
...	...
...	...	@@ -421,7 +421,7 @@ Given /^enterprise "([^\"]*)" is disabled$/ do \|enterprise_name\|
421	421	end
422	422
423	423	Then /^the page title should be "(.*)"$/ do \|text\|
424		- step %{I should see "#{text}" within "title"}
	424	+ page.title.should == text
425	425	end
426	426
427	427	Then /^The page should contain "(.*)"$/ do \|selector\|
...	...	@@ -438,9 +438,9 @@ end
438	438
439	439	Given /^the (.+) mail (?:is\|has) (.+) (.+)$/ do \|position, field, value\|
440	440	if(/^[0-9]+$/ =~ position)
441		- ActionMailer::Base.deliveries[position.to_i][field] == value
	441	+ ActionMailer::Base.deliveries[position.to_i][field].to_s == value
442	442	else
443		- ActionMailer::Base.deliveries.send(position)[field] == value
	443	+ ActionMailer::Base.deliveries.send(position)[field].to_s == value
444	444	end
445	445	end
446	446
...	...