diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-07 12:26:24 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-07 12:26:24 +0300 |
commit | bc5fd64142f0d9640b68989e1327b8a6bb10c8c8 (patch) | |
tree | 06206b8a98999b589beb81cbac37ceaeaadf48af /spec | |
parent | a9155ab05eb68fdf5d6967d268d8be8de7af6ab8 (diff) | |
parent | 854c9636ec6aabd8941b31f0f2aa4e89c9c072ce (diff) |
Merge branch '45505-lograge_formatter_encoding' into 'master'
Enforce UTF-8 encoding on user input in LogrageWithTimestamp formatter
Closes #45505
See merge request gitlab-org/gitlab-ce!19244
Diffstat (limited to 'spec')
-rw-r--r-- | spec/requests/api/commits_spec.rb | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb index 8ad19e3f0f5..7e3277c4cab 100644 --- a/spec/requests/api/commits_spec.rb +++ b/spec/requests/api/commits_spec.rb @@ -247,6 +247,19 @@ describe API::Commits do ] } end + let!(:valid_utf8_c_params) do + { + branch: 'master', + commit_message: message, + actions: [ + { + action: 'create', + file_path: 'foo/bar/baz.txt', + content: 'puts 🦊' + } + ] + } + end it 'a new file in project repo' do post api(url, user), valid_c_params @@ -257,6 +270,15 @@ describe API::Commits do expect(json_response['committer_email']).to eq(user.email) end + it 'a new file with utf8 chars in project repo' do + post api(url, user), valid_utf8_c_params + + expect(response).to have_gitlab_http_status(201) + expect(json_response['title']).to eq(message) + expect(json_response['committer_name']).to eq(user.name) + expect(json_response['committer_email']).to eq(user.email) + end + it 'returns a 400 bad request if file exists' do post api(url, user), invalid_c_params |