diff options
Diffstat (limited to 'test/functional/repositories_cvs_controller_test.rb')
| -rw-r--r-- | test/functional/repositories_cvs_controller_test.rb | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb index a3de673dc..2ad9b856a 100644 --- a/test/functional/repositories_cvs_controller_test.rb +++ b/test/functional/repositories_cvs_controller_test.rb @@ -43,15 +43,14 @@ class RepositoriesCvsControllerTest < ActionController::TestCase end if File.directory?(REPOSITORY_PATH) - def test_get_edit + def test_get_new @request.session[:user_id] = 1 @project.repository.destroy - xhr :get, :edit, :id => 'subproject1', :repository_scm => 'Cvs' + get :new, :project_id => 'subproject1', :repository_scm => 'Cvs' assert_response :success - assert_equal 'text/javascript', @response.content_type + assert_template 'new' assert_kind_of Repository::Cvs, assigns(:repository) assert assigns(:repository).new_record? - assert_select_rjs :replace_html, 'tab-content-repository' end def test_browse_root @@ -247,7 +246,9 @@ class RepositoriesCvsControllerTest < ActionController::TestCase @project.reload assert_equal NUM_REV, @repository.changesets.count - get :destroy, :id => PRJ_ID + assert_difference 'Repository.count', -1 do + delete :destroy, :id => @repository.id + end assert_response 302 @project.reload assert_nil @project.repository @@ -255,28 +256,20 @@ class RepositoriesCvsControllerTest < ActionController::TestCase def test_destroy_invalid_repository @request.session[:user_id] = 1 # admin - assert_equal 0, @repository.changesets.count - @repository.fetch_changesets - @project.reload - assert_equal NUM_REV, @repository.changesets.count - - get :destroy, :id => PRJ_ID - assert_response 302 - @project.reload - assert_nil @project.repository - - @repository = Repository::Cvs.create( + @project.repository.destroy + @repository = Repository::Cvs.create!( :project => Project.find(PRJ_ID), :root_url => "/invalid", :url => MODULE_NAME, :log_encoding => 'UTF-8' ) - assert @repository @repository.fetch_changesets @project.reload assert_equal 0, @repository.changesets.count - get :destroy, :id => PRJ_ID + assert_difference 'Repository.count', -1 do + delete :destroy, :id => @repository.id + end assert_response 302 @project.reload assert_nil @project.repository |