diff options
author | Rémy Coutable <remy@rymai.me> | 2016-04-19 13:03:28 +0200 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-04-20 15:43:32 -0400 |
commit | 6cdf4acd4eef55c616d633757772c6e05f6b93c5 (patch) | |
tree | 10fb609f5a9418c3f57ef3506b95f0be7c06e14c /spec | |
parent | 5c8959bbc15ec47d8be62e8e1362e441cdd91d69 (diff) | |
download | gitlab-ce-6cdf4acd4eef55c616d633757772c6e05f6b93c5.tar.gz |
Address MR feedback
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/issues_spec.rb | 73 |
1 files changed, 40 insertions, 33 deletions
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb index 32c27d6e97e..5d38bdeba33 100644 --- a/spec/features/issues_spec.rb +++ b/spec/features/issues_spec.rb @@ -112,7 +112,7 @@ describe 'Issues', feature: true do end describe 'filter issue' do - titles = ['foo','bar','baz'] + titles = %w[foo bar baz] titles.each_with_index do |title, index| let!(title.to_sym) do create(:issue, title: title, @@ -154,86 +154,93 @@ describe 'Issues', feature: true do end describe 'sorting by due date' do - before :each do - foo.due_date = 1.day.from_now - foo.save - bar.due_date = 6.days.from_now - bar.save + before do + foo.update(due_date: 1.day.from_now) + bar.update(due_date: 6.days.from_now) end it 'sorts by recently due date' do visit namespace_project_issues_path(project.namespace, project, sort: sort_value_due_date_soon) + expect(first_issue).to include('foo') end it 'sorts by least recently due date' do visit namespace_project_issues_path(project.namespace, project, sort: sort_value_due_date_later) + expect(first_issue).to include('bar') end it 'sorts by least recently due date by excluding nil due dates' do bar.update(due_date: nil) + visit namespace_project_issues_path(project.namespace, project, sort: sort_value_due_date_later) + expect(first_issue).to include('foo') end end describe 'filtering by due date' do - before :each do - foo.due_date = 1.day.from_now - foo.save - bar.due_date = 6.days.from_now - bar.save + before do + foo.update(due_date: 1.day.from_now) + bar.update(due_date: 6.days.from_now) end it 'filters by none' do visit namespace_project_issues_path(project.namespace, project, due_date: Issue::NoDueDate.name) - expect(page).not_to have_content("foo") - expect(page).not_to have_content("bar") - expect(page).to have_content("baz") + + expect(page).not_to have_content('foo') + expect(page).not_to have_content('bar') + expect(page).to have_content('baz') end it 'filters by any' do visit namespace_project_issues_path(project.namespace, project, due_date: Issue::AnyDueDate.name) - expect(page).to have_content("foo") - expect(page).to have_content("bar") - expect(page).to have_content("baz") + + expect(page).to have_content('foo') + expect(page).to have_content('bar') + expect(page).to have_content('baz') end it 'filters by due this week' do foo.update(due_date: Date.today.beginning_of_week + 2.days) bar.update(due_date: Date.today.end_of_week) baz.update(due_date: Date.today - 8.days) + visit namespace_project_issues_path(project.namespace, project, due_date: Issue::DueThisWeek.name) - expect(page).to have_content("foo") - expect(page).to have_content("bar") - expect(page).not_to have_content("baz") + + expect(page).to have_content('foo') + expect(page).to have_content('bar') + expect(page).not_to have_content('baz') end it 'filters by due this month' do foo.update(due_date: Date.today.beginning_of_month + 2.days) bar.update(due_date: Date.today.end_of_month) baz.update(due_date: Date.today - 50.days) + visit namespace_project_issues_path(project.namespace, project, due_date: Issue::DueThisMonth.name) - expect(page).to have_content("foo") - expect(page).to have_content("bar") - expect(page).not_to have_content("baz") + + expect(page).to have_content('foo') + expect(page).to have_content('bar') + expect(page).not_to have_content('baz') end it 'filters by overdue' do foo.update(due_date: Date.today + 2.days) bar.update(due_date: Date.today + 20.days) baz.update(due_date: Date.yesterday) - visit namespace_project_issues_path(project.namespace, project, due_date: Issue::OverDue.name) - expect(page).not_to have_content("foo") - expect(page).not_to have_content("bar") - expect(page).to have_content("baz") - end + visit namespace_project_issues_path(project.namespace, project, due_date: Issue::Overdue.name) + + expect(page).not_to have_content('foo') + expect(page).not_to have_content('bar') + expect(page).to have_content('baz') + end end describe 'sorting by milestone' do - before :each do + before do foo.milestone = newer_due_milestone foo.save bar.milestone = later_due_milestone @@ -256,7 +263,7 @@ describe 'Issues', feature: true do describe 'combine filter and sort' do let(:user2) { create(:user) } - before :each do + before do foo.assignee = user2 foo.save bar.assignee = user2 @@ -303,7 +310,7 @@ describe 'Issues', feature: true do let(:guest) { create(:user) } - before :each do + before do project.team << [[guest], :guest] end @@ -346,7 +353,7 @@ describe 'Issues', feature: true do context 'by unauthorized user' do let(:guest) { create(:user) } - before :each do + before do project.team << [guest, :guest] issue.milestone = milestone issue.save @@ -364,7 +371,7 @@ describe 'Issues', feature: true do describe 'removing assignee' do let(:user2) { create(:user) } - before :each do + before do issue.assignee = user2 issue.save end |