diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-15 13:10:43 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-06-15 13:10:43 +0300 |
| commit | 593dfc40df6470089567e0daa1c752507a984b7e (patch) | |
| tree | ae13ec8890c3aacf17b861e6652035f6cc09ea22 | |
| parent | 48e5dff99c5ae206019082295357f513e412671e (diff) | |
| download | gitlab-ce-593dfc40df6470089567e0daa1c752507a984b7e.tar.gz | |
FIx userteams tests
| -rw-r--r-- | features/steps/userteams/userteams.rb | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/features/steps/userteams/userteams.rb b/features/steps/userteams/userteams.rb index 9a86572e1ac..a0389ff9cca 100644 --- a/features/steps/userteams/userteams.rb +++ b/features/steps/userteams/userteams.rb @@ -131,9 +131,7 @@ class Userteams < Spinach::FeatureSteps Given 'project from team has merge requests assigned to me' do team = UserTeam.last team.projects.each do |project| - team.members.each do |member| - 3.times { create(:merge_request, assignee: member, project: project) } - end + create(:merge_request, assignee: current_user, project: project) end end @@ -145,10 +143,8 @@ class Userteams < Spinach::FeatureSteps Then 'I should see merge requests from this team assigned to me' do team = UserTeam.last team.projects.each do |project| - team.members.each do |member| - project.issues.assigned(member).each do |merge_request| - page.should have_content merge_request.title - end + project.merge_requests.each do |merge_request| + page.should have_content merge_request.title end end end @@ -156,20 +152,8 @@ class Userteams < Spinach::FeatureSteps Given 'project from team has merge requests assigned to team members' do team = UserTeam.last team.projects.each do |project| - team.members.each do |member| - 3.times { create(:merge_request, assignee: member, project: project) } - end - end - end - - Then 'I should see merge requests from this team assigned to me' do - team = UserTeam.last - team.projects.each do |project| - team.members.each do |member| - project.issues.assigned(member).each do |merge_request| - page.should have_content merge_request.title - end - end + member = team.members.sample + create(:merge_request, assignee: member, project: project) end end |