Commit 98e6bd21 authored by Rémy Coutable's avatar Rémy Coutable

[QA] Fix the 'Commit data' QA test

We now visit the project/wiki page after a push since that's the logical
page where we should be after a push.

Also, we now properly set the `@project` variable because the
`web_url` of a Push resource isn't necessarily it's project/wiki page
(if the project/wiki are created via the API for instance, `current_url`
would be the current page, not the project/wiki page).
Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 81ddb692
...@@ -26,6 +26,11 @@ module QA ...@@ -26,6 +26,11 @@ module QA
def repository_ssh_uri def repository_ssh_uri
@repository_ssh_uri ||= project.repository_ssh_location.uri @repository_ssh_uri ||= project.repository_ssh_location.uri
end end
def fabricate!
super
project.visit!
end
end end
end end
end end
......
...@@ -30,6 +30,11 @@ module QA ...@@ -30,6 +30,11 @@ module QA
end end
end end
end end
def fabricate!
super
wiki.visit!
end
end end
end end
end end
......
...@@ -7,17 +7,17 @@ module QA ...@@ -7,17 +7,17 @@ module QA
Runtime::Browser.visit(:gitlab, Page::Main::Login) Runtime::Browser.visit(:gitlab, Page::Main::Login)
Page::Main::Login.perform(&:sign_in_using_credentials) Page::Main::Login.perform(&:sign_in_using_credentials)
@project = Resource::Repository::ProjectPush.fabricate! do |push| project_push = Resource::Repository::ProjectPush.fabricate! do |push|
push.file_name = 'README.md' push.file_name = 'README.md'
push.file_content = '# This is a test project' push.file_content = '# This is a test project'
push.commit_message = 'Add README.md' push.commit_message = 'Add README.md'
end end
@project = project_push.project
# first file added has no parent commit, thus no diff data # first file added has no parent commit, thus no diff data
# add second file to repo to enable diff from initial commit # add second file to repo to enable diff from initial commit
@commit_message = 'Add second file' @commit_message = 'Add second file'
@project.visit!
Page::Project::Show.perform(&:create_new_file!) Page::Project::Show.perform(&:create_new_file!)
Page::File::Form.perform do |f| Page::File::Form.perform do |f|
f.add_name('second') f.add_name('second')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment