diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb index 1853b33..e15cca6 100644 --- a/test/functional/profile_controller_test.rb +++ b/test/functional/profile_controller_test.rb @@ -156,7 +156,7 @@ class ProfileControllerTest < Test::Unit::TestCase community = Community.create!(:name => 'my test community') community.add_admin(@profile) get :index, :profile => community.identifier - assert_tag :tag => 'a', :attributes => { :href => /\/myprofile\/%\{login\}/ }, :content => 'Control panel' + assert_tag :tag => 'a', :attributes => { :href => /\/myprofile\/\{login\}/ }, :content => 'Control panel' end should 'show create community in own profile' do diff --git a/test/integration/manage_documents_test.rb b/test/integration/manage_documents_test.rb index 44fcd31..0ebc70f 100644 --- a/test/integration/manage_documents_test.rb +++ b/test/integration/manage_documents_test.rb @@ -8,7 +8,7 @@ class ManageDocumentsTest < ActionController::IntegrationTest create_user('myuser') login('myuser', 'myuser') - assert_tag :tag => 'a', :attributes => { :href => '/myprofile/%{login}' } + assert_tag :tag => 'a', :attributes => { :href => '/myprofile/{login}' } get '/myprofile/myuser' assert_response :success @@ -38,7 +38,7 @@ class ManageDocumentsTest < ActionController::IntegrationTest article.save! login('myuser', 'myuser') - assert_tag :tag => 'a', :attributes => { :href => '/myprofile/%{login}' } + assert_tag :tag => 'a', :attributes => { :href => '/myprofile/{login}' } get '/myprofile/myuser' assert_response :success @@ -72,7 +72,7 @@ class ManageDocumentsTest < ActionController::IntegrationTest login('myuser', 'myuser') - assert_tag :tag => 'a', :attributes => { :href => '/myprofile/%{login}' } + assert_tag :tag => 'a', :attributes => { :href => '/myprofile/{login}' } get '/myprofile/myuser' assert_response :success diff --git a/test/unit/events_helper_test.rb b/test/unit/events_helper_test.rb index e9f06b0..73e75d9 100644 --- a/test/unit/events_helper_test.rb +++ b/test/unit/events_helper_test.rb @@ -5,10 +5,11 @@ class EventsHelperTest < Test::Unit::TestCase include EventsHelper should 'list events' do + stubs(:user) expects(:show_date).returns('') expects(:_).with('Events for %s').returns('') - event1 = mock; event1.expects(:public?).returns(true); event1.expects(:name).returns('Event 1'); event1.expects(:url).returns({}) - event2 = mock; event2.expects(:public?).returns(true); event2.expects(:name).returns('Event 2'); event2.expects(:url).returns({}) + event1 = mock; event1.expects(:display_to?).with(anything).returns(true); event1.expects(:name).returns('Event 1'); event1.expects(:url).returns({}) + event2 = mock; event2.expects(:display_to?).with(anything).returns(true); event2.expects(:name).returns('Event 2'); event2.expects(:url).returns({}) result = list_events('', [event1, event2]) assert_match /Event 1/, result assert_match /Event 2/, result -- libgit2 0.21.2