diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-23 18:37:14 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-25 10:27:08 +0300 |
| commit | 44eb3197a9c30503a00384b3d688b64558b80397 (patch) | |
| tree | 852391adf4834d2ef8cc6a53e173e93c5b533c9b /spec/features/merge_requests/conflicts_spec.rb | |
| parent | b2bf01f4c271be66e93ed6f4b48a1da4d50e558d (diff) | |
Handle non-UTF-8 conflicts gracefully
These can't be resolved in the UI because if they aren't in a UTF-8
compatible encoding, they can't be rendered as JSON. Even if they could,
we would be implicitly changing the file encoding anyway, which seems
like a bad idea.
Diffstat (limited to 'spec/features/merge_requests/conflicts_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/conflicts_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/features/merge_requests/conflicts_spec.rb b/spec/features/merge_requests/conflicts_spec.rb index 930c36ade2b..759edf8ec80 100644 --- a/spec/features/merge_requests/conflicts_spec.rb +++ b/spec/features/merge_requests/conflicts_spec.rb @@ -43,7 +43,8 @@ feature 'Merge request conflict resolution', js: true, feature: true do 'conflict-too-large' => 'when the conflicts contain a large file', 'conflict-binary-file' => 'when the conflicts contain a binary file', 'conflict-contains-conflict-markers' => 'when the conflicts contain a file with ambiguous conflict markers', - 'conflict-missing-side' => 'when the conflicts contain a file edited in one branch and deleted in another' + 'conflict-missing-side' => 'when the conflicts contain a file edited in one branch and deleted in another', + 'conflict-non-utf8' => 'when the conflicts contain a non-UTF-8 file', } UNRESOLVABLE_CONFLICTS.each do |source_branch, description| |