summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/branches_controller_spec.rb
diff options
context:
space:
mode:
authorFelipe Artur <fcardozo@gitlab.com>2017-09-15 20:14:53 +0000
committerFelipe Artur <fcardozo@gitlab.com>2017-09-15 20:14:53 +0000
commit25c959f94d3dda63120256735163e4a142b8711e (patch)
tree4c6e544a665dab5b59106ace9638dca16b71d806 /spec/controllers/projects/branches_controller_spec.rb
parentb20595b2bd0023ebbc2ec46017f5d1cb1533fb4f (diff)
parent3dd2248605ce2183f02ab268fc1f8b0b164f0bed (diff)
downloadgitlab-ce-issue_37640.tar.gz
Merge branch 'master' into 'issue_37640'issue_37640
# Conflicts: # db/schema.rb
Diffstat (limited to 'spec/controllers/projects/branches_controller_spec.rb')
-rw-r--r--spec/controllers/projects/branches_controller_spec.rb15
1 files changed, 15 insertions, 0 deletions
diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb
index 745d051a5c1..5e0b57e9b2e 100644
--- a/spec/controllers/projects/branches_controller_spec.rb
+++ b/spec/controllers/projects/branches_controller_spec.rb
@@ -367,5 +367,20 @@ describe Projects::BranchesController do
expect(parsed_response.first).to eq 'master'
end
end
+
+ context 'when branch contains an invalid UTF-8 sequence' do
+ before do
+ project.repository.create_branch("wrong-\xE5-utf8-sequence")
+ end
+
+ it 'return with a status 200' do
+ get :index,
+ namespace_id: project.namespace,
+ project_id: project,
+ format: :html
+
+ expect(response).to have_http_status(200)
+ end
+ end
end
end