diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-22 20:04:54 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-22 20:04:54 +0100 |
| commit | b3f27aed775232200533a4df2a6e7cc70be13574 (patch) | |
| tree | 2d998e4677f8bd81077f4b8ce70c2479d376510e /spec/controllers | |
| parent | f8c044bad3266ee4d31b9606024f4572d1fac3bd (diff) | |
| parent | 46be07d2c1da93cffd59fb03036e357c04ff6f3b (diff) | |
| download | gitlab-ce-b3f27aed775232200533a4df2a6e7cc70be13574.tar.gz | |
Merge branch 'master' into 41249-clearing-the-cache
Diffstat (limited to 'spec/controllers')
| -rw-r--r-- | spec/controllers/projects/clusters/applications_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/spec/controllers/projects/clusters/applications_controller_spec.rb b/spec/controllers/projects/clusters/applications_controller_spec.rb index 8b460646059..99fdff5f846 100644 --- a/spec/controllers/projects/clusters/applications_controller_spec.rb +++ b/spec/controllers/projects/clusters/applications_controller_spec.rb @@ -52,7 +52,7 @@ describe Projects::Clusters::ApplicationsController do context 'when application is already installing' do before do - create(:cluster_applications_helm, :installing, cluster: cluster) + create(:clusters_applications_helm, :installing, cluster: cluster) end it 'returns 400' do diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 58116e6e0fe..45c424af8c4 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -98,6 +98,14 @@ describe Projects::MergeRequestsController do expect(response).to match_response_schema('entities/merge_request_widget') end end + + context 'when no serialiser was passed' do + it 'renders widget MR entity as json' do + go(serializer: nil, format: :json) + + expect(response).to match_response_schema('entities/merge_request_widget') + end + end end describe "as diff" do |