kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Use 1.9 hash syntax for some tests

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2013-11-27 10:04:00 +02:00
parent 526c2fdf48
commit 44c55307a0
No known key found for this signature in database
GPG key ID: 2CEAFD2671262EC2
2 changed files with 23 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
spec/contexts/issues/list_context_spec.rb
View file

@ -11,23 +11,22 @@ describe Issues::ListContext do
end
describe 'sorting' do
it 'sorts by newest' do
params = {:sort => 'newest'}
params = {sort: 'newest'}
issues = Issues::ListContext.new(project, user, params).execute
issues.first.should eq foo
end
it 'sorts by oldest' do
params = {:sort => 'oldest'}
params = {sort: 'oldest'}
issues = Issues::ListContext.new(project, user, params).execute
issues.first.should eq baz
end
it 'sorts by recently updated' do
params = {:sort => 'recently_updated'}
params = {sort: 'recently_updated'}
baz.updated_at = Time.now + 10
baz.save
@ -36,7 +35,7 @@ describe Issues::ListContext do
end
it 'sorts by least recently updated' do
params = {:sort => 'last_updated'}
params = {sort: 'last_updated'}
bar.updated_at = Time.now - 10
bar.save
@ -45,9 +44,8 @@ describe Issues::ListContext do
end
describe 'sorting by milestone' do
let(:newer_due_milestone) { create(:milestone, :due_date => '2013-12-11') }
let(:later_due_milestone) { create(:milestone, :due_date => '2013-12-12') }
let(:newer_due_milestone) { create(:milestone, due_date: '2013-12-11') }
let(:later_due_milestone) { create(:milestone, due_date: '2013-12-12') }
before :each do
foo.milestone = newer_due_milestone
@ -57,7 +55,7 @@ describe Issues::ListContext do
end
it 'sorts by most recently due milestone' do
params = {:sort => 'milestone_due_soon'}
params = {sort: 'milestone_due_soon'}
issues = Issues::ListContext.new(project, user, params).execute
issues.first.should eq foo
@ -65,13 +63,11 @@ describe Issues::ListContext do
end
it 'sorts by least recently due milestone' do
params = {:sort => 'milestone_due_later'}
params = {sort: 'milestone_due_later'}
issues = Issues::ListContext.new(project, user, params).execute
issues.first.should eq bar
end
end
end
end

28
spec/features/issues_spec.rb
View file

@ -101,21 +101,21 @@ describe "Issues" do
titles.each_with_index do |title, index|
let!(title.to_sym) { create(:issue, title: title, project: project, created_at: Time.now - (index * 60)) }
end
let(:newer_due_milestone) { create(:milestone, :due_date => '2013-12-11') }
let(:later_due_milestone) { create(:milestone, :due_date => '2013-12-12') }
let(:newer_due_milestone) { create(:milestone, due_date: '2013-12-11') }
let(:later_due_milestone) { create(:milestone, due_date: '2013-12-12') }
it 'sorts by newest' do
visit project_issues_path(project, sort: 'newest')
page.should have_selector("ul.issues-list li:first-child", :text => 'foo')
page.should have_selector("ul.issues-list li:last-child", :text => 'baz')
page.should have_selector("ul.issues-list li:first-child", text: 'foo')
page.should have_selector("ul.issues-list li:last-child", text: 'baz')
end
it 'sorts by oldest' do
visit project_issues_path(project, sort: 'oldest')
page.should have_selector("ul.issues-list li:first-child", :text => 'baz')
page.should have_selector("ul.issues-list li:last-child", :text => 'foo')
page.should have_selector("ul.issues-list li:first-child", text: 'baz')
page.should have_selector("ul.issues-list li:last-child", text: 'foo')
end
it 'sorts by most recently updated' do
@ -123,7 +123,7 @@ describe "Issues" do
baz.save
visit project_issues_path(project, sort: 'recently_updated')
page.should have_selector("ul.issues-list li:first-child", :text => 'baz')
page.should have_selector("ul.issues-list li:first-child", text: 'baz')
end
it 'sorts by least recently updated' do
@ -131,11 +131,10 @@ describe "Issues" do
baz.save
visit project_issues_path(project, sort: 'last_updated')
page.should have_selector("ul.issues-list li:first-child", :text => 'baz')
page.should have_selector("ul.issues-list li:first-child", text: 'baz')
end
describe 'sorting by milestone' do
before :each do
foo.milestone = newer_due_milestone
foo.save
@ -146,18 +145,17 @@ describe "Issues" do
it 'sorts by recently due milestone' do
visit project_issues_path(project, sort: 'milestone_due_soon')
page.should have_selector("ul.issues-list li:first-child", :text => 'foo')
page.should have_selector("ul.issues-list li:first-child", text: 'foo')
end
it 'sorts by least recently due milestone' do
visit project_issues_path(project, sort: 'milestone_due_later')
page.should have_selector("ul.issues-list li:first-child", :text => 'bar')
page.should have_selector("ul.issues-list li:first-child", text: 'bar')
end
end
describe 'combine filter and sort' do
let(:user2) { create(:user) }
before :each do
@ -170,12 +168,10 @@ describe "Issues" do
it 'sorts with a filter applied' do
visit project_issues_path(project, sort: 'oldest', assignee_id: user2.id)
page.should have_selector("ul.issues-list li:first-child", :text => 'bar')
page.should have_selector("ul.issues-list li:last-child", :text => 'foo')
page.should have_selector("ul.issues-list li:first-child", text: 'bar')
page.should have_selector("ul.issues-list li:last-child", text: 'foo')
page.should_not have_content 'baz'
end
end
end
end