diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /spec/services/files | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'spec/services/files')
-rw-r--r-- | spec/services/files/delete_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/services/files/update_service_spec.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/services/files/delete_service_spec.rb b/spec/services/files/delete_service_spec.rb index 17e4645fde6..3823d027812 100644 --- a/spec/services/files/delete_service_spec.rb +++ b/spec/services/files/delete_service_spec.rb @@ -55,7 +55,7 @@ RSpec.describe Files::DeleteService do context "when the file's last commit sha does not match the supplied last_commit_sha" do let(:last_commit_sha) { "foo" } - it "returns a hash with the correct error message and a :error status " do + it "returns a hash with the correct error message and a :error status" do expect { subject.execute } .to raise_error(Files::UpdateService::FileChangedError, "You are attempting to delete a file that has been previously updated.") diff --git a/spec/services/files/update_service_spec.rb b/spec/services/files/update_service_spec.rb index 84d78b4c2bc..6d7459e0b29 100644 --- a/spec/services/files/update_service_spec.rb +++ b/spec/services/files/update_service_spec.rb @@ -34,7 +34,7 @@ RSpec.describe Files::UpdateService do context "when the file's last commit sha does not match the supplied last_commit_sha" do let(:last_commit_sha) { "foo" } - it "returns a hash with the correct error message and a :error status " do + it "returns a hash with the correct error message and a :error status" do expect { subject.execute } .to raise_error(Files::UpdateService::FileChangedError, "You are attempting to update a file that has changed since you started editing it.") @@ -44,7 +44,7 @@ RSpec.describe Files::UpdateService do context "when the file's last commit sha does match the supplied last_commit_sha" do let(:last_commit_sha) { Gitlab::Git::Commit.last_for_path(project.repository, project.default_branch, file_path).sha } - it "returns a hash with the :success status " do + it "returns a hash with the :success status" do results = subject.execute expect(results[:status]).to match(:success) @@ -68,7 +68,7 @@ RSpec.describe Files::UpdateService do end context "when the last_commit_sha is not supplied" do - it "returns a hash with the :success status " do + it "returns a hash with the :success status" do results = subject.execute expect(results[:status]).to match(:success) |