diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-20 14:45:12 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-20 14:45:12 +0300 |
commit | 386a04999743c794bd08badda7aef42f81e727da (patch) | |
tree | ced94cfc08573208a37b6acffc8f4ecf8de001c3 /spec/controllers | |
parent | a7f32ae56aeb560c23d7e0afa5d551c3bff33ab3 (diff) | |
parent | 59154779d81c6359428af5f5cbdedbbd7ed32d5c (diff) |
Merge branch '48100-fix-branch-not-shown' into 'master'
Resolve "Set the language setting to something other than English, the branch of Merge Request will not be visible."
Closes #48100
See merge request gitlab-org/gitlab-ce!20016
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/projects_controller_spec.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index 705b30f0130..90e698925b6 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -597,6 +597,22 @@ describe ProjectsController do expect(parsed_body["Tags"]).to include("v1.0.0") expect(parsed_body["Commits"]).to include("123456") end + + context "when preferred language is Japanese" do + before do + user.update!(preferred_language: 'ja') + sign_in(user) + end + + it "gets a list of branches, tags and commits" do + get :refs, namespace_id: public_project.namespace, id: public_project, ref: "123456" + + parsed_body = JSON.parse(response.body) + expect(parsed_body["Branches"]).to include("master") + expect(parsed_body["Tags"]).to include("v1.0.0") + expect(parsed_body["Commits"]).to include("123456") + end + end end describe 'POST #preview_markdown' do |