diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/functional/wiki_controller_test.rb | 24 | ||||
-rw-r--r-- | test/unit/wiki_content_test.rb | 24 | ||||
-rw-r--r-- | test/unit/wiki_content_version_test.rb | 18 | ||||
-rw-r--r-- | test/unit/wiki_page_test.rb | 2 |
4 files changed, 34 insertions, 34 deletions
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb index 98d076cbd..7260d9094 100644 --- a/test/functional/wiki_controller_test.rb +++ b/test/functional/wiki_controller_test.rb @@ -336,7 +336,7 @@ class WikiControllerTest < Redmine::ControllerTest @request.session[:user_id] = 2 assert_no_difference 'WikiPage.count' do assert_no_difference 'WikiContent.count' do - assert_difference 'WikiContent::Version.count' do + assert_difference 'WikiContentVersion.count' do put :update, :params => { :project_id => 1, :id => 'Another_page', @@ -361,7 +361,7 @@ class WikiControllerTest < Redmine::ControllerTest @request.session[:user_id] = 2 assert_no_difference 'WikiPage.count' do assert_no_difference 'WikiContent.count' do - assert_difference 'WikiContent::Version.count' do + assert_difference 'WikiContentVersion.count' do put :update, :params => { :project_id => 1, :id => 'Another_page', @@ -388,7 +388,7 @@ class WikiControllerTest < Redmine::ControllerTest @request.session[:user_id] = 2 assert_no_difference 'WikiPage.count' do assert_no_difference 'WikiContent.count' do - assert_no_difference 'WikiContent::Version.count' do + assert_no_difference 'WikiContentVersion.count' do put :update, :params => { :project_id => 1, :id => 'Another_page', @@ -414,7 +414,7 @@ class WikiControllerTest < Redmine::ControllerTest @request.session[:user_id] = 2 assert_no_difference 'WikiPage.count' do assert_no_difference 'WikiContent.count' do - assert_no_difference 'WikiContent::Version.count' do + assert_no_difference 'WikiContentVersion.count' do put :update, :params => { :project_id => 1, :id => 'Another_page', @@ -437,7 +437,7 @@ class WikiControllerTest < Redmine::ControllerTest @request.session[:user_id] = 2 assert_no_difference 'WikiPage.count' do assert_no_difference 'WikiContent.count' do - assert_no_difference 'WikiContent::Version.count' do + assert_no_difference 'WikiContentVersion.count' do assert_difference 'Attachment.count' do put :update, :params => { :project_id => 1, @@ -466,7 +466,7 @@ class WikiControllerTest < Redmine::ControllerTest assert_no_difference 'WikiPage.count' do assert_no_difference 'WikiContent.count' do - assert_no_difference 'WikiContent::Version.count' do + assert_no_difference 'WikiContentVersion.count' do put :update, :params => { :project_id => 1, :id => 'Another_page', @@ -514,7 +514,7 @@ class WikiControllerTest < Redmine::ControllerTest assert_no_difference 'WikiPage.count' do assert_no_difference 'WikiContent.count' do - assert_difference 'WikiContent::Version.count' do + assert_difference 'WikiContentVersion.count' do put :update, :params => { :project_id => 1, :id => 'Page_with_sections', @@ -540,7 +540,7 @@ class WikiControllerTest < Redmine::ControllerTest assert_no_difference 'WikiPage.count' do assert_no_difference 'WikiContent.count' do - assert_difference 'WikiContent::Version.count' do + assert_difference 'WikiContentVersion.count' do put :update, :params => { :project_id => 1, :id => 'Page_with_sections', @@ -565,7 +565,7 @@ class WikiControllerTest < Redmine::ControllerTest assert_no_difference 'WikiPage.count' do assert_no_difference 'WikiContent.count' do - assert_no_difference 'WikiContent::Version.count' do + assert_no_difference 'WikiContentVersion.count' do put :update, :params => { :project_id => 1, :id => 'Page_with_sections', @@ -652,7 +652,7 @@ class WikiControllerTest < Redmine::ControllerTest def test_diff content = WikiPage.find(1).content - assert_difference 'WikiContent::Version.count', 2 do + assert_difference 'WikiContentVersion.count', 2 do content.text = "Line removed\nThis is a sample text for testing diffs" content.save! content.text = "This is a sample text for testing diffs\nLine added" @@ -893,7 +893,7 @@ class WikiControllerTest < Redmine::ControllerTest def test_destroy_version @request.session[:user_id] = 2 - assert_difference 'WikiContent::Version.count', -1 do + assert_difference 'WikiContentVersion.count', -1 do assert_no_difference 'WikiContent.count' do assert_no_difference 'WikiPage.count' do delete :destroy_version, :params => {:project_id => 'ecookbook', :id => 'CookBook_documentation', :version => 2} @@ -905,7 +905,7 @@ class WikiControllerTest < Redmine::ControllerTest def test_destroy_invalid_version_should_respond_with_404 @request.session[:user_id] = 2 - assert_no_difference 'WikiContent::Version.count' do + assert_no_difference 'WikiContentVersion.count' do assert_no_difference 'WikiContent.count' do assert_no_difference 'WikiPage.count' do delete :destroy_version, :params => {:project_id => 'ecookbook', :id => 'CookBook_documentation', :version => 99} diff --git a/test/unit/wiki_content_test.rb b/test/unit/wiki_content_test.rb index 8f9678b91..d3cb74427 100644 --- a/test/unit/wiki_content_test.rb +++ b/test/unit/wiki_content_test.rb @@ -61,14 +61,14 @@ class WikiContentTest < ActiveSupport::TestCase content = @page.content version_count = content.version content.text = "My new content" - assert_difference 'WikiContent::Version.count' do + assert_difference 'WikiContentVersion.count' do assert content.save end content.reload assert_equal version_count+1, content.version assert_equal version_count+1, content.versions.length - version = WikiContent::Version.order('id DESC').first + version = WikiContentVersion.order('id DESC').first assert_equal @page.id, version.page_id assert_equal '', version.compression assert_equal "My new content", version.data @@ -79,12 +79,12 @@ class WikiContentTest < ActiveSupport::TestCase with_settings :wiki_compression => 'gzip' do content = @page.content content.text = "My new content" - assert_difference 'WikiContent::Version.count' do + assert_difference 'WikiContentVersion.count' do assert content.save end end - version = WikiContent::Version.order('id DESC').first + version = WikiContentVersion.order('id DESC').first assert_equal @page.id, version.page_id assert_equal 'gzip', version.compression assert_not_equal "My new content", version.data @@ -127,39 +127,39 @@ class WikiContentTest < ActiveSupport::TestCase end def test_previous_for_first_version_should_return_nil - content = WikiContent::Version.find_by_page_id_and_version(1, 1) + content = WikiContentVersion.find_by_page_id_and_version(1, 1) assert_nil content.previous end def test_previous_for_version_should_return_previous_version - content = WikiContent::Version.find_by_page_id_and_version(1, 3) + content = WikiContentVersion.find_by_page_id_and_version(1, 3) assert_not_nil content.previous assert_equal 2, content.previous.version end def test_previous_for_version_with_gap_should_return_previous_available_version - WikiContent::Version.find_by_page_id_and_version(1, 2).destroy + WikiContentVersion.find_by_page_id_and_version(1, 2).destroy - content = WikiContent::Version.find_by_page_id_and_version(1, 3) + content = WikiContentVersion.find_by_page_id_and_version(1, 3) assert_not_nil content.previous assert_equal 1, content.previous.version end def test_next_for_last_version_should_return_nil - content = WikiContent::Version.find_by_page_id_and_version(1, 3) + content = WikiContentVersion.find_by_page_id_and_version(1, 3) assert_nil content.next end def test_next_for_version_should_return_next_version - content = WikiContent::Version.find_by_page_id_and_version(1, 1) + content = WikiContentVersion.find_by_page_id_and_version(1, 1) assert_not_nil content.next assert_equal 2, content.next.version end def test_next_for_version_with_gap_should_return_next_available_version - WikiContent::Version.find_by_page_id_and_version(1, 2).destroy + WikiContentVersion.find_by_page_id_and_version(1, 2).destroy - content = WikiContent::Version.find_by_page_id_and_version(1, 1) + content = WikiContentVersion.find_by_page_id_and_version(1, 1) assert_not_nil content.next assert_equal 3, content.next.version end diff --git a/test/unit/wiki_content_version_test.rb b/test/unit/wiki_content_version_test.rb index d6fe0a556..9252e3a9c 100644 --- a/test/unit/wiki_content_version_test.rb +++ b/test/unit/wiki_content_version_test.rb @@ -24,24 +24,24 @@ class WikiContentVersionTest < ActiveSupport::TestCase end def test_should_respond_to_attachments - v = WikiContent::Version.find(2) + v = WikiContentVersion.find(2) assert v.respond_to?(:attachments) end def test_destroy - v = WikiContent::Version.find(2) + v = WikiContentVersion.find(2) - assert_difference 'WikiContent::Version.count', -1 do + assert_difference 'WikiContentVersion.count', -1 do v.destroy end end def test_destroy_last_version_should_revert_content - v = WikiContent::Version.find(3) + v = WikiContentVersion.find(3) assert_no_difference 'WikiPage.count' do assert_no_difference 'WikiContent.count' do - assert_difference 'WikiContent::Version.count', -1 do + assert_difference 'WikiContentVersion.count', -1 do assert v.destroy end end @@ -57,13 +57,13 @@ class WikiContentVersionTest < ActiveSupport::TestCase end def test_destroy_all_versions_should_delete_page - WikiContent::Version.find(1).destroy - WikiContent::Version.find(2).destroy - v = WikiContent::Version.find(3) + WikiContentVersion.find(1).destroy + WikiContentVersion.find(2).destroy + v = WikiContentVersion.find(3) assert_difference 'WikiPage.count', -1 do assert_difference 'WikiContent.count', -1 do - assert_difference 'WikiContent::Version.count', -1 do + assert_difference 'WikiContentVersion.count', -1 do assert v.destroy end end diff --git a/test/unit/wiki_page_test.rb b/test/unit/wiki_page_test.rb index cbd292285..21744572c 100644 --- a/test/unit/wiki_page_test.rb +++ b/test/unit/wiki_page_test.rb @@ -145,7 +145,7 @@ class WikiPageTest < ActiveSupport::TestCase assert_nil WikiPage.find_by_id(1) # make sure that page content and its history are deleted assert_equal 0, WikiContent.where(:page_id => 1).count - assert_equal 0, WikiContent.versioned_class.where(:page_id => 1).count + assert_equal 0, WikiContentVersion.where(:page_id => 1).count end def test_destroy_should_not_nullify_children |