diff options
author | Felipe Artur <felipefac@gmail.com> | 2018-05-09 15:27:01 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2018-05-09 15:27:01 -0300 |
commit | 1348d130e9823aad2d8a1ed2d39f2613d0223b1f (patch) | |
tree | fbdee07de976aab2c6ac6af7c403227ad848b6f5 | |
parent | 0f4d9f7c621ed95da8000b27d47e2388d98d9f49 (diff) | |
download | gitlab-ce-1348d130e9823aad2d8a1ed2d39f2613d0223b1f.tar.gz |
Fix 500 on diff_file_entity and some feature specs
-rw-r--r-- | app/serializers/diff_file_entity.rb | 4 | ||||
-rw-r--r-- | spec/features/merge_request/user_uses_slash_commands_spec.rb | 33 |
2 files changed, 29 insertions, 8 deletions
diff --git a/app/serializers/diff_file_entity.rb b/app/serializers/diff_file_entity.rb index 86c2edd331e..c7e059a96a9 100644 --- a/app/serializers/diff_file_entity.rb +++ b/app/serializers/diff_file_entity.rb @@ -99,11 +99,11 @@ class DiffFileEntity < Grape::Entity options) end - expose :fork_path, if: -> (_, options) { options[:merge_request] } do |diff_file| + expose :fork_path, if: -> (_, options) { options[:merge_request] && current_user } do |diff_file| merge_request = options[:merge_request] params = edit_blob_fork_params("Edit") - project_forks_path(merge_request.project, namespace_key: request.current_user.namespace.id, continue: params) + project_forks_path(merge_request.project, namespace_key: current_user.namespace.id, continue: params) end expose :view_path, if: -> (_, options) { options[:merge_request] } do |diff_file| diff --git a/spec/features/merge_request/user_uses_slash_commands_spec.rb b/spec/features/merge_request/user_uses_slash_commands_spec.rb index 7f261b580f7..83ad4b45b5a 100644 --- a/spec/features/merge_request/user_uses_slash_commands_spec.rb +++ b/spec/features/merge_request/user_uses_slash_commands_spec.rb @@ -22,16 +22,24 @@ describe 'Merge request > User uses quick actions', :js do before do project.add_master(user) - sign_in(user) - visit project_merge_request_path(project, merge_request) end describe 'time tracking' do + before do + sign_in(user) + visit project_merge_request_path(project, merge_request) + end + it_behaves_like 'issuable time tracker' end describe 'toggling the WIP prefix in the title from note' do context 'when the current user can toggle the WIP prefix' do + before do + sign_in(user) + visit project_merge_request_path(project, merge_request) + end + it 'adds the WIP: prefix to the title' do add_note("/wip") @@ -56,7 +64,6 @@ describe 'Merge request > User uses quick actions', :js do context 'when the current user cannot toggle the WIP prefix' do before do project.add_guest(guest) - sign_out(:user) sign_in(guest) visit project_merge_request_path(project, merge_request) end @@ -74,6 +81,11 @@ describe 'Merge request > User uses quick actions', :js do describe 'merging the MR from the note' do context 'when the current user can merge the MR' do + before do + sign_in(user) + visit project_merge_request_path(project, merge_request) + end + it 'merges the MR' do add_note("/merge") @@ -87,6 +99,8 @@ describe 'Merge request > User uses quick actions', :js do before do merge_request.source_branch = 'another_branch' merge_request.save + sign_in(user) + visit project_merge_request_path(project, merge_request) end it 'does not merge the MR' do @@ -101,7 +115,6 @@ describe 'Merge request > User uses quick actions', :js do context 'when the current user cannot merge the MR' do before do project.add_guest(guest) - sign_out(:user) sign_in(guest) visit project_merge_request_path(project, merge_request) end @@ -117,6 +130,11 @@ describe 'Merge request > User uses quick actions', :js do end describe 'adding a due date from note' do + before do + sign_in(user) + visit project_merge_request_path(project, merge_request) + end + it 'does not recognize the command nor create a note' do add_note('/due 2016-08-28') @@ -129,7 +147,6 @@ describe 'Merge request > User uses quick actions', :js do let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } } before do - sign_out(:user) another_project.add_master(user) sign_in(user) end @@ -161,6 +178,11 @@ describe 'Merge request > User uses quick actions', :js do describe '/target_branch command from note' do context 'when the current user can change target branch' do + before do + sign_in(user) + visit project_merge_request_path(project, merge_request) + end + it 'changes target branch from a note' do add_note("message start \n/target_branch merge-test\n message end.") @@ -184,7 +206,6 @@ describe 'Merge request > User uses quick actions', :js do context 'when current user can not change target branch' do before do project.add_guest(guest) - sign_out(:user) sign_in(guest) visit project_merge_request_path(project, merge_request) end |