diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:16:36 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-08-06 12:16:36 +0200 |
| commit | 4f24eb2aa670877faeef0f486af00d74e007ad01 (patch) | |
| tree | 3b8c9ccbe779050db829565910e8652392af4dcf /spec/requests/api/files_spec.rb | |
| parent | c6799b0e1ecd1b7373f0ea23195e18c7ad5c199d (diff) | |
| parent | fff36a8b8965e4bddd8020caf5072e79bf131a74 (diff) | |
| download | gitlab-ce-merge-notifs.tar.gz | |
Merge branch 'master' into merge-notifsmerge-notifs
Diffstat (limited to 'spec/requests/api/files_spec.rb')
| -rw-r--r-- | spec/requests/api/files_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb index 6c7860511e8..8cb8790c339 100644 --- a/spec/requests/api/files_spec.rb +++ b/spec/requests/api/files_spec.rb @@ -110,7 +110,7 @@ describe API::API, api: true do expect(response.status).to eq(400) end - it "should return a 400 if satellite fails to create file" do + it "should return a 400 if fails to create file" do allow_any_instance_of(Repository).to receive(:remove_file).and_return(false) delete api("/projects/#{project.id}/repository/files", user), valid_params |