Merge branch 'stable'

Conflicts: config/environments/cucumber.rb features/step_definitions/noosfero_steps.rb features/step_definitions/webrat_steps.rb features/support/paths.rb

Merge branch 'stable'
Conflicts: config/environments/cucumber.rb features/step_definitions/noosfero_steps.rb features/step_definitions/webrat_steps.rb features/support/paths.rb
Antonio Terceiro
2 parents 92eef4c0 1f072e5a
Showing 4 changed files with 22 additions and 8 deletions Show diff stats
features/step_definitions/custom_webrat_steps.rb
features/step_definitions/noosfero_steps.rb
features/step_definitions/webrat_steps.rb
features/support/paths.rb
@@ -0,0 +1,8 @@
+When /^I should see "([^\"]+)" link$/ do |link|
+  response.should have_selector("a", :content => link)
+end
+
+When /^I should not see "([^\"]+)" link$/ do |link|
+  response.should_not have_selector("a", :content => link)
+end
+
@@ -78,7 +78,7 @@ Given /^I am logged in as admin$/ do
   click_button("Log in")
 end
  
-Given /^I am not logged in$/ do |username|
+Given /^I am not logged in$/ do
   visit('/account/logout')
 end
  
@@ -93,3 +93,7 @@ Given /^feature &quot;(.+)&quot; is disabled on environment$/ do |feature|
    e.disable(feature)
    e.save
 end
+
+Given /^"(.+)" should be a member of "(.+)"$/ do |person,profile|
+  Profile.find_by_name(profile).members.should include(Person.find_by_name(person))
+end
@@ -188,10 +188,3 @@ Then /^show me the page$/ do
   save_and_open_page
 end
  
-When /^I should see "([^\"]+)" link$/ do |link|
-  response.should have_selector("a", :content => link)
-end
-
-When /^I should not see "([^\"]+)" link$/ do |link|
-  response.should_not have_selector("a", :content => link)
-end
@@ -23,6 +23,15 @@ module NavigationHelpers
       block = BlogArchivesBlock.find(:all).select{|i| i.owner == owner}.first
       "/myprofile/#{$1}/profile_design/edit/#{block.id}"
  
+    when /^(.*)'s homepage$/
+      '/%s' % Profile.find_by_name($1).identifier
+
+    when /^login page$/
+      '/account/login'
+
+    when /^(.*)'s control panel$/
+      '/myprofile/%s' % Profile.find_by_name($1).identifier
+
     # Add more mappings here.
     # Here is a more fancy example:
     #
...	...	@@ -0,0 +1,8 @@
	1	+When /^I should see "([^\"]+)" link$/ do \|link\|
	2	+ response.should have_selector("a", :content => link)
	3	+end
	4	+
	5	+When /^I should not see "([^\"]+)" link$/ do \|link\|
	6	+ response.should_not have_selector("a", :content => link)
	7	+end
	8	+
...	...
...	...	@@ -78,7 +78,7 @@ Given /^I am logged in as admin$/ do
78	78	click_button("Log in")
79	79	end
80	80
81		-Given /^I am not logged in$/ do \|username\|
	81	+Given /^I am not logged in$/ do
82	82	visit('/account/logout')
83	83	end
84	84
...	...	@@ -93,3 +93,7 @@ Given /^feature "(.+)" is disabled on environment$/ do \|feature\|
93	93	e.disable(feature)
94	94	e.save
95	95	end
	96	+
	97	+Given /^"(.+)" should be a member of "(.+)"$/ do \|person,profile\|
	98	+ Profile.find_by_name(profile).members.should include(Person.find_by_name(person))
	99	+end
...	...
...	...	@@ -188,10 +188,3 @@ Then /^show me the page$/ do
188	188	save_and_open_page
189	189	end
190	190
191		-When /^I should see "([^\"]+)" link$/ do \|link\|
192		- response.should have_selector("a", :content => link)
193		-end
194		-
195		-When /^I should not see "([^\"]+)" link$/ do \|link\|
196		- response.should_not have_selector("a", :content => link)
197		-end
...	...
...	...	@@ -23,6 +23,15 @@ module NavigationHelpers
23	23	block = BlogArchivesBlock.find(:all).select{\|i\| i.owner == owner}.first
24	24	"/myprofile/#{$1}/profile_design/edit/#{block.id}"
25	25
	26	+ when /^(.*)'s homepage$/
	27	+ '/%s' % Profile.find_by_name($1).identifier
	28	+
	29	+ when /^login page$/
	30	+ '/account/login'
	31	+
	32	+ when /^(.*)'s control panel$/
	33	+ '/myprofile/%s' % Profile.find_by_name($1).identifier
	34	+
26	35	# Add more mappings here.
27	36	# Here is a more fancy example:
28	37	#
...	...