diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-15 15:10:49 -0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 22:46:38 -0400 |
| commit | 128f2845770b7a6d553ee764cdbbe63da5ba9e84 (patch) | |
| tree | fd0bced6c63c0b55df3beb78361325a0996a3ead /features | |
| parent | 0ef055a4aef76d20668a40717fb33bfe41599cfb (diff) | |
| download | gitlab-ce-128f2845770b7a6d553ee764cdbbe63da5ba9e84.tar.gz | |
Rebased on 6.0
-Had to do some minor test clean up as well
Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/project_forked_merge_requests.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/features/steps/project/project_forked_merge_requests.rb b/features/steps/project/project_forked_merge_requests.rb index a00a3b0a9ba..01689859cd7 100644 --- a/features/steps/project/project_forked_merge_requests.rb +++ b/features/steps/project/project_forked_merge_requests.rb @@ -14,9 +14,10 @@ class ProjectForkedMergeRequests < Spinach::FeatureSteps @forking_user = @user forked_project_link = build(:forked_project_link) @forked_project = Project.find_by_name "Forked Shop" - @forked_project ||= create(:source_project_with_code, name: "Forked Shop", forked_project_link: forked_project_link, creator_id: @forking_user.id) + @forked_project ||= create(:source_project_with_code, name: "Forked Shop", forked_project_link: forked_project_link, creator_id: @forking_user.id , namespace: @forking_user.namespace) forked_project_link.forked_from_project = @project forked_project_link.forked_to_project = @forked_project + @forked_project.team << [@forking_user , :master] forked_project_link.save! end |