Commit 593d78ab authored by Douglas Barbosa Alexandre's avatar Douglas Barbosa Alexandre

Merge branch 'sh-fix-be-success-failure' into 'master'

Fix static-analysis failures with BeSuccessMatcher

Closes #14001

See merge request gitlab-org/gitlab-ee!15749
parents 69f38407 f2a57216
...@@ -36,7 +36,7 @@ describe Groups::CycleAnalytics::EventsController do ...@@ -36,7 +36,7 @@ describe Groups::CycleAnalytics::EventsController do
}, },
format: :json) format: :json)
expect(response).to be_success expect(response).to be_successful
end end
it 'calls service with specific params' do it 'calls service with specific params' do
...@@ -55,7 +55,7 @@ describe Groups::CycleAnalytics::EventsController do ...@@ -55,7 +55,7 @@ describe Groups::CycleAnalytics::EventsController do
}, },
format: :json) format: :json)
expect(response).to be_success expect(response).to be_successful
end end
end end
......
...@@ -36,7 +36,7 @@ describe Groups::CycleAnalyticsController do ...@@ -36,7 +36,7 @@ describe Groups::CycleAnalyticsController do
}, },
format: :json) format: :json)
expect(response).to be_success expect(response).to be_successful
end end
it 'calls service with specific params' do it 'calls service with specific params' do
...@@ -56,7 +56,7 @@ describe Groups::CycleAnalyticsController do ...@@ -56,7 +56,7 @@ describe Groups::CycleAnalyticsController do
}, },
format: :json) format: :json)
expect(response).to be_success expect(response).to be_successful
end end
end end
......
...@@ -24,7 +24,7 @@ shared_examples 'approvals' do ...@@ -24,7 +24,7 @@ shared_examples 'approvals' do
it 'approves the merge request' do it 'approves the merge request' do
approvals = json_response approvals = json_response
expect(response).to be_success expect(response).to be_successful
expect(approvals['approvals_left']).to eq 1 expect(approvals['approvals_left']).to eq 1
expect(approvals['approved_by'].size).to eq 1 expect(approvals['approved_by'].size).to eq 1
expect(approvals['approved_by'][0]['user']['username']).to eq user.username expect(approvals['approved_by'][0]['user']['username']).to eq user.username
...@@ -53,7 +53,7 @@ shared_examples 'approvals' do ...@@ -53,7 +53,7 @@ shared_examples 'approvals' do
approvals = json_response approvals = json_response
expect(response).to be_success expect(response).to be_successful
expect(approvals['approvals_left']).to eq 1 expect(approvals['approvals_left']).to eq 1
expect(approvals['approved_by'].size).to eq 1 expect(approvals['approved_by'].size).to eq 1
expect(approvals['approved_by'][0]['user']['username']).to eq approver.username expect(approvals['approved_by'][0]['user']['username']).to eq approver.username
...@@ -80,7 +80,7 @@ shared_examples 'approvals' do ...@@ -80,7 +80,7 @@ shared_examples 'approvals' do
it 'unapproves the merge request' do it 'unapproves the merge request' do
approvals = json_response approvals = json_response
expect(response).to be_success expect(response).to be_successful
expect(approvals['approvals_left']).to eq 2 expect(approvals['approvals_left']).to eq 2
expect(approvals['approved_by']).to be_empty expect(approvals['approved_by']).to be_empty
expect(approvals['user_has_approved']).to be false expect(approvals['user_has_approved']).to be false
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment