Commit d343ef8b authored by Winnie Hellmann's avatar Winnie Hellmann

Resolve conflicts in issues_filter_spec.rb

parent d10416e2
...@@ -79,19 +79,13 @@ feature 'Dashboard Issues filtering', :js do ...@@ -79,19 +79,13 @@ feature 'Dashboard Issues filtering', :js do
end end
context 'sorting' do context 'sorting' do
<<<<<<< HEAD
it 'shows sorted issues' do
sort_by('Created date')
visit_issues
=======
before do before do
visit_issues(assignee_id: user.id) visit_issues(assignee_id: user.id)
end end
it 'remembers last sorting value' do it 'remembers last sorting value' do
sorting_by('Created date') sort_by('Created date')
visit_issues(assignee_id: user.id) visit_issues(assignee_id: user.id)
>>>>>>> Fixed dashboard filtering tests
expect(find('.issues-filters')).to have_content('Created date') expect(find('.issues-filters')).to have_content('Created date')
end 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