diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-14 13:11:19 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-04-14 13:11:19 -0500 |
| commit | 735ca70120fc5a452fc3a025a7f8fad000fa7782 (patch) | |
| tree | 5eb52b38899b7e2434f2736f9e110e0c13b7c2d4 | |
| parent | d33ee6861c7656e2b47fe3eb097ecdf8d66fd42b (diff) | |
| download | gitlab-ce-dm-fix-editing-files-on-forks.tar.gz | |
Fix specsdm-fix-editing-files-on-forks
| -rw-r--r-- | app/services/commits/create_service.rb | 4 | ||||
| -rw-r--r-- | spec/requests/api/files_spec.rb | 6 | ||||
| -rw-r--r-- | spec/requests/api/v3/files_spec.rb | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/app/services/commits/create_service.rb b/app/services/commits/create_service.rb index 9e1571dd9f1..c58f04a252b 100644 --- a/app/services/commits/create_service.rb +++ b/app/services/commits/create_service.rb @@ -14,9 +14,9 @@ module Commits def execute validate! - create_commit! + new_commit = create_commit! - success + success(result: new_commit) rescue ValidationError, ChangeError, Gitlab::Git::Index::IndexError, Repository::CommitError, GitHooksService::PreReceiveError => ex error(ex.message) end diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb index 8012530f139..6db2faed76b 100644 --- a/spec/requests/api/files_spec.rb +++ b/spec/requests/api/files_spec.rb @@ -205,7 +205,7 @@ describe API::Files, api: true do it "returns a 400 if editor fails to create file" do allow_any_instance_of(Repository).to receive(:create_file). - and_return(false) + and_raise(Repository::CommitError, 'Cannot create file') post api(route("any%2Etxt"), user), valid_params @@ -299,8 +299,8 @@ describe API::Files, api: true do expect(response).to have_http_status(400) end - it "returns a 400 if fails to create file" do - allow_any_instance_of(Repository).to receive(:delete_file).and_return(false) + it "returns a 400 if fails to delete file" do + allow_any_instance_of(Repository).to receive(:delete_file).and_raise(Repository::CommitError, 'Cannot delete file') delete api(route(file_path), user), valid_params diff --git a/spec/requests/api/v3/files_spec.rb b/spec/requests/api/v3/files_spec.rb index 349fd6b3415..c45e2028e1d 100644 --- a/spec/requests/api/v3/files_spec.rb +++ b/spec/requests/api/v3/files_spec.rb @@ -129,7 +129,7 @@ describe API::V3::Files, api: true do it "returns a 400 if editor fails to create file" do allow_any_instance_of(Repository).to receive(:create_file). - and_return(false) + and_raise(Repository::CommitError, 'Cannot create file') post v3_api("/projects/#{project.id}/repository/files", user), valid_params @@ -229,8 +229,8 @@ describe API::V3::Files, api: true do expect(response).to have_http_status(400) end - it "returns a 400 if fails to create file" do - allow_any_instance_of(Repository).to receive(:delete_file).and_return(false) + it "returns a 400 if fails to delete file" do + allow_any_instance_of(Repository).to receive(:delete_file).and_raise(Repository::CommitError, 'Cannot delete file') delete v3_api("/projects/#{project.id}/repository/files", user), valid_params |