Commit d5d1dcc9 authored by Rémy Coutable's avatar Rémy Coutable

Fix spec failures

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent d256852a
......@@ -246,14 +246,14 @@ feature 'Merge request approvals', js: true, feature: true do
visit namespace_project_merge_request_path(project.namespace, project, merge_request)
end
it 'I am unable to set Merge When Pipeline Succeeds' do
it 'I am unable to set Merge when pipeline succeeds' do
# before approval status is loaded
expect(page).to have_button('Merge When Pipeline Succeeds', disabled: true)
expect(page).to have_button('Merge when pipeline succeeds', disabled: true)
wait_for_ajax
# after approval status is loaded
expect(page).to have_button('Merge When Pipeline Succeeds', disabled: true)
expect(page).to have_button('Merge when pipeline succeeds', disabled: true)
end
end
......
......@@ -113,7 +113,7 @@ describe PipelineSerializer do
it "verifies number of queries" do
recorded = ActiveRecord::QueryRecorder.new { subject }
expect(recorded.count).to be_within(1).of(50)
expect(recorded.count).to be_within(1).of(53)
expect(recorded.cached_count).to eq(0)
end
......
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