diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-07-28 07:27:13 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-07-28 07:27:13 +0000 |
| commit | 7e17f9bc89b04496e062d56c119f75fbb3f81208 (patch) | |
| tree | ceb96ee5f1d33f21ca66ab17707bc626685b9b89 /spec/controllers | |
| parent | b5aac468693f6ffaada170aebedc623768ce87d4 (diff) | |
| parent | 288e8ea1e77d46197f6c93ae1f5d0f5cc810625f (diff) | |
| download | gitlab-ce-7e17f9bc89b04496e062d56c119f75fbb3f81208.tar.gz | |
Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into 'master'
Resolve "Transform user profile javascript into async bundle"
Closes #35224
See merge request !12929
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/users_controller_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 842d82cdbe9..7aeb6efd86d 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -80,9 +80,9 @@ describe UsersController do it 'renders calendar' do sign_in(user) - get :calendar, username: user.username + get :calendar, username: user.username, format: :json - expect(response).to render_template('calendar') + expect(response).to have_http_status(200) end context 'forked project' do |