diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 13:47:37 +0200 |
---|---|---|
committer | Valery Sizov <vsv2711@gmail.com> | 2015-08-12 13:53:16 +0300 |
commit | f181bc6e1e0cd5281361fab5a11bd499024c79b1 (patch) | |
tree | 23525b83cb8894395b7e62aa5db4a35ecdcf2e2e | |
parent | 18db872bc504805a33ef3a99708d22c61e822fcc (diff) | |
download | gitlab-ce-f181bc6e1e0cd5281361fab5a11bd499024c79b1.tar.gz |
Fix file api tests7-13-5-stable-candidate
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r-- | spec/requests/api/files_spec.rb | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb index 346f1e29d48..1d14a1729c6 100644 --- a/spec/requests/api/files_spec.rb +++ b/spec/requests/api/files_spec.rb @@ -49,9 +49,7 @@ describe API::API, api: true do end it "should create a new file in project repo" do - Gitlab::Satellite::NewFileAction.any_instance.stub( - commit!: true, - ) + expect_any_instance_of(Gitlab::Satellite::NewFileAction).to receive(:commit!).and_return(true) post api("/projects/#{project.id}/repository/files", user), valid_params expect(response.status).to eq(201) @@ -64,9 +62,7 @@ describe API::API, api: true do end it "should return a 400 if satellite fails to create file" do - Gitlab::Satellite::NewFileAction.any_instance.stub( - commit!: false, - ) + expect_any_instance_of(Gitlab::Satellite::NewFileAction).to receive(:commit!).and_return(false) post api("/projects/#{project.id}/repository/files", user), valid_params expect(response.status).to eq(400) @@ -84,9 +80,7 @@ describe API::API, api: true do end it "should update existing file in project repo" do - Gitlab::Satellite::EditFileAction.any_instance.stub( - commit!: true, - ) + expect_any_instance_of(Gitlab::Satellite::EditFileAction).to receive(:commit!).and_return(true) put api("/projects/#{project.id}/repository/files", user), valid_params expect(response.status).to eq(200) @@ -99,8 +93,7 @@ describe API::API, api: true do end it 'should return a 400 if the checkout fails' do - Gitlab::Satellite::EditFileAction.any_instance.stub(:commit!) - .and_raise(Gitlab::Satellite::CheckoutFailed) + expect_any_instance_of(Gitlab::Satellite::EditFileAction).to receive(:commit!).and_raise(Gitlab::Satellite::CheckoutFailed) put api("/projects/#{project.id}/repository/files", user), valid_params expect(response.status).to eq(400) @@ -110,8 +103,7 @@ describe API::API, api: true do end it 'should return a 409 if the file was not modified' do - Gitlab::Satellite::EditFileAction.any_instance.stub(:commit!) - .and_raise(Gitlab::Satellite::CommitFailed) + expect_any_instance_of(Gitlab::Satellite::EditFileAction).to receive(:commit!).and_raise(Gitlab::Satellite::CommitFailed) put api("/projects/#{project.id}/repository/files", user), valid_params expect(response.status).to eq(409) @@ -119,8 +111,7 @@ describe API::API, api: true do end it 'should return a 409 if the push fails' do - Gitlab::Satellite::EditFileAction.any_instance.stub(:commit!) - .and_raise(Gitlab::Satellite::PushFailed) + expect_any_instance_of(Gitlab::Satellite::EditFileAction).to receive(:commit!).and_raise(Gitlab::Satellite::PushFailed) put api("/projects/#{project.id}/repository/files", user), valid_params expect(response.status).to eq(409) @@ -138,10 +129,7 @@ describe API::API, api: true do end it "should delete existing file in project repo" do - Gitlab::Satellite::DeleteFileAction.any_instance.stub( - commit!: true, - ) - + expect_any_instance_of(Gitlab::Satellite::DeleteFileAction).to receive(:commit!).and_return(true) delete api("/projects/#{project.id}/repository/files", user), valid_params expect(response.status).to eq(200) expect(json_response['file_path']).to eq(file_path) @@ -153,9 +141,7 @@ describe API::API, api: true do end it "should return a 400 if satellite fails to create file" do - Gitlab::Satellite::DeleteFileAction.any_instance.stub( - commit!: false, - ) + expect_any_instance_of(Gitlab::Satellite::DeleteFileAction).to receive(:commit!).and_return(false) delete api("/projects/#{project.id}/repository/files", user), valid_params expect(response.status).to eq(400) |