Commit 16d420879ab8340e1a8e11bf23f0df99526c6f90
1 parent
dd2f1495
Exists in
master
and in
29 other branches
rails3: fix cucumber tests related to profile link
Showing
3 changed files
with
3 additions
and
3 deletions
Show diff stats
app/models/environment.rb
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | # domains. | 3 | # domains. |
4 | class Environment < ActiveRecord::Base | 4 | class Environment < ActiveRecord::Base |
5 | 5 | ||
6 | - attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features | 6 | + attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login |
7 | 7 | ||
8 | has_many :users | 8 | has_many :users |
9 | 9 |
features/forum.feature
@@ -165,4 +165,4 @@ Feature: forum | @@ -165,4 +165,4 @@ Feature: forum | ||
165 | | article | author | title | body | | 165 | | article | author | title | body | |
166 | | Post one | joaosilva | Hi all | Hi all | | 166 | | Post one | joaosilva | Hi all | Hi all | |
167 | When I go to /joaosilva/forum | 167 | When I go to /joaosilva/forum |
168 | - Then I should see "Joao" linking to "http://localhost/joaosilva" | 168 | + Then I should see "Joao" linking to "http://localhost/joaosilva/" |
features/support/paths.rb
@@ -40,7 +40,7 @@ module NavigationHelpers | @@ -40,7 +40,7 @@ module NavigationHelpers | ||
40 | "/myprofile/#{$2}/profile_design/edit/#{block.id}" | 40 | "/myprofile/#{$2}/profile_design/edit/#{block.id}" |
41 | 41 | ||
42 | when /^(.*)'s homepage$/ | 42 | when /^(.*)'s homepage$/ |
43 | - '/' + profile_identifier($1) | 43 | + '/' + profile_identifier($1) + '/' |
44 | 44 | ||
45 | when /^(.*)'s blog$/ | 45 | when /^(.*)'s blog$/ |
46 | '/%s/blog' % profile_identifier($1) | 46 | '/%s/blog' % profile_identifier($1) |