Commit e058ce9f authored by Clement Ho's avatar Clement Ho

Convert and move reset filters spec to MR

parent 1623259c
...@@ -8,81 +8,88 @@ feature 'Issues filter reset button', feature: true, js: true do ...@@ -8,81 +8,88 @@ feature 'Issues filter reset button', feature: true, js: true do
let!(:user) { create(:user)} let!(:user) { create(:user)}
let!(:milestone) { create(:milestone, project: project) } let!(:milestone) { create(:milestone, project: project) }
let!(:bug) { create(:label, project: project, name: 'bug')} let!(:bug) { create(:label, project: project, name: 'bug')}
let!(:issue1) { create(:issue, project: project, milestone: milestone, author: user, assignee: user, title: 'Feature')} let!(:mr1) { create(:merge_request, title: "Feature", source_project: project, target_project: project, source_branch: "Feature", milestone: milestone, author: user, assignee: user) }
let!(:issue2) { create(:labeled_issue, project: project, labels: [bug], title: 'Bugfix1')} let!(:mr2) { create(:merge_request, title:"Bugfix1", source_project: project, target_project: project, source_branch: "Bugfix1") }
let(:merge_request_css) { '.merge-request' }
before do before do
mr2.labels << bug
project.team << [user, :developer] project.team << [user, :developer]
end end
context 'when a milestone filter has been applied' do context 'when a milestone filter has been applied' do
it 'resets the milestone filter' do it 'resets the milestone filter' do
visit_issues(project, milestone_title: milestone.title) visit_merge_requests(project, milestone_title: milestone.title)
expect(page).to have_css('.issue', count: 1) expect(page).to have_css(merge_request_css, count: 1)
reset_filters reset_filters
expect(page).to have_css('.issue', count: 2) expect(page).to have_css(merge_request_css, count: 2)
end end
end end
context 'when a label filter has been applied' do context 'when a label filter has been applied' do
it 'resets the label filter' do it 'resets the label filter' do
visit_issues(project, label_name: bug.name) visit_merge_requests(project, label_name: bug.name)
expect(page).to have_css('.issue', count: 1) expect(page).to have_css(merge_request_css, count: 1)
reset_filters reset_filters
expect(page).to have_css('.issue', count: 2) expect(page).to have_css(merge_request_css, count: 2)
end end
end end
context 'when a text search has been conducted' do context 'when a text search has been conducted' do
it 'resets the text search filter' do it 'resets the text search filter' do
visit_issues(project, search: 'Bug') visit_merge_requests(project, search: 'Bug')
expect(page).to have_css('.issue', count: 1) expect(page).to have_css(merge_request_css, count: 1)
reset_filters reset_filters
expect(page).to have_css('.issue', count: 2) expect(page).to have_css(merge_request_css, count: 2)
end end
end end
context 'when author filter has been applied' do context 'when author filter has been applied' do
it 'resets the author filter' do it 'resets the author filter' do
visit_issues(project, author_id: user.id) visit_merge_requests(project, author_id: user.id)
expect(page).to have_css('.issue', count: 1) expect(page).to have_css(merge_request_css, count: 1)
reset_filters reset_filters
expect(page).to have_css('.issue', count: 2) expect(page).to have_css(merge_request_css, count: 2)
end end
end end
context 'when assignee filter has been applied' do context 'when assignee filter has been applied' do
it 'resets the assignee filter' do it 'resets the assignee filter' do
visit_issues(project, assignee_id: user.id) visit_merge_requests(project, assignee_id: user.id)
expect(page).to have_css('.issue', count: 1) expect(page).to have_css(merge_request_css, count: 1)
reset_filters reset_filters
expect(page).to have_css('.issue', count: 2) expect(page).to have_css(merge_request_css, count: 2)
end end
end end
context 'when all filters have been applied' do context 'when all filters have been applied' do
it 'resets all filters' do it 'resets all filters' do
visit_issues(project, assignee_id: user.id, author_id: user.id, milestone_title: milestone.title, label_name: bug.name, search: 'Bug') visit_merge_requests(project, assignee_id: user.id, author_id: user.id, milestone_title: milestone.title, label_name: bug.name, search: 'Bug')
expect(page).to have_css('.issue', count: 0) expect(page).to have_css(merge_request_css, count: 0)
reset_filters reset_filters
expect(page).to have_css('.issue', count: 2) expect(page).to have_css(merge_request_css, count: 2)
end end
end end
context 'when no filters have been applied' do context 'when no filters have been applied' do
it 'the reset link should not be visible' do it 'the reset link should not be visible' do
visit_issues(project) visit_merge_requests(project)
expect(page).to have_css('.issue', count: 2) expect(page).to have_css(merge_request_css, count: 2)
expect(page).not_to have_css '.reset_filters' expect(page).not_to have_css '.reset_filters'
end end
end end
def visit_merge_requests(project, opts = {})
visit namespace_project_merge_requests_path project.namespace, project, opts
end
def reset_filters def reset_filters
find('.reset-filters').click find('.reset-filters').click
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