summaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-12-13 15:13:33 +0100
committerRémy Coutable <remy@rymai.me>2018-12-13 15:13:38 +0100
commit98e6bd2122db3ac6b61697be6bb12c9e80a442e8 (patch)
tree3e69e5aa8f0264d3073c966b69c58fd69db6ee9f /qa
parent81ddb69255f36bccd79c714a2c12d542cf782f8d (diff)
downloadgitlab-ce-98e6bd2122db3ac6b61697be6bb12c9e80a442e8.tar.gz
[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: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'qa')
-rw-r--r--qa/qa/resource/repository/project_push.rb5
-rw-r--r--qa/qa/resource/repository/wiki_push.rb5
-rw-r--r--qa/qa/specs/features/browser_ui/3_create/repository/user_views_raw_diff_patch_requests_spec.rb4
3 files changed, 12 insertions, 2 deletions
diff --git a/qa/qa/resource/repository/project_push.rb b/qa/qa/resource/repository/project_push.rb
index 37feab4ad70..f4692c3dd4d 100644
--- a/qa/qa/resource/repository/project_push.rb
+++ b/qa/qa/resource/repository/project_push.rb
@@ -26,6 +26,11 @@ module QA
def repository_ssh_uri
@repository_ssh_uri ||= project.repository_ssh_location.uri
end
+
+ def fabricate!
+ super
+ project.visit!
+ end
end
end
end
diff --git a/qa/qa/resource/repository/wiki_push.rb b/qa/qa/resource/repository/wiki_push.rb
index f1c39d507fe..77c4c8a514d 100644
--- a/qa/qa/resource/repository/wiki_push.rb
+++ b/qa/qa/resource/repository/wiki_push.rb
@@ -30,6 +30,11 @@ module QA
end
end
end
+
+ def fabricate!
+ super
+ wiki.visit!
+ end
end
end
end
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/user_views_raw_diff_patch_requests_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/user_views_raw_diff_patch_requests_spec.rb
index 75ad18a4111..203338ddf77 100644
--- a/qa/qa/specs/features/browser_ui/3_create/repository/user_views_raw_diff_patch_requests_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/user_views_raw_diff_patch_requests_spec.rb
@@ -7,17 +7,17 @@ module QA
Runtime::Browser.visit(:gitlab, Page::Main::Login)
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_content = '# This is a test project'
push.commit_message = 'Add README.md'
end
+ @project = project_push.project
# first file added has no parent commit, thus no diff data
# add second file to repo to enable diff from initial commit
@commit_message = 'Add second file'
- @project.visit!
Page::Project::Show.perform(&:create_new_file!)
Page::File::Form.perform do |f|
f.add_name('second')