Download as
Browse Code »

Commit 44c55307a0dc1d011cb9deabb2f1d631ebd2cb63

Authored by Dmitriy Zaporozhets
1 parent 526c2fdf
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Use 1.9 hash syntax for some tests 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 2 changed files with 23 additions and 31 deletions   Show diff stats
spec/contexts/issues/list_context_spec.rb
  Diff comments   View file @44c5530
@@ -4,30 +4,29 @@ describe Issues::ListContext do @@ -4,30 +4,29 @@ describe Issues::ListContext do
4 4
5 let(:user) { create(:user) } 5 let(:user) { create(:user) }
6 let(:project) { create(:project, creator: user) } 6 let(:project) { create(:project, creator: user) }
7 - 7 +
8 titles = ['foo','bar','baz'] 8 titles = ['foo','bar','baz']
9 titles.each_with_index do |title, index| 9 titles.each_with_index do |title, index|
10 let!(title.to_sym) { create(:issue, title: title, project: project, created_at: Time.now - (index * 60)) } 10 let!(title.to_sym) { create(:issue, title: title, project: project, created_at: Time.now - (index * 60)) }
11 end 11 end
12 12
13 describe 'sorting' do 13 describe 'sorting' do
14 -  
15 it 'sorts by newest' do 14 it 'sorts by newest' do
16 - params = {:sort => 'newest'} 15 + params = {sort: 'newest'}
17 16
18 issues = Issues::ListContext.new(project, user, params).execute 17 issues = Issues::ListContext.new(project, user, params).execute
19 issues.first.should eq foo 18 issues.first.should eq foo
20 end 19 end
21 20
22 it 'sorts by oldest' do 21 it 'sorts by oldest' do
23 - params = {:sort => 'oldest'} 22 + params = {sort: 'oldest'}
24 23
25 issues = Issues::ListContext.new(project, user, params).execute 24 issues = Issues::ListContext.new(project, user, params).execute
26 issues.first.should eq baz 25 issues.first.should eq baz
27 end 26 end
28 27
29 it 'sorts by recently updated' do 28 it 'sorts by recently updated' do
30 - params = {:sort => 'recently_updated'} 29 + params = {sort: 'recently_updated'}
31 baz.updated_at = Time.now + 10 30 baz.updated_at = Time.now + 10
32 baz.save 31 baz.save
33 32
@@ -36,7 +35,7 @@ describe Issues::ListContext do @@ -36,7 +35,7 @@ describe Issues::ListContext do
36 end 35 end
37 36
38 it 'sorts by least recently updated' do 37 it 'sorts by least recently updated' do
39 - params = {:sort => 'last_updated'} 38 + params = {sort: 'last_updated'}
40 bar.updated_at = Time.now - 10 39 bar.updated_at = Time.now - 10
41 bar.save 40 bar.save
42 41
@@ -45,9 +44,8 @@ describe Issues::ListContext do @@ -45,9 +44,8 @@ describe Issues::ListContext do
45 end 44 end
46 45
47 describe 'sorting by milestone' do 46 describe 'sorting by milestone' do
48 -  
49 - let(:newer_due_milestone) { create(:milestone, :due_date => '2013-12-11') }  
50 - let(:later_due_milestone) { create(:milestone, :due_date => '2013-12-12') } 47 + let(:newer_due_milestone) { create(:milestone, due_date: '2013-12-11') }
  48 + let(:later_due_milestone) { create(:milestone, due_date: '2013-12-12') }
51 49
52 before :each do 50 before :each do
53 foo.milestone = newer_due_milestone 51 foo.milestone = newer_due_milestone
@@ -57,7 +55,7 @@ describe Issues::ListContext do @@ -57,7 +55,7 @@ describe Issues::ListContext do
57 end 55 end
58 56
59 it 'sorts by most recently due milestone' do 57 it 'sorts by most recently due milestone' do
60 - params = {:sort => 'milestone_due_soon'} 58 + params = {sort: 'milestone_due_soon'}
61 59
62 issues = Issues::ListContext.new(project, user, params).execute 60 issues = Issues::ListContext.new(project, user, params).execute
63 issues.first.should eq foo 61 issues.first.should eq foo
@@ -65,13 +63,11 @@ describe Issues::ListContext do @@ -65,13 +63,11 @@ describe Issues::ListContext do
65 end 63 end
66 64
67 it 'sorts by least recently due milestone' do 65 it 'sorts by least recently due milestone' do
68 - params = {:sort => 'milestone_due_later'} 66 + params = {sort: 'milestone_due_later'}
69 67
70 issues = Issues::ListContext.new(project, user, params).execute 68 issues = Issues::ListContext.new(project, user, params).execute
71 issues.first.should eq bar 69 issues.first.should eq bar
72 end 70 end
73 -  
74 end 71 end
75 end 72 end
76 -  
77 end 73 end
spec/features/issues_spec.rb
  Diff comments   View file @44c5530
@@ -101,21 +101,21 @@ describe &quot;Issues&quot; do @@ -101,21 +101,21 @@ describe &quot;Issues&quot; do
101 titles.each_with_index do |title, index| 101 titles.each_with_index do |title, index|
102 let!(title.to_sym) { create(:issue, title: title, project: project, created_at: Time.now - (index * 60)) } 102 let!(title.to_sym) { create(:issue, title: title, project: project, created_at: Time.now - (index * 60)) }
103 end 103 end
104 - let(:newer_due_milestone) { create(:milestone, :due_date => '2013-12-11') }  
105 - let(:later_due_milestone) { create(:milestone, :due_date => '2013-12-12') } 104 + let(:newer_due_milestone) { create(:milestone, due_date: '2013-12-11') }
  105 + let(:later_due_milestone) { create(:milestone, due_date: '2013-12-12') }
106 106
107 it 'sorts by newest' do 107 it 'sorts by newest' do
108 visit project_issues_path(project, sort: 'newest') 108 visit project_issues_path(project, sort: 'newest')
109 -  
110 - page.should have_selector("ul.issues-list li:first-child", :text => 'foo')  
111 - page.should have_selector("ul.issues-list li:last-child", :text => 'baz') 109 +
  110 + page.should have_selector("ul.issues-list li:first-child", text: 'foo')
  111 + page.should have_selector("ul.issues-list li:last-child", text: 'baz')
112 end 112 end
113 113
114 it 'sorts by oldest' do 114 it 'sorts by oldest' do
115 visit project_issues_path(project, sort: 'oldest') 115 visit project_issues_path(project, sort: 'oldest')
116 116
117 - page.should have_selector("ul.issues-list li:first-child", :text => 'baz')  
118 - page.should have_selector("ul.issues-list li:last-child", :text => 'foo') 117 + page.should have_selector("ul.issues-list li:first-child", text: 'baz')
  118 + page.should have_selector("ul.issues-list li:last-child", text: 'foo')
119 end 119 end
120 120
121 it 'sorts by most recently updated' do 121 it 'sorts by most recently updated' do
@@ -123,7 +123,7 @@ describe &quot;Issues&quot; do @@ -123,7 +123,7 @@ describe &quot;Issues&quot; do
123 baz.save 123 baz.save
124 visit project_issues_path(project, sort: 'recently_updated') 124 visit project_issues_path(project, sort: 'recently_updated')
125 125
126 - page.should have_selector("ul.issues-list li:first-child", :text => 'baz') 126 + page.should have_selector("ul.issues-list li:first-child", text: 'baz')
127 end 127 end
128 128
129 it 'sorts by least recently updated' do 129 it 'sorts by least recently updated' do
@@ -131,12 +131,11 @@ describe &quot;Issues&quot; do @@ -131,12 +131,11 @@ describe &quot;Issues&quot; do
131 baz.save 131 baz.save
132 visit project_issues_path(project, sort: 'last_updated') 132 visit project_issues_path(project, sort: 'last_updated')
133 133
134 - page.should have_selector("ul.issues-list li:first-child", :text => 'baz') 134 + page.should have_selector("ul.issues-list li:first-child", text: 'baz')
135 end 135 end
136 136
137 describe 'sorting by milestone' do 137 describe 'sorting by milestone' do
138 -  
139 - before :each do 138 + before :each do
140 foo.milestone = newer_due_milestone 139 foo.milestone = newer_due_milestone
141 foo.save 140 foo.save
142 bar.milestone = later_due_milestone 141 bar.milestone = later_due_milestone
@@ -146,18 +145,17 @@ describe &quot;Issues&quot; do @@ -146,18 +145,17 @@ describe &quot;Issues&quot; do
146 it 'sorts by recently due milestone' do 145 it 'sorts by recently due milestone' do
147 visit project_issues_path(project, sort: 'milestone_due_soon') 146 visit project_issues_path(project, sort: 'milestone_due_soon')
148 147
149 - page.should have_selector("ul.issues-list li:first-child", :text => 'foo') 148 + page.should have_selector("ul.issues-list li:first-child", text: 'foo')
150 end 149 end
151 150
152 it 'sorts by least recently due milestone' do 151 it 'sorts by least recently due milestone' do
153 visit project_issues_path(project, sort: 'milestone_due_later') 152 visit project_issues_path(project, sort: 'milestone_due_later')
154 153
155 - page.should have_selector("ul.issues-list li:first-child", :text => 'bar') 154 + page.should have_selector("ul.issues-list li:first-child", text: 'bar')
156 end 155 end
157 end 156 end
158 157
159 describe 'combine filter and sort' do 158 describe 'combine filter and sort' do
160 -  
161 let(:user2) { create(:user) } 159 let(:user2) { create(:user) }
162 160
163 before :each do 161 before :each do
@@ -170,12 +168,10 @@ describe &quot;Issues&quot; do @@ -170,12 +168,10 @@ describe &quot;Issues&quot; do
170 it 'sorts with a filter applied' do 168 it 'sorts with a filter applied' do
171 visit project_issues_path(project, sort: 'oldest', assignee_id: user2.id) 169 visit project_issues_path(project, sort: 'oldest', assignee_id: user2.id)
172 170
173 - page.should have_selector("ul.issues-list li:first-child", :text => 'bar')  
174 - page.should have_selector("ul.issues-list li:last-child", :text => 'foo') 171 + page.should have_selector("ul.issues-list li:first-child", text: 'bar')
  172 + page.should have_selector("ul.issues-list li:last-child", text: 'foo')
175 page.should_not have_content 'baz' 173 page.should_not have_content 'baz'
176 -  
177 end 174 end
178 end 175 end
179 end 176 end
180 -  
181 end 177 end