diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-02-02 19:43:22 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-02-03 09:43:56 +0000 |
| commit | 035cb734d27cb6df56803d10be408c6e0cf764f0 (patch) | |
| tree | b227951d1e9e46023a6cd6f0dd0a67a5f2b721ed /spec/controllers | |
| parent | afa929143251e0c0558657899132fa11823a2e57 (diff) | |
| download | gitlab-ce-035cb734d27cb6df56803d10be408c6e0cf764f0.tar.gz | |
Add time ago auto-update to the 2 newest tables
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index e100047579d..d18e8c37901 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -701,15 +701,8 @@ describe Projects::MergeRequestsController do format: :json end - it 'responds with a rendered HTML partial' do - expect(response) - .to render_template('projects/merge_requests/show/_pipelines') - expect(json_response).to have_key 'html' - end - it 'responds with serialized pipelines' do - expect(json_response).to have_key 'pipelines' - expect(json_response['pipelines']).not_to be_empty + expect(json_response).not_to be_empty end end end |