diff options
| author | Mark Lapierre <mlapierre@gitlab.com> | 2019-01-17 09:08:19 -0500 |
|---|---|---|
| committer | Mark Lapierre <mlapierre@gitlab.com> | 2019-01-17 09:20:39 -0500 |
| commit | bc4ba8d4dc0f87a6cd40c28ad49d43f772a514f7 (patch) | |
| tree | b147dfe00aad7c8a326a98a2b078310c39f29efd /qa/qa/resource/merge_request_from_fork.rb | |
| parent | 1d22498251fd728246611be7dd1a19adadbafae6 (diff) | |
| download | gitlab-ce-bc4ba8d4dc0f87a6cd40c28ad49d43f772a514f7.tar.gz | |
Update merge fork test
Now that Resources don't share attributes, Fork doesn't have Project
attributes. That caused the merge fork test to fail because it no
longer had access to repository_http_location via Fork. Rather than
give Fork Project attributes directly, we add a project attribute to
Fork and populate it via the API at the end of the fabricate! method
after the fork has been created via the UI.
We also update the merge fork test to be slightly more concise and
consistent with newer tests by using perform with proc coercion
instead of act or perform with the full block syntax.
Diffstat (limited to 'qa/qa/resource/merge_request_from_fork.rb')
| -rw-r--r-- | qa/qa/resource/merge_request_from_fork.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/qa/resource/merge_request_from_fork.rb b/qa/qa/resource/merge_request_from_fork.rb index f91ae299d76..5d20a6e9c75 100644 --- a/qa/qa/resource/merge_request_from_fork.rb +++ b/qa/qa/resource/merge_request_from_fork.rb @@ -11,7 +11,7 @@ module QA attribute :push do Repository::ProjectPush.fabricate! do |resource| - resource.project = fork + resource.project = fork.project resource.branch_name = fork_branch resource.file_name = 'file2.txt' resource.user = fork.user |