Download as
Browse Code »

Commit 593dfc40df6470089567e0daa1c752507a984b7e

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

FIx userteams tests

Showing 1 changed file with 5 additions and 21 deletions   Show diff stats
features/steps/userteams/userteams.rb
  Diff comments   View file @593dfc4
... ... @@ -131,9 +131,7 @@ class Userteams < Spinach::FeatureSteps
131 131 Given 'project from team has merge requests assigned to me' do
132 132 team = UserTeam.last
133 133 team.projects.each do |project|
134   - team.members.each do |member|
135   - 3.times { create(:merge_request, assignee: member, project: project) }
136   - end
  134 + create(:merge_request, assignee: current_user, project: project)
137 135 end
138 136 end
139 137  
... ... @@ -145,10 +143,8 @@ class Userteams < Spinach::FeatureSteps
145 143 Then 'I should see merge requests from this team assigned to me' do
146 144 team = UserTeam.last
147 145 team.projects.each do |project|
148   - team.members.each do |member|
149   - project.issues.assigned(member).each do |merge_request|
150   - page.should have_content merge_request.title
151   - end
  146 + project.merge_requests.each do |merge_request|
  147 + page.should have_content merge_request.title
152 148 end
153 149 end
154 150 end
... ... @@ -156,20 +152,8 @@ class Userteams < Spinach::FeatureSteps
156 152 Given 'project from team has merge requests assigned to team members' do
157 153 team = UserTeam.last
158 154 team.projects.each do |project|
159   - team.members.each do |member|
160   - 3.times { create(:merge_request, assignee: member, project: project) }
161   - end
162   - end
163   - end
164   -
165   - Then 'I should see merge requests from this team assigned to me' do
166   - team = UserTeam.last
167   - team.projects.each do |project|
168   - team.members.each do |member|
169   - project.issues.assigned(member).each do |merge_request|
170   - page.should have_content merge_request.title
171   - end
172   - end
  155 + member = team.members.sample
  156 + create(:merge_request, assignee: member, project: project)
173 157 end
174 158 end
175 159  
... ...