Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #421 from abf/rosa-build:420-admin-should-be-able-to-remove-files 

#420: Admin should be able to remove files by using Platforms::ContentsController
This commit is contained in:
avokhmin 2014-08-20 22:16:54 +04:00
parent 6fb8fb92c4 beb3b45ebd
commit b5ad89f9a8
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/ability.rb
View File

@ -114,8 +114,8 @@ class Ability
can [:read, :related, :members], Platform, owner_type: 'Group', owner_id: user_group_ids can [:read, :related, :members], Platform, owner_type: 'Group', owner_id: user_group_ids
can([:read, :related, :members], Platform, read_relations_for('platforms')) {|platform| local_reader? platform} can([:read, :related, :members], Platform, read_relations_for('platforms')) {|platform| local_reader? platform}
can [:read, :related], Platform, id: user.repositories.pluck(:platform_id) can [:read, :related], Platform, id: user.repositories.pluck(:platform_id)
can([:update, :destroy, :change_visibility, :remove_file], Platform) {|platform| owner?(platform) } can([:update, :destroy, :change_visibility], Platform) {|platform| owner?(platform) }
can([:local_admin_manage, :members, :add_member, :remove_member, :remove_members] , Platform) {|platform| owner?(platform) || local_admin?(platform) } can([:local_admin_manage, :members, :add_member, :remove_member, :remove_members, :remove_file] , Platform) {|platform| owner?(platform) || local_admin?(platform) }
can([:create, :publish], MassBuild) {|mass_build| owner?(mass_build.save_to_platform) || local_admin?(mass_build.save_to_platform)} can([:create, :publish], MassBuild) {|mass_build| owner?(mass_build.save_to_platform) || local_admin?(mass_build.save_to_platform)}
can(:cancel, MassBuild) {|mass_build| (owner?(mass_build.save_to_platform) || local_admin?(mass_build.save_to_platform)) && !mass_build.stop_build} can(:cancel, MassBuild) {|mass_build| (owner?(mass_build.save_to_platform) || local_admin?(mass_build.save_to_platform)) && !mass_build.stop_build}

25
spec/controllers/platforms/contents_controller_spec.rb
View File

@ -28,7 +28,7 @@ shared_examples_for 'content platform user with show rights' do
end end
end end
shared_examples_for 'content platform user without owner rights' do shared_examples_for 'content platform user without member rights' do
it 'should not be able to perform remove_file action for main platform' do it 'should not be able to perform remove_file action for main platform' do
get :remove_file, platform_id: @platform, path: '/test' get :remove_file, platform_id: @platform, path: '/test'
response.should_not be_success response.should_not be_success
@ -40,7 +40,7 @@ shared_examples_for 'content platform user without owner rights' do
end end
end end
shared_examples_for 'content platform user with owner rights' do shared_examples_for 'content platform user with member rights' do
before do before do
allow(PlatformContent).to receive(:remove_file) allow(PlatformContent).to receive(:remove_file)
end end
@ -80,7 +80,7 @@ describe Platforms::ContentsController do
it_should_behave_like 'content platform user with show rights' if APP_CONFIG['anonymous_access'] it_should_behave_like 'content platform user with show rights' if APP_CONFIG['anonymous_access']
it_should_behave_like 'content platform user without show rights for hidden platform' it_should_behave_like 'content platform user without show rights for hidden platform'
it_should_behave_like 'content platform user without owner rights' it_should_behave_like 'content platform user without member rights'
end end
context 'for global admin' do context 'for global admin' do
@ -90,20 +90,7 @@ describe Platforms::ContentsController do
it_should_behave_like 'content platform user with show rights' it_should_behave_like 'content platform user with show rights'
it_should_behave_like 'content platform user with show rights for hidden platform' it_should_behave_like 'content platform user with show rights for hidden platform'
it_should_behave_like 'content platform user with owner rights' it_should_behave_like 'content platform user with member rights'
end
context 'for owner user' do
before do
http_login(@user)
allow(Platform).to receive(:find).and_return(@platform)
allow(@platform).to receive(:owner).and_return(@user)
create_relation(@platform, @user, 'admin')
end
it_should_behave_like 'content platform user with show rights'
it_should_behave_like 'content platform user with show rights for hidden platform'
it_should_behave_like 'content platform user with owner rights'
end end
context 'for member of platform' do context 'for member of platform' do
@ -115,7 +102,7 @@ describe Platforms::ContentsController do
it_should_behave_like 'content platform user with show rights' it_should_behave_like 'content platform user with show rights'
it_should_behave_like 'content platform user with show rights for hidden platform' it_should_behave_like 'content platform user with show rights for hidden platform'
it_should_behave_like 'content platform user without owner rights' it_should_behave_like 'content platform user with member rights'
end end
context 'for simple user' do context 'for simple user' do
@ -125,7 +112,7 @@ describe Platforms::ContentsController do
it_should_behave_like 'content platform user with show rights' it_should_behave_like 'content platform user with show rights'
it_should_behave_like 'content platform user without show rights for hidden platform' it_should_behave_like 'content platform user without show rights for hidden platform'
it_should_behave_like 'content platform user without owner rights' it_should_behave_like 'content platform user without member rights'
end end
end end