Download as
Browse Code »

Commit e927bd9dc92908de72c9b0a865303cf8c15ea6ec

Authored by Daniela Feitosa
1 parent 7c81695b
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Fixed broken tests

Showing 2 changed files with 4 additions and 4 deletions   Show diff stats
test/functional/profile_controller_test.rb
  Diff comments   View file @e927bd9
@@ -154,7 +154,7 @@ class ProfileControllerTest < ActionController::TestCase @@ -154,7 +154,7 @@ class ProfileControllerTest < ActionController::TestCase
154 community = Community.create!(:name => 'my test community') 154 community = Community.create!(:name => 'my test community')
155 community.add_admin(@profile) 155 community.add_admin(@profile)
156 get :index, :profile => community.identifier 156 get :index, :profile => community.identifier
157 - assert_tag :tag => 'a', :attributes => { :href => /\/myprofile\/\{login\}/ }, :content => 'Control panel' 157 + assert_tag :tag => 'a', :attributes => { :href => /\/myprofile\/my-test-community/ }, :content => 'Control panel'
158 end 158 end
159 159
160 should 'show create community in own profile' do 160 should 'show create community in own profile' do
test/integration/manage_documents_test.rb
  Diff comments   View file @e927bd9
@@ -9,7 +9,7 @@ class ManageDocumentsTest < ActionController::IntegrationTest @@ -9,7 +9,7 @@ class ManageDocumentsTest < ActionController::IntegrationTest
9 user.activate 9 user.activate
10 10
11 login('myuser', 'myuser') 11 login('myuser', 'myuser')
12 - assert_tag :tag => 'a', :attributes => { :href => "#{user.environment.top_url}/myprofile\/{login}" } 12 + assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{user.login}" }
13 13
14 get '/myprofile/myuser' 14 get '/myprofile/myuser'
15 assert_response :success 15 assert_response :success
@@ -40,7 +40,7 @@ class ManageDocumentsTest < ActionController::IntegrationTest @@ -40,7 +40,7 @@ class ManageDocumentsTest < ActionController::IntegrationTest
40 article.save! 40 article.save!
41 41
42 login('myuser', 'myuser') 42 login('myuser', 'myuser')
43 - assert_tag :tag => 'a', :attributes => { :href => "#{profile.environment.top_url}\/myprofile\/{login}" } 43 + assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}" }
44 44
45 get '/myprofile/myuser' 45 get '/myprofile/myuser'
46 assert_response :success 46 assert_response :success
@@ -75,7 +75,7 @@ class ManageDocumentsTest < ActionController::IntegrationTest @@ -75,7 +75,7 @@ class ManageDocumentsTest < ActionController::IntegrationTest
75 75
76 login('myuser', 'myuser') 76 login('myuser', 'myuser')
77 77
78 - assert_tag :tag => 'a', :attributes => { :href => "#{profile.environment.top_url}\/myprofile\/{login}" } 78 + assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}" }
79 get '/myprofile/myuser' 79 get '/myprofile/myuser'
80 assert_response :success 80 assert_response :success
81 81