diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb index 37e484a..3de455d 100644 --- a/app/controllers/my_profile/cms_controller.rb +++ b/app/controllers/my_profile/cms_controller.rb @@ -63,6 +63,7 @@ class CmsController < MyProfileController end @article.parent = parent end + @article.profile = profile @article.last_changed_by = user if request.post? diff --git a/app/helpers/cms_helper.rb b/app/helpers/cms_helper.rb index 95f15e3..e699f51 100644 --- a/app/helpers/cms_helper.rb +++ b/app/helpers/cms_helper.rb @@ -15,7 +15,7 @@ module CmsHelper icon else if File.exists?(File.join(RAILS_ROOT, 'public', 'images', 'icons-mime', "#{icon}.png")) - "icons-mime/#{icon}" + "icons-mime/#{icon}.png" else "icons-mime/unknown.png" end diff --git a/app/models/uploaded_file.rb b/app/models/uploaded_file.rb index 430ba51..385bf4a 100644 --- a/app/models/uploaded_file.rb +++ b/app/models/uploaded_file.rb @@ -1,3 +1,7 @@ +# Article type that handles uploaded files. +# +# Limitation: only file metadata are versioned. Only the latest version +# of the file itself is kept. (FIXME?) class UploadedFile < Article # FIXME need to define min/max file size diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb index c06f4aa..279520a 100644 --- a/test/functional/cms_controller_test.rb +++ b/test/functional/cms_controller_test.rb @@ -169,7 +169,14 @@ class CmsControllerTest < Test::Unit::TestCase end should 'be able to update an uploaded file' do - flunk 'pending' + post :new, :type => UploadedFile.name, :profile => profile.identifier, :article => { :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain')} + + file = profile.articles.find(:first) + assert_equal 'test.txt', file.name + + post :edit, :profile => profile.identifier, :id => file.id, :article => { :uploaded_data => fixture_file_upload('/files/test.txt', 'text/plain')} + + assert_equal 2, file.versions(true).size end should 'offer to create children' do diff --git a/test/functional/enterprise_editor_controller_test.rb b/test/functional/enterprise_editor_controller_test.rb index a0bfc72..0ffc686 100644 --- a/test/functional/enterprise_editor_controller_test.rb +++ b/test/functional/enterprise_editor_controller_test.rb @@ -15,7 +15,7 @@ class EnterpriseEditorControllerTest < Test::Unit::TestCase ent1 = Enterprise.create!(:identifier => 'test_enterprise1', :name => 'Test enteprise1') get 'index', :profile => 'test_enterprise1' - assert_response :success + assert_response 403 assert_template 'access_denied.rhtml' end @@ -26,7 +26,7 @@ class EnterpriseEditorControllerTest < Test::Unit::TestCase get 'index', :profile => 'test_enterprise' - assert_response :success + assert_response 403 assert @controller.send(:profile) assert_equal ent.identifier, @controller.send(:profile).identifier assert_template 'access_denied.rhtml' diff --git a/test/functional/profile_members_controller_test.rb b/test/functional/profile_members_controller_test.rb index 178814c..d647700 100644 --- a/test/functional/profile_members_controller_test.rb +++ b/test/functional/profile_members_controller_test.rb @@ -18,7 +18,7 @@ class ProfileMembersControllerTest < Test::Unit::TestCase get 'index', :profile => 'test_enterprise' - assert_response :success + assert_response 403 assert_template 'access_denied.rhtml' end -- libgit2 0.21.2