Commit 72d42944 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Fix specs

parent be1351cd
...@@ -138,7 +138,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps ...@@ -138,7 +138,7 @@ class Spinach::Features::DashboardTodos < Spinach::FeatureSteps
end end
step 'I should be directed to the corresponding page' do step 'I should be directed to the corresponding page' do
page.should have_css('.identifier', text: 'Merge Request !1') page.should have_css('.identifier', text: 'Merge request !1')
# Merge request page loads and issues a number of Ajax requests # Merge request page loads and issues a number of Ajax requests
wait_for_ajax wait_for_ajax
end end
......
...@@ -90,7 +90,7 @@ describe 'New/edit merge request', feature: true, js: true do ...@@ -90,7 +90,7 @@ describe 'New/edit merge request', feature: true, js: true do
page.within '.issuable-meta' do page.within '.issuable-meta' do
merge_request = MergeRequest.find_by(source_branch: 'fix') merge_request = MergeRequest.find_by(source_branch: 'fix')
expect(page).to have_text("Merge Request #{merge_request.to_reference}") expect(page).to have_text("Merge request #{merge_request.to_reference}")
# compare paths because the host differ in test # compare paths because the host differ in test
expect(find_link(merge_request.to_reference)[:href]) expect(find_link(merge_request.to_reference)[:href])
.to end_with(merge_request_path(merge_request)) .to end_with(merge_request_path(merge_request))
......
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